Unified label screen

.gitignore

@@ -16,5 +16,6 @@ app-settings.json
 www/js/control/collect-settings.js
 www/js/control/sync-settings.js
 www/js/control/transition-notify-settings.js
+www/pro-manifest.json
 config.xml
 package.json

GoogleService-Info.plist

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CLIENT_ID</key>
+	<string>463780887765-etam5pe3elp6u2tfkoluiamebfqhj9o4.apps.googleusercontent.com</string>
+	<key>REVERSED_CLIENT_ID</key>
+	<string>com.googleusercontent.apps.463780887765-etam5pe3elp6u2tfkoluiamebfqhj9o4</string>
+	<key>API_KEY</key>
+	<string>AIzaSyD6YAnUtO7-9AO_K4Rj_kK0V36x86CJPYI</string>
+	<key>GCM_SENDER_ID</key>
+	<string>463780887765</string>
+	<key>PLIST_VERSION</key>
+	<string>1</string>
+	<key>BUNDLE_ID</key>
+	<string>com.fabmobqc.mamobiliteapp</string>
+	<key>PROJECT_ID</key>
+	<string>fabmobqc</string>
+	<key>STORAGE_BUCKET</key>
+	<string>fabmobqc.appspot.com</string>
+	<key>IS_ADS_ENABLED</key>
+	<false></false>
+	<key>IS_ANALYTICS_ENABLED</key>
+	<false></false>
+	<key>IS_APPINVITE_ENABLED</key>
+	<true></true>
+	<key>IS_GCM_ENABLED</key>
+	<true></true>
+	<key>IS_SIGNIN_ENABLED</key>
+	<true></true>
+	<key>GOOGLE_APP_ID</key>
+	<string>1:463780887765:ios:40fe635c5ee976bcbc365c</string>
+</dict>
+</plist>

README.md

@@ -84,8 +84,8 @@ One advantage of using `skip` authentication in development mode is that any use
 
 Updating the e-mission-\* plugins or adding new plugins
 ---
