Release/v2.5.7+507

CHANGELOG.md

@@ -6,9 +6,31 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+## [2.5.7] - 2020-09-09
+### 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.
+
+## [2.5.6] - 2020-09-08
+### Changed
+ - Removed SAR status entries from sample health rules. Use PCR entries instead that actually contain the same status rules.
+ - Fixed warnings.
+
+### Added
+ - Added 'test-user' condition [#125](https://github.com/rokwire/safer-illinois-app/issues/125).
+ - Added 'next_step_html' to status rules and status blob. Acknowleged in Info and Next Steps panels. [#128](https://github.com/rokwire/safer-illinois-app/issues/128).
+ - Added 'warning' to status rules and status blob. Acknowleged in Info panel. [#127](https://github.com/rokwire/safer-illinois-app/issues/127).
+
 ## [2.5.5] - 2020-09-04
 ### Changed
- - Build number to 505
+ - Updated health rules. [#107](https://github.com/rokwire/safer-illinois-app/issues/107)
+ - Do not process pending events if we failed to load history. [#94](https://github.com/rokwire/safer-illinois-app/issues/94)
+ - Mark pending event that persist in history table as processed.
+
+### Fixed
+ - Add null check before using instance props. [#119](https://github.com/rokwire/safer-illinois-app/pull/119)
+ - Fix issue with _determineIsOpen not checking weekDay. [#111](https://github.com/rokwire/safer-illinois-app/pull/111)
 
 ## [2.4.5] - 2020-09-01
 ### Changed

android/app/build.gradle

@@ -73,6 +73,7 @@ android {
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
         manifestPlaceholders = [
+                mapsApiKey  : "${keysProperties.getProperty('googleMapsApiKey')}",
                 backupApiKey: "${keysProperties.getProperty('androidBackupApiKey')}"
         ]
     }
@@ -137,6 +138,7 @@ dependencies {
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'com.google.android.gms:play-services-location:17.0.0'
     implementation 'com.android.volley:volley:1.1.1'
     //Firebase
     implementation 'com.google.firebase:firebase-core:17.2.3'
@@ -146,6 +148,15 @@ dependencies {
     implementation 'com.crashlytics.sdk.android:crashlytics:2.10.1'
     //end Common
 
+    //Google Maps
+    implementation 'com.google.android.gms:play-services-maps:17.0.0'
+    implementation 'com.google.code.gson:gson:2.8.5'
+    //end Google Maps
+
+    //Google Maps Utils
+    implementation 'com.google.maps.android:android-maps-utils:0.5'
+    //end Google Maps Utils
+
     //Zxing
     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 }

android/app/src/main/AndroidManifest.xml

@@ -57,6 +57,9 @@
         tools:ignore="GoogleAppIndexingWarning"
         tools:replace="android:allowBackup"
         android:usesCleartextTraffic="true">
+        <meta-data
+            android:name="com.google.android.geo.API_KEY"
+            android:value="${mapsApiKey}"/>
         <meta-data
             android:name="com.google.android.backup.api_key"
             android:value="${backupApiKey}" />

android/app/src/main/java/edu/illinois/covid/Constants.java

@@ -18,14 +18,15 @@
 
 import android.os.ParcelUuid;
 
+import com.google.android.gms.maps.model.LatLng;
+
 import java.util.UUID;
 
 public class Constants {
 
     //Flutter communication methods
     static final String APP_INIT_KEY = "init";
     static final String MAP_DIRECTIONS_KEY = "directions";
-    static final String MAP_PICK_LOCATION_KEY = "pickLocation";
     static final String MAP_KEY = "map";
     static final String SHOW_NOTIFICATION_KEY = "showNotification";
     static final String APP_DISMISS_SAFARI_VC_KEY = "dismissSafariVC";
@@ -41,6 +42,17 @@ public class Constants {
     static final String HEALTH_RSI_PRIVATE_KEY = "healthRSAPrivateKey";
     static final String BARCODE_KEY = "barcode";
 
+    //Maps
+    public static final LatLng DEFAULT_INITIAL_CAMERA_POSITION = new LatLng(40.102116, -88.227129); //Illinois University: Center of Campus //(40.096230, -88.235899); // State Farm Center
+    public static final float DEFAULT_CAMERA_ZOOM = 17.0f;
+    static final float FIRST_THRESHOLD_MARKER_ZOOM = 16.0f;
+    static final float SECOND_THRESHOLD_MARKER_ZOOM = 16.89f;
+    static final int MARKER_TITLE_MAX_SYMBOLS_NUMBER = 15;
+    public static final double EXPLORE_LOCATION_THRESHOLD_DISTANCE = 200.0; //meters
+    public static final float INDOORS_BUILDING_ZOOM = 17.0f;
+    public static final String ANALYTICS_ROUTE_LOCATION_FORMAT = "{\"latitude\":%f,\"longitude\":%f,\"floor\":%d}";
+    public static final String ANALYTICS_USER_LOCATION_FORMAT = "{\"latitude\":%f,\"longitude\":%f,\"floor\":%d,\"timestamp\":%d}";
+
     //Health
     static final String HEALTH_SHARED_PREFS_FILE_NAME = "health_shared_prefs";
 

android/app/src/main/java/edu/illinois/covid/MainActivity.java

@@ -18,6 +18,7 @@
 
 import android.Manifest;
 import android.app.Application;
+import android.content.Intent;
 import android.content.pm.ActivityInfo;
 import android.content.pm.PackageManager;
 import android.graphics.Bitmap;
@@ -49,6 +50,9 @@
 
 import edu.illinois.covid.exposure.ExposurePlugin;
 import edu.illinois.covid.gallery.GalleryPlugin;
+import edu.illinois.covid.maps.MapActivity;
+import edu.illinois.covid.maps.MapDirectionsActivity;
+import edu.illinois.covid.maps.MapViewFactory;
 import io.flutter.app.FlutterActivity;
 import io.flutter.plugin.common.MethodCall;
 import io.flutter.plugin.common.MethodChannel;
@@ -66,14 +70,13 @@ public class MainActivity extends FlutterActivity implements MethodChannel.Metho
 
     private ExposurePlugin exposurePlugin;
 
-    private static MethodChannel.Result pickLocationResult;
-
     private HashMap keys;
 
     private int preferredScreenOrientation;
     private Set<Integer> supportedScreenOrientations;
 
     private RequestLocationCallback rlCallback;
+
     // Gallery Plugin
     private GalleryPlugin galleryPlugin;
 
@@ -139,6 +142,10 @@ public void onRequestPermissionsResult(int requestCode, @NonNull String[] permis
     private void registerPlugins() {
         GeneratedPluginRegistrant.registerWith(this);
 
+        // MapView
+        Registrar registrar = registrarFor("MapPlugin");
+        registrar.platformViewRegistry().registerViewFactory("mapview", new MapViewFactory(this, registrar));
+
         // ExposureNotifications
         Registrar exposureRegistrar = registrarFor("ExposurePlugin");
         exposurePlugin = ExposurePlugin.registerWith(exposureRegistrar);
@@ -169,6 +176,35 @@ private void initWithParams(Object keys) {
         this.keys = keysMap;
     }
 
+    private void launchMapsDirections(Object explore, Object options) {
+        Intent intent = new Intent(this, MapDirectionsActivity.class);
+        if (explore instanceof HashMap) {
+            HashMap singleExplore = (HashMap) explore;
+            intent.putExtra("explore", singleExplore);
+        } else if (explore instanceof ArrayList) {
+            ArrayList exploreList = (ArrayList) explore;
+            intent.putExtra("explore", exploreList);
+        }
+        HashMap optionsMap = (options instanceof HashMap) ? (HashMap) options : null;
+        if (optionsMap != null) {
+            intent.putExtra("options", optionsMap);
+        }
+        startActivity(intent);
+    }
+
+    private void launchMap(Object target, Object options, Object markers) {
+        HashMap targetMap = (target instanceof HashMap) ? (HashMap) target : null;
+        HashMap optionsMap = (options instanceof HashMap) ? (HashMap) options : null;
+        ArrayList<HashMap> markersValues = (markers instanceof  ArrayList) ? ( ArrayList<HashMap>) markers : null;
+        Intent intent = new Intent(this, MapActivity.class);
+        Bundle serializableExtras = new Bundle();
+        serializableExtras.putSerializable("target", targetMap);
+        serializableExtras.putSerializable("options", optionsMap);
+        serializableExtras.putSerializable("markers", markersValues);
+        intent.putExtras(serializableExtras);
+        startActivity(intent);
+    }
+
     private void launchNotification(MethodCall methodCall) {
         String title = methodCall.argument("title");
         String body = methodCall.argument("body");
@@ -435,13 +471,17 @@ public void onMethodCall(MethodCall methodCall, @NonNull MethodChannel.Result re
                     result.success(true);
                     break;
                 case Constants.MAP_DIRECTIONS_KEY:
-                    result.success(null);
-                    break;
-                case Constants.MAP_PICK_LOCATION_KEY:
-                    result.success(null);
+                    Object explore = methodCall.argument("explore");
+                    Object optionsObj = methodCall.argument("options");
+                    launchMapsDirections(explore, optionsObj);
+                    result.success(true);
                     break;
                 case Constants.MAP_KEY:
-                    result.success(null);
+                    Object target = methodCall.argument("target");
+                    Object options = methodCall.argument("options");
+                    Object markers = methodCall.argument("markers");
+                    launchMap(target, options,markers);
+                    result.success(true);
                     break;
                 case Constants.SHOW_NOTIFICATION_KEY:
                     launchNotification(methodCall);