Release/v2.6.8+608

CHANGELOG.md

@@ -5,21 +5,32 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## Unreleased
+### Changed
 
-## [2.5.8] - 2020-09-10
+## [2.6.8] - 2020-09-18
 ### Changed
- - Remove restriction for taking app screenshots in Android [#138](https://github.com/rokwire/safer-illinois-app/issues/138).
+ - Change wait time colors and labels [#167](https://github.com/rokwire/safer-illinois-app/issues/167).
+ - Upgrade flutter for Safer Illinois to v. 1.20.4 [#82](https://github.com/rokwire/safer-illinois-app/issues/82).
 
-## [2.5.7] - 2020-09-09
+## [2.6.7] - 2020-09-17
 ### Changed
- - Integrate maps for test locations [#132](https://github.com/rokwire/safer-illinois-app/issues/132).
- - Use next step HTML in exposure rules [#133](https://github.com/rokwire/safer-illinois-app/issues/133).
- - Various minor fixes.
+ - Rework swiper and fix the VoiceOver accessibility [#158] (https://github.com/rokwire/safer-illinois-app/issues/158)
+ - Show wait time for each test location [#160](https://github.com/rokwire/safer-illinois-app/issues/160).
 
-## [2.5.6] - 2020-09-08
+
+## [2.6.6] - 2020-09-16
 ### Changed
+ - Load symptoms and rules from the new Health API [#152](https://github.com/rokwire/safer-illinois-app/issues/152).
+
+## [2.6.3] - 2020-09-11
+### Changed
+ - Remove "ASAP" label in Next Steps panel [#143](https://github.com/rokwire/safer-illinois-app/issues/143).
+ - Remove restriction for taking screenshots in Android [#138](https://github.com/rokwire/safer-illinois-app/issues/138).
  - Removed SAR status entries from sample health rules. Use PCR entries instead that actually contain the same status rules.
+ - Integrate maps for test locations [#132](https://github.com/rokwire/safer-illinois-app/issues/132).
+ - Use next step HTML in exposure rules [#133](https://github.com/rokwire/safer-illinois-app/issues/133).
  - Fixed warnings.
+ - Various minor fixes.
 
 ### Added
  - Added 'test-user' condition [#125](https://github.com/rokwire/safer-illinois-app/issues/125).
@@ -69,7 +80,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
  - Covid19OnBoardingLoginNetIdPanel (unused)
  - Covid19OnBoardingLoginPhonePanel (unused)
 
-
 ## [2.4.2] - 2020-08-26
 ### Changed
  - Fixed Xcode name in README.md (#1)

android/app/build.gradle

@@ -161,6 +161,11 @@ dependencies {
     implementation 'com.google.zxing:core:3.3.0' //Use zxing 3.3.0 because we have minSdk < 24
     implementation ('com.journeyapps:zxing-android-embedded:4.1.0@aar') { transitive = false }
 
+    //BlinkID
+    implementation('com.microblink:blinkid:5.3.0@aar') {
+        transitive = true
+    }
+
     // BLESSED - BLE library used for Exposures
     implementation 'com.github.weliem:blessed-android:1.19'
 }

android/app/src/main/java/edu/illinois/covid/exposure/ble/NotificationCreator.java

@@ -26,7 +26,6 @@ static Notification getNotification(Context context) {
 
                 NotificationCompat.Builder builder = new NotificationCompat.Builder(context, CHANNEL_ID)
                         .setContentTitle(context.getString(R.string.exposure_notification_title))
-                        .setContentText(context.getString(R.string.exposure_notification_message))
                         .setSmallIcon(R.drawable.app_icon)
                         .setContentIntent(pendingIntent)
                         .setTicker(context.getString(R.string.exposure_notification_ticker));

android/app/src/main/java/edu/illinois/covid/maps/MapActivity.java

@@ -68,7 +68,6 @@ public class MapActivity extends AppCompatActivity {
     protected long locationTimestamp;
 
     private boolean isRunning;
-
     private boolean firstLocationUpdatePassed;
     private HashMap target;
     private HashMap options;
@@ -196,8 +195,6 @@ private void fillMarkers(){
 
     //endregion
 
-    //region Core Location
-
     private void initCoreLocation() {
         fusedLocationClient = LocationServices.getFusedLocationProviderClient(this);
         createCoreLocationCallback();
@@ -237,20 +234,20 @@ public void onLocationResult(LocationResult locationResult) {
     //region Common Location
 
     protected void notifyLocationUpdate(long timestamp) {
-        locationTimestamp = timestamp;
-        if (!firstLocationUpdatePassed) {
-            firstLocationUpdatePassed = true;
-            handleFirstLocationUpdate();
-        }
-        if ((debugStatusView != null) && showDebugLocation) {
-            String sourceAbbr = "CL";
-            int sourceColor = Color.rgb(0, 126, 0);
-            double lat = 0.0d;
-            double lng = 0.0d;
-            int floor = 0;
-            debugStatusView.setText(String.format(Locale.getDefault(), "%s [%.6f, %.6f] @ %d", sourceAbbr, lat, lng, floor));
-            debugStatusView.setTextColor(sourceColor);
-        }
+            locationTimestamp = timestamp;
+            if (!firstLocationUpdatePassed) {
+                firstLocationUpdatePassed = true;
+                handleFirstLocationUpdate();
+            }
+            if ((debugStatusView != null) && showDebugLocation) {
+                String sourceAbbr = "CL";
+                int sourceColor = Color.rgb(0, 126, 0);
+                double lat = 0.0d;
+                double lng = 0.0d;
+                int floor = 0;
+                debugStatusView.setText(String.format(Locale.getDefault(), "%s [%.6f, %.6f] @ %d", sourceAbbr, lat, lng, floor));
+                debugStatusView.setTextColor(sourceColor);
+            }
     }
 
     protected void notifyLocationFail() {

android/app/src/main/java/edu/illinois/covid/maps/MapDirectionsActivity.java

@@ -118,9 +118,9 @@ protected void afterMapInitialized() {
     @Override
     protected void notifyLocationUpdate(long timestamp) {
         super.notifyLocationUpdate(timestamp);
-        if ((navStatus == NavStatus.PROGRESS) && navAutoUpdate) {
-            updateNavByCurrentLocation();
-        }
+            if ((navStatus == NavStatus.PROGRESS) && navAutoUpdate) {
+                updateNavByCurrentLocation();
+            }
     }
 
     @Override
@@ -312,6 +312,7 @@ private void buildRoute(String travelModeValue) {
     }
 
     private void changeSelectedTravelMode(String newTravelMode) {
+
     }
 
     @Override
@@ -387,6 +388,7 @@ private void notifyRouteEvent(String event) {
         String originString = null;
         String destinationString = null;
         String locationString = null;
+
         String analyticsParam = String.format(Locale.getDefault(), "{\"origin\":%s,\"destination\":%s,\"location\":%s}", originString, destinationString, locationString);
         MainActivity.invokeFlutterMethod(event, analyticsParam);
     }

android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java

@@ -12,15 +12,18 @@
 import com.dexterous.flutterlocalnotifications.FlutterLocalNotificationsPlugin;
 import com.whelksoft.flutter_native_timezone.FlutterNativeTimezonePlugin;
 import io.flutter.plugins.flutter_plugin_android_lifecycle.FlutterAndroidLifecyclePlugin;
-import io.github.ponnamkarthik.toast.fluttertoast.FluttertoastPlugin;
+import io.github.ponnamkarthik.toast.fluttertoast.FlutterToastPlugin;
 import io.flutter.plugins.imagepicker.ImagePickerPlugin;
 import com.lyokone.location.LocationPlugin;
 import io.flutter.plugins.packageinfo.PackageInfoPlugin;
 import io.flutter.plugins.pathprovider.PathProviderPlugin;
+import flutter.plugins.screen.screen.ScreenPlugin;
 import io.flutter.plugins.sharedpreferences.SharedPreferencesPlugin;
 import com.tekartik.sqflite.SqflitePlugin;
 import name.avioli.unilinks.UniLinksPlugin;
 import io.flutter.plugins.urllauncher.UrlLauncherPlugin;
+import io.flutter.plugins.videoplayer.VideoPlayerPlugin;
+import creativecreatorormaybenot.wakelock.WakelockPlugin;
 import io.flutter.plugins.webviewflutter.WebViewFlutterPlugin;
 
 /**
@@ -42,15 +45,18 @@ public static void registerWith(PluginRegistry registry) {
     FlutterLocalNotificationsPlugin.registerWith(registry.registrarFor("com.dexterous.flutterlocalnotifications.FlutterLocalNotificationsPlugin"));
     FlutterNativeTimezonePlugin.registerWith(registry.registrarFor("com.whelksoft.flutter_native_timezone.FlutterNativeTimezonePlugin"));
     FlutterAndroidLifecyclePlugin.registerWith(registry.registrarFor("io.flutter.plugins.flutter_plugin_android_lifecycle.FlutterAndroidLifecyclePlugin"));
-    FluttertoastPlugin.registerWith(registry.registrarFor("io.github.ponnamkarthik.toast.fluttertoast.FluttertoastPlugin"));
+    FlutterToastPlugin.registerWith(registry.registrarFor("io.github.ponnamkarthik.toast.fluttertoast.FlutterToastPlugin"));
     ImagePickerPlugin.registerWith(registry.registrarFor("io.flutter.plugins.imagepicker.ImagePickerPlugin"));
     LocationPlugin.registerWith(registry.registrarFor("com.lyokone.location.LocationPlugin"));
     PackageInfoPlugin.registerWith(registry.registrarFor("io.flutter.plugins.packageinfo.PackageInfoPlugin"));
     PathProviderPlugin.registerWith(registry.registrarFor("io.flutter.plugins.pathprovider.PathProviderPlugin"));
+    ScreenPlugin.registerWith(registry.registrarFor("flutter.plugins.screen.screen.ScreenPlugin"));
     SharedPreferencesPlugin.registerWith(registry.registrarFor("io.flutter.plugins.sharedpreferences.SharedPreferencesPlugin"));
     SqflitePlugin.registerWith(registry.registrarFor("com.tekartik.sqflite.SqflitePlugin"));
     UniLinksPlugin.registerWith(registry.registrarFor("name.avioli.unilinks.UniLinksPlugin"));
     UrlLauncherPlugin.registerWith(registry.registrarFor("io.flutter.plugins.urllauncher.UrlLauncherPlugin"));
+    VideoPlayerPlugin.registerWith(registry.registrarFor("io.flutter.plugins.videoplayer.VideoPlayerPlugin"));
+    WakelockPlugin.registerWith(registry.registrarFor("creativecreatorormaybenot.wakelock.WakelockPlugin"));
     WebViewFlutterPlugin.registerWith(registry.registrarFor("io.flutter.plugins.webviewflutter.WebViewFlutterPlugin"));
   }
 

android/app/src/main/res/values-es/strings.xml

@@ -53,9 +53,8 @@
     <string name="save">Salvar</string>
 
     <!-- Exposure -->
-    <string name="exposure_notification_channel_description">Notificación de seguimiento de contactos del edificio</string>
-    <string name="exposure_notification_title">Seguimiento de contactos</string>
-    <string name="exposure_notification_message">El seguimiento de contactos para preservar la privacidad se está ejecutando actualmente</string>
-    <string name="exposure_notification_ticker">Seguimiento de contactos</string>
-    <string name="exposure_request_bluetooth_on_message">Permitir notificaciones de exposición. ¿Quieres encender el bluetooth?</string>
+    <string name="exposure_notification_channel_description">Sistema de notificación de exposición</string>
+    <string name="exposure_notification_title">Comprobación del sistema de notificación de exposición</string>
+    <string name="exposure_notification_ticker">Comprobación del sistema de notificación de exposición</string>
+    <string name="exposure_request_bluetooth_on_message">Permitir notificaciones de exposición. ¿Quieres activar Bluetooth?</string>
 </resources>

android/app/src/main/res/values-zh/strings.xml

@@ -53,9 +53,8 @@
     <string name="save">保存</string>
 
     <!-- Exposure -->
-    <string name="exposure_notification_channel_description">建築物聯繫人跟踪通知</string>
-    <string name="exposure_notification_title">聯繫人跟踪</string>
-    <string name="exposure_notification_message">當前正在運行保護隱私的聯繫人跟踪</string>
-    <string name="exposure_notification_ticker">聯繫人跟踪</string>
-    <string name="exposure_request_bluetooth_on_message">允許曝光通知. 您要打開藍牙嗎?</string>
+    <string name="exposure_notification_channel_description">曝光通知系統</string>
+    <string name="exposure_notification_title">曝光通知系統檢查</string>
+    <string name="exposure_notification_ticker">曝光通知系統檢查</string>
+    <string name="exposure_request_bluetooth_on_message">允許曝光通知. 您要開啟藍牙嗎?</string>
 </resources>

android/app/src/main/res/values/strings.xml

@@ -53,9 +53,8 @@
     <string name="save">Save</string>
 
     <!-- Exposure -->
-    <string name="exposure_notification_channel_description">Building contact tracing notification</string>
-    <string name="exposure_notification_title">Contact tracing</string>
-    <string name="exposure_notification_message">Privacy-preserving contact tracing is currently running</string>
-    <string name="exposure_notification_ticker">Contact tracing</string>
-    <string name="exposure_request_bluetooth_on_message">Allow exposure notifications. Do you want to turn the bluetooth on?</string>
+    <string name="exposure_notification_channel_description">Exposure Notification system</string>
+    <string name="exposure_notification_title">Exposure Notification system checking</string>
+    <string name="exposure_notification_ticker">Exposure Notification system checking</string>
+    <string name="exposure_request_bluetooth_on_message">Allow exposure notifications. Do you want to turn on Bluetooth?</string>
 </resources>

android/build.gradle

@@ -39,6 +39,7 @@ allprojects {
         flatDir {
             dirs '../lib'
         }
+        maven { url 'https://maven.microblink.com' }
         maven { url 'https://jitpack.io' }
     }
 }

assets/strings.en.json

@@ -303,6 +303,12 @@
     "panel.covid19_passport.label.access.granted": "GRANTED",
     "panel.covid19_passport.label.access.denied": "DENIED",
     "panel.covid19_passport.message.missing_id_info": "No Illini ID information found. You may have an expired i-card. Please contact the ID Center.",
+    "panel.covid19_passport.button.show_page_1.title": "Show page 1 of 2",
+    "panel.covid19_passport.button.show_page_1.hint": "",
+    "panel.covid19_passport.button.show_page_2.title": "Show page 2 of 2",
+    "panel.covid19_passport.button.show_page_2.hint": "",
+    "panel.covid19_passport.label.page_1": "Page 1",
+    "panel.covid19_passport.label.page_2": "Page 2",
 
     "panel.covid19_guidelines.header.title": "County Guidelines",
     "panel.covid19_guidelines.description.title": "Help stop the spread of COVID-19 by following these current guidelines.",
@@ -352,6 +358,8 @@
     "panel.covid19_test_locations.work_time.closed_until": "Closed until",
     "panel.covid19_test_locations.all_providers.text": "All Providers",
     "panel.covid19_test_locations.call.hint": "Call",
+    "panel.covid19_test_locations.wait_time.label": "Wait Time",
+    "panel.covid19_test_locations.wait_time.unavailable": "Unavailable",
 
     "panel.covid19.header.title": "COVID-19",
     "panel.covid19.latest_update.title": "Latest Update",
@@ -696,7 +704,6 @@
     "panel.health.next_steps.button.continue.title.find_locatio": "Find location",
     "panel.health.next_steps.button.continue.title.care_team": "Get in Touch with Care Team",
     "panel.health.next_steps.label.next_steps": "NEXT STEPS",
-    "panel.health.next_steps.label.asap": "ASAP",
 
     "panel.health.symptoms.heading.title":"Are you experiencing any of these symptoms?",
     "panel.health.symptoms.label.error.loading":"Failed to load symptoms.",

assets/strings.es.json

@@ -303,6 +303,13 @@
     "panel.covid19_passport.label.access.granted": "CONCEDIDO",
     "panel.covid19_passport.label.access.denied": "NEGADO",
     "panel.covid19_passport.message.missing_id_info": "No se encontró información de identificación de Illini. Es posible que tenga una i-card vencida. Comuníquese con el Centro de identificación.",
+    "panel.covid19_passport.button.show_page_1.title": "Show page 1 of 2",
+    "panel.covid19_passport.button.show_page_1.hint": "",
+    "panel.covid19_passport.button.show_page_2.title": "Show page 2 of 2",
+    "panel.covid19_passport.button.show_page_2.hint": "",
+    "panel.covid19_passport.label.page_1": "Page 1",
+    "panel.covid19_passport.label.page_2": "Page 2",
+
 
     "panel.covid19_guidelines.header.title": "Pautas del condado",
     "panel.covid19_guidelines.description.title": "Ayude a detener la propagación de COVID-19 siguiendo estas pautas actuales.",
@@ -352,6 +359,8 @@
     "panel.covid19_test_locations.work_time.closed_until": "Cerrado hasta",
     "panel.covid19_test_locations.all_providers.text": "Todos los proveedores",
     "panel.covid19_test_locations.call.hint": "Llamada",
+    "panel.covid19_test_locations.wait_time.label": "Tiempo de espera",
+    "panel.covid19_test_locations.wait_time.unavailable": "Indisponible",
 
     "panel.covid19.header.title": "COVID-19",
     "panel.covid19.latest_update.title": "Última actualización",
@@ -696,7 +705,6 @@
     "panel.health.next_steps.button.continue.title.find_locatio": "Encontrar ubicacion",
     "panel.health.next_steps.button.continue.title.care_team": "Póngase en contacto con Care Team",
     "panel.health.next_steps.label.next_steps": "PRÓXIMOS PASOS",
-    "panel.health.next_steps.label.asap": "Lo antes posible",
 
     "panel.health.symptoms.heading.title":"¿Estás experimentando alguno de estos síntomas?",
     "panel.health.symptoms.label.error.loading":"Error al cargar los síntomas.",

assets/strings.zh.json

@@ -303,6 +303,12 @@
 	"panel.covid19_passport.label.access.granted": "授予",
 	"panel.covid19_passport.label.access.denied": "否认",
     "panel.covid19_passport.message.missing_id_info": "找不到Illini ID信息. 您的I-Card可能已过期。请与ID中心联系.",
+	"panel.covid19_passport.button.show_page_1.title": "Show page 1 of 2",
+	"panel.covid19_passport.button.show_page_1.hint": "",
+	"panel.covid19_passport.button.show_page_2.title": "Show page 2 of 2",
+	"panel.covid19_passport.button.show_page_2.hint": "",
+	"panel.covid19_passport.label.page_1": "Page 1",
+	"panel.covid19_passport.label.page_2": "Page 2",
 
 	"panel.covid19_guidelines.header.title": "縣準則",
 	"panel.covid19_guidelines.description.title": "遵循這些當前準則，有助於阻止COVID-19的傳播。",
@@ -352,6 +358,8 @@
 	"panel.covid19_test_locations.work_time.closed_until": "关闭到",
 	"panel.covid19_test_locations.all_providers.text": "所有提供者",
 	"panel.covid19_test_locations.call.hint": "呼叫",
+	"panel.covid19_test_locations.wait_time.label": "等待時間",
+	"panel.covid19_test_locations.wait_time.unavailable": "不可用",
 
 	"panel.covid19.header.title": "COVID-19",
 	"panel.covid19.latest_update.title": "最近更新",
@@ -696,7 +704,6 @@
 	"panel.health.next_steps.button.continue.title.find_locatio": "查找位置",
 	"panel.health.next_steps.button.continue.title.care_team": "联系护理团队",
 	"panel.health.next_steps.label.next_steps": "下一步行动",
-	"panel.health.next_steps.label.asap": "尽快",
 
 	"panel.health.symptoms.heading.title":"你有这些症状吗?",
 	"panel.health.symptoms.label.error.loading":"未能加载症状.",

assets/styles.json

@@ -51,7 +51,12 @@
     "healthStatusOrange"                    :"#F29835",
     "healthStatusRed"                       :"#FF4F4F",
 
-    "lightBlue"                             :"#42b9ea"
+    "lightBlue"                             :"#42b9ea",
+
+    "healthLocationWaitTimeColorRed"        :"#ff0000",
+    "healthLocationWaitTimeColorYellow"     :"#ffff00",
+    "healthLocationWaitTimeColorGreen"      :"#00ff00",
+    "healthLocationWaitTimeColorGrey"       :"#808080"
   },
   "font_family": {
     "black": "ProximaNovaBlack",

assets/styles/styles-illinois.json

@@ -51,7 +51,12 @@
     "healthStatusOrange"                    :"#E84A27",
     "healthStatusRed"                       :"#FF4F4F",
 
-    "lightBlue"                             :"#42b9ea"
+    "lightBlue"                             :"#42b9ea",
+
+    "healthLocationWaitTimeColorRed"        :"#ff0000",
+    "healthLocationWaitTimeColorYellow"     :"#ffff00",
+    "healthLocationWaitTimeColorGreen"      :"#00ff00",
+    "healthLocationWaitTimeColorGrey"       :"#808080"
   },
   "font_family": {
     "black": "ProximaNovaBlack",

assets/styles/styles-purdue.json

@@ -50,7 +50,12 @@
     "healthStatusOrange"                    :"#E84A27",
     "healthStatusRed"                       :"#FF4F4F",
 
-    "lightBlue"                             :"#42b9ea"
+    "lightBlue"                             :"#42b9ea",
+
+    "healthLocationWaitTimeColorRed"        :"#ff0000",
+    "healthLocationWaitTimeColorYellow"     :"#ffff00",
+    "healthLocationWaitTimeColorGreen"      :"#00ff00",
+    "healthLocationWaitTimeColorGrey"       :"#808080"
   },
   "font_family": {
     "black": "ProximaNovaBlack",