Update layers and location btn (#79)

* remove test data * update task lib * fix qa bugs * update location search from tree dialog * add streets and satellite + streets layer and myLocationBtn * update map base layers logic * update dependecies * update core snapshot * remove condition for updating jurisdictions * update app versionName * move juridictions update to background thread * update structure with gps coordinates * load user location after user logs in * update release version * update plan evaluator * add tests * code cleanup * add test * code cleanup
opensrp · Jul 9, 2021 · 1377fd3 · 1377fd3
1 parent dd08a49
commit 1377fd3
Show file tree

Hide file tree

Showing 71 changed files with 10,653 additions and 261 deletions.
diff --git a/.tx/config b/.tx/config
@@ -12,28 +12,28 @@ type = ANDROID
 file_filter = opensrp-eusm/src/main/resources/fix_problem_<lang>.properties
 source_file = opensrp-eusm/src/main/resources/fix_problem.properties
 source_lang = en
-type = PROPERTIES
+type = UNICODEPROPERTIES
 
 [opensrp-eusm.flag_problem-properties]
 file_filter = opensrp-eusm/src/main/resources/flag_problem_<lang>.properties
 source_file = opensrp-eusm/src/main/resources/flag_problem.properties
 source_lang = en
-type = PROPERTIES
+type = UNICODEPROPERTIES
 
 [opensrp-eusm.looks_good-properties]
 file_filter = opensrp-eusm/src/main/resources/looks_good_<lang>.properties
 source_file = opensrp-eusm/src/main/resources/looks_good.properties
 source_lang = en
-type = PROPERTIES
+type = UNICODEPROPERTIES
 
 [opensrp-eusm.record_gps-properties]
 file_filter = opensrp-eusm/src/main/resources/record_gps_<lang>.properties
 source_file = opensrp-eusm/src/main/resources/record_gps.properties
 source_lang = en
-type = PROPERTIES
+type = UNICODEPROPERTIES
 
 [opensrp-eusm.service_point_check-properties]
 file_filter = opensrp-eusm/src/main/resources/service_point_check_<lang>.properties
 source_file = opensrp-eusm/src/main/resources/service_point_check.properties
 source_lang = en
-type = PROPERTIES
+type = UNICODEPROPERTIES
diff --git a/opensrp-eusm/build.gradle b/opensrp-eusm/build.gradle
@@ -51,7 +51,7 @@ android {
         minSdkVersion 18
         targetSdkVersion 28
         versionCode 1
-        versionName "0.0.1"
+        versionName "0.0.9"
         multiDexEnabled true
         buildConfigField "long", "MAX_SERVER_TIME_DIFFERENCE", "1800000l"
         buildConfigField "boolean", "TIME_CHECK", "false"
@@ -122,6 +122,29 @@ android {
 
     buildTypes {
 
+        release {
+            minifyEnabled false
+            zipAlignEnabled true
+
+            resValue "string", 'opensrp_url', '"https://unicef-mg-eusm.smartregister.org/opensrp/"'
+            buildConfigField "int", "DATABASE_VERSION", '1'
+            buildConfigField "int", "OPENMRS_UNIQUE_ID_INITIAL_BATCH_SIZE", '250'
+            buildConfigField "int", "OPENMRS_UNIQUE_ID_BATCH_SIZE", '100'
+            buildConfigField "int", "OPENMRS_UNIQUE_ID_SOURCE", '2'
+            buildConfigField "long", "SYNC_INTERVAL_IN_MINUTES", '15'
+            buildConfigField "long", "PULL_UNIQUE_IDS_MINUTES", '15'
+            buildConfigField "String", "ADMIN_PASSWORD_NOT_NEAR_STRUCTURES", '"AdminPass1"'
+            buildConfigField "float", "MY_LOCATION_BUFFER", '25'
+            buildConfigField "boolean", "VALIDATE_FAR_STRUCTURES", 'false'
+            buildConfigField "int", "RESOLVE_LOCATION_TIMEOUT_IN_SECONDS", '60'
+            buildConfigField "boolean", "DISPLAY_OUTSIDE_OPERATIONAL_AREA_MASK", 'false'
+            buildConfigField "boolean", "DISPLAY_DISTANCE_SCALE", 'true'
+            buildConfigField "String[]", "FACILITY_LEVELS", '{"Country", "Region", "District"}'
+            buildConfigField "String[]", "LOCATION_LEVELS", '{"Country", "Region", "District"}'
+
+            testCoverageEnabled true
+        }
+
         debug {
             resValue "string", 'opensrp_url', '"https://mg-eusm-staging.smartregister.org/opensrp/"'
             buildConfigField "int", "DATABASE_VERSION", '1'
@@ -176,9 +199,9 @@ dependencies {
         exclude group: 'stax', module: 'stax-api'
     }
 
-    jarJar 'com.ibm.fhir:fhir-model:4.2.3'
+    jarJar 'com.ibm.fhir:fhir-model:4.7.0'
 
-    implementation('org.smartregister:opensrp-client-core:4.1.10-SNAPSHOT@aar') {
+    implementation('org.smartregister:opensrp-client-core:4.3.10-SNAPSHOT@aar') {
         transitive = true
         exclude group: 'com.android.support', module: 'appcompat-v7'
         exclude group: 'com.github.ybq', module: 'Android-SpinKit'
@@ -195,7 +218,7 @@ dependencies {
         exclude group: 'com.android.support', module: 'appcompat-v7'
     }
 
-    implementation('org.smartregister:opensrp-client-native-form:2.0.2-SNAPSHOT@aar') {
+    implementation('org.smartregister:opensrp-client-native-form:2.0.6-SNAPSHOT@aar') {
         transitive = true
         exclude group: 'com.android.support', module: 'appcompat-v7'
         exclude group: 'com.android.support', module: 'cardview-v7'
@@ -205,25 +228,16 @@ dependencies {
         exclude group: 'io.ona.rdt-capture', module: 'lib'
     }
 
-    implementation('org.smartregister:opensrp-client-reporting:0.0.6-RVL-SNAPSHOT@aar') {
-        transitive = true
-        exclude group: 'org.smartregister', module: 'opensrp-client-core'
-        exclude group: 'org.smartregister', module: 'opensrp-client-native-form'
-        exclude group: 'com.android.support', module: 'design'
-        exclude group: 'com.github.lecho', module: 'hellocharts-library'
-        exclude group: 'com.android.support', module: 'appcompat-v7'
-    }
-
 //    implementation(project(':opensrp-tasking')) {
-    implementation('org.smartregister:opensrp-client-tasking:0.0.3-v5-EUSM-SNAPSHOT') {
+    implementation('org.smartregister:opensrp-client-tasking:0.0.3-v17-EUSM-SNAPSHOT') {
         transitive = true
         exclude group: 'org.smartregister', module: 'opensrp-client-core'
         exclude group: 'com.ibm.fhir', module: 'fhir-model'
         exclude group: 'io.ona.kujaku', module: 'library'
         exclude group: 'org.smartregister', module: 'opensrp-client-native-form'
     }
 
-    api('org.smartregister:opensrp-client-stock:1.2.3-SNAPSHOT') {
+    api('org.smartregister:opensrp-client-stock:1.2.4-SNAPSHOT') {
         transitive = true
         exclude group: 'org.smartregister', module: 'opensrp-client-core'
         exclude group: 'org.smartregister', module: 'opensrp-client-native-form'
@@ -245,7 +259,7 @@ dependencies {
     compileOnly 'org.projectlombok:lombok:1.18.12'
     annotationProcessor 'org.projectlombok:lombok:1.18.12'
 
-    testImplementation 'com.ibm.fhir:fhir-model:4.2.3'
+    testImplementation 'com.ibm.fhir:fhir-model:4.7.0'
 
     testImplementation 'junit:junit:4.12'
     testImplementation group: 'org.hamcrest', name: 'hamcrest-core', version: '2.2'
@@ -310,5 +324,5 @@ task javadoc(type: Javadoc) {
 jarJar {
 
     // Dependencies and related JarJar rules
-    remove = ['fhir-model-4.2.3.jar': 'com.ibm.fhir.model.visitor.CopyingVisitor*']
+    remove = ['fhir-model-4.7.0.jar': 'com.ibm.fhir.model.visitor.CopyingVisitor*']
 }
diff --git a/opensrp-eusm/src/main/AndroidManifest.xml b/opensrp-eusm/src/main/AndroidManifest.xml
@@ -17,14 +17,14 @@
 
     <application
         android:name=".application.EusmApplication"
-        android:allowBackup="true"
+        android:allowBackup="false"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/eusm_app_name"
         android:networkSecurityConfig="@xml/network_security_config"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
         android:usesCleartextTraffic="true"
-        tools:replace="android:label,android:theme">
+        tools:replace="android:label,android:theme,android:allowBackup">
         <activity
             android:name=".activity.ProductInfoActivity"
             android:screenOrientation="portrait"

diff --git a/opensrp-eusm/src/main/assets/app.properties b/opensrp-eusm/src/main/assets/app.properties
@@ -3,4 +3,5 @@ PORT=-1
 SHOULD_VERIFY_CERTIFICATE=false
 SYNC_DOWNLOAD_BATCH_SIZE=100
 CHOOSE_OPERATIONAL_AREA_FIRST=false
-select_plan_then_area=true
+select_plan_then_area=true
+allow.offline.login.with.invalid.token=true
diff --git a/opensrp-eusm/src/main/assets/reveal-streets-satellite.json b/opensrp-eusm/src/main/assets/reveal-streets-satellite.json
@@ -23,7 +23,10 @@
       "data": {
         "type": "FeatureCollection",
         "features": []
-      }
+      },
+      "cluster": true,
+      "clusterMaxZoom": 13,
+      "clusterRadius": 50
     },
     "select-data": {
       "type": "geojson",
@@ -62,16 +65,14 @@
           [
             "zoom"
           ],
-          7.0,
-          13,
-          13.0,
-          15
+          7.0, 13,
+          13.0, 15
         ],
         "circle-color": [
           "match",
           [
             "get",
-            "taskStatus"
+            "taskStatusType"
           ],
           [
             "in_progress"
@@ -81,7 +82,11 @@
             "completed"
           ],
           "hsl(101.6,66.8%,44.9%)",
-          "hsl(0, 0%, 64%)"
+          [
+            "not_started"
+          ],
+          "hsl(0, 0%, 64%)",
+          "hsl(100, 100%, 100%)"
         ],
         "circle-stroke-width": 2,
         "circle-opacity": 1