-[![osx-build-ios](https://github.com/e-mission/e-mission-phone/actions/workflows/ios-build.yml/badge.svg)](https://github.com/e-mission/e-mission-phone/actions/workflows/ios-build.yml)
-[![osx-build-android](https://github.com/e-mission/e-mission-phone/actions/workflows/android-build.yml/badge.svg)](https://github.com/e-mission/e-mission-phone/actions/workflows/android-build.yml)
+[![osx-build-ios](https://github.com/e-mission/e-mission-phone/workflows/osx-build-ios/badge.svg)](https://github.com/e-mission/e-mission-phone/actions?query=workflow%3Aosx-ubuntu-build-android)
+[![osx-ubuntu-build-android](https://github.com/e-mission/e-mission-phone/workflows/osx-ubuntu-build-android/badge.svg)](https://github.com/e-mission/e-mission-phone/actions?query=workflow%3Aosx-build-ios)
 
 Pre-requisites
 ---
@@ -94,32 +94,10 @@ Pre-requisites
     - or this [supposedly easier to use repo](https://github.com/xcpretty/xcode-install)
     - **NOTE**: the basic xcode install on Catalina was messed up for me due to a prior installation of command line tools. [These workarounds helped](https://github.com/nodejs/node-gyp/blob/master/macOS_Catalina.md).
 - git
-- Java 11. Tested with [OpenJDK 11 (Temurin) using AdoptOpenJDK](https://adoptopenjdk.net/releases.html).
-- android SDK; install manually or use setup script below. Note that you only need to run this once **per computer**.
-    ```
-    $ bash setup/prereq_android_sdk_install.sh
-    ```
-
-    <details><summary>Expected output</summary>
-
-    ```
-    Downloading the command line tools for mac
-      % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
-                                     Dload  Upload   Total   Spent    Left  Speed
-    100  114M  100  114M    0     0  8092k      0  0:00:14  0:00:14 --:--:-- 8491k
-    Found downloaded file at /tmp/commandlinetools-mac-8092744_latest.zip
-    Installing the command line tools
-    Archive:  /tmp/commandlinetools-mac-8092744_latest.zip
-    ...
-    Downloading the android SDK. This will take a LONG time and will require you to agree to lots of licenses.
-    Do you wish to continue? (Y/N)Y
-    ...
-    Accept? (y/N): Y
-    ...
-    [======                                 ] 17% Downloading x86_64-23_r33.zip... s
-    ```
-
-    </details>
+- the most recent version of android studio
+    - **NOTE**: although Catalina has a `/usr/bin/java`, trying to run it gives the error `No Java runtime present, requesting install.`. Installed [OpenJDK 1.8 using AdoptOpenJDK](https://adoptopenjdk.net/releases.html) to be consistent with the CI.
+    - NOTE: The setup script below will modify this install to workaround
+        https://github.com/actions/virtual-environments/issues/3757
 
 Important
 ---
@@ -158,17 +136,9 @@ $ cp ..... www/json/connectionConfig.json
 $ source setup/activate_native.sh
 ```
 
-### Activation (after install, and in every new shell)
-
-If connecting to a development server over http, make sure to turn on http support on android
 
-```
-    <edit-config file="app/src/main/AndroidManifest.xml" mode="merge" target="/manifest/application">
-        <application android:usesCleartextTraffic="true"/>
-    </edit-config>
-```
 
-### Run in the emulator
+Run in the emulator
 
 ```
 $ npx cordova emulate ios

bin/sign_and_align_keys.sh

@@ -11,7 +11,6 @@ fi
 # Sign and release the L+ version
 # Make sure the highest supported version has the biggest version code
 npx cordova build android --release -- --minSdkVersion=22
-# cp platforms/android/app/build/outputs/apk/release/app-release-unsigned.aab platforms/android/app/build/outputs/apk/app-release-signed-unaligned.apk
-jarsigner -verbose -sigalg SHA256withRSA -digestalg SHA-256 -keystore ../config_files/production.keystore ./platforms/android/app/build/outputs/bundle/release/app-release.aab androidproductionkey
-cp platforms/android/app/build/outputs/bundle/release/app-release.aab $1-build-$2.aab
-# ~/Library/Android/sdk/build-tools/30.0.1/zipalign -v 4 platforms/android/app/build/outputs/apk/app-release-signed-unaligned.apk $1-build-$2.apk
+cp platforms/android/app/build/outputs/apk/release/app-release-unsigned.apk platforms/android/app/build/outputs/apk/app-release-signed-unaligned.apk
+jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore ../config_files/production.keystore ./platforms/android/app/build/outputs/apk/app-release-signed-unaligned.apk androidproductionkey
+~/Library/Android/sdk/build-tools/30.0.1/zipalign -v 4 platforms/android/app/build/outputs/apk/app-release-signed-unaligned.apk $1-build-$2.apk

bower.json

@@ -1,5 +1,5 @@
 {
-  "name": "emission",
+  "name": "TraceMe",
   "private": "true",
   "devDependencies": {
     "ionic": "driftyco/ionic-bower#1.3.1",
@@ -27,8 +27,8 @@
     "angular-translate": "^2.18.1",
     "angular-translate-loader-static-files": "^2.18.1",
     "angular-translate-interpolation-messageformat": "^2.18.1",
-    "bottleneck": "^2.19.5",
-    "angular-qrcode": "https://github.com/sebastianbarry/angular-qrcode.git#v7.3.0",
-    "jquery-xml2json": "^0.0.8"
+    "angular-translate-storage-cookie": "^2.18.1",
+    "angular-translate-storage-local": "^2.18.1",
+    "bottleneck": "^2.19.5"
   }
 }

config.cordovabuild.xml

@@ -1,15 +1,15 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget android-versionCode="47" id="edu.berkeley.eecs.emission" ios-CFBundleVersion="45" version="3.2.4" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
-    <name>emission</name>
+<widget android-versionCode="64" id="com.fabmoqc.mamobilite" ios-CFBundleVersion="54" version="3.0.5" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+    <name>Ma Mobilité</name>
     <description>
         A commute pattern tracker and carbon footprint estimator.
     </description>
-    <author email="shankari@eecs.berkeley.edu" href="https://e-mission.eecs.berkeley.edu">
-        E-Mission Team
-  </author>
+    <author email="communications@fabmobqc.ca" href=" https://fabmobqc.ca">
+        Fabrique des Mobilités Québec
+    </author>
     <content src="index.html" />
     <access origin="*" />
-    <hook src="hooks/before_prepare/download_translation.js" type="before_prepare" />
+    <!-- <hook src="hooks/before_prepare/download_translation.js" type="before_prepare" /> --> <!-- Too much hassle for our need. The translations are included directly in the repo. -->
     <preference name="webviewbounce" value="false" />
     <preference name="UIWebViewBounce" value="false" />
     <preference name="DisallowOverscroll" value="true" />

config.serve.xml

@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
 <widget android-versionCode="39" id="edu.berkeley.eecs.emission" ios-CFBundleVersion="39" version="2.8.1" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
-    <name>emission</name>
+    <name>TraceMe</name>
     <description>
         A commute pattern tracker and carbon footprint estimator.
     </description>

google-services.json

@@ -0,0 +1,46 @@
+{
+  "project_info": {
+    "project_number": "463780887765",
+    "project_id": "fabmobqc",
+    "storage_bucket": "fabmobqc.appspot.com"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:463780887765:android:598cde1db65f1cc9bc365c",
+        "android_client_info": {
+          "package_name": "com.fabmoqc.mamobilite"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "463780887765-6mguoskq0k2v0t2eaj6mes3hrtu9vn74.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyDiQ7D5zf0hW0Xyl8v2JE5w4M5HhT1RGZ8"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "463780887765-6mguoskq0k2v0t2eaj6mes3hrtu9vn74.apps.googleusercontent.com",
+              "client_type": 3
+            },
+            {
+              "client_id": "463780887765-d48a77jepjhssklo5754tt1gfgqn3ikb.apps.googleusercontent.com",
+              "client_type": 2,
+              "ios_info": {
+                "bundle_id": "com.fabmoqc.mamobilite"
+              }
+            }
+          ]
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}