Bump up release version to 2.0.5 (#242)

* Release v2.0.4 * use gson for to string function * move count execute to other thread * Revert register query count implementation Signed-off-by: Elly Kitoto <[email protected]> * Revert release version to 2.0.5 Signed-off-by: Elly Kitoto <[email protected]> Co-authored-by: Martin Ndegwa <[email protected]> Co-authored-by: hilpitome <[email protected]>
opensrp · Dec 23, 2021 · b463355 · b463355
1 parent 2d3e151
commit b463355
Show file tree

Hide file tree

Showing 11 changed files with 42 additions and 24 deletions.
diff --git a/build.gradle b/build.gradle
@@ -29,7 +29,13 @@ allprojects {
         maven { url "https://repo.maven.apache.org/maven2" }
         maven { url "http://cloudant.github.io/cloudant-sync-eap/repository" }
         maven { url "https://s3.amazonaws.com/repo.commonsware.com" }
-        maven { url 'https://dl.bintray.com/ibm-watson-health/ibm-fhir-server-releases'}
+        maven {
+            url 'https://dl.bintray.com/ibm-watson-health/ibm-fhir-server-releases'
+            content {
+                // Ignore this group
+                includeGroup "com.ibm.fhir"
+            }
+        }
         mavenLocal()
         jcenter()
     }

diff --git a/opensrp-path-zeir/build.gradle b/opensrp-path-zeir/build.gradle
@@ -75,8 +75,8 @@ android {
     applicationVariants.all { variant ->
         if (variant.name == "debug") {
             variant.outputs.each { output ->
-                output.versionCodeOverride = 31
-                output.versionNameOverride = "0.0.31-debug"
+                output.versionCodeOverride = 32
+                output.versionNameOverride = "0.0.33-debug"
             }
         } else if (variant.name == "preview") {
             variant.outputs.each { output ->
@@ -85,8 +85,8 @@ android {
             }
         } else if (variant.name == "release") {
             variant.outputs.each { output ->
-                output.versionCodeOverride = 18
-                output.versionNameOverride = "2.0.3-release"
+                output.versionCodeOverride = 20
+                output.versionNameOverride = "2.0.5-release"
             }
         }
     }
@@ -280,7 +280,7 @@ dependencies {
         exclude group: 'com.android.support', module: 'appcompat-v7'
     }
 
-    implementation('org.smartregister:opensrp-client-core:4.3.19-SNAPSHOT@aar') {
+    implementation('org.smartregister:opensrp-client-core:4.3.23-SNAPSHOT@aar') {
         transitive = true
         exclude group: 'id.zelory', module: 'compressor'
         exclude group: 'com.android.support', module: 'appcompat-v7'
@@ -293,6 +293,7 @@ dependencies {
         exclude group: 'org.smartregister', module: 'opensrp-client-reporting'
     }
 
+
     implementation('org.smartregister:opensrp-client-growth-monitoring:2.0.6-SNAPSHOT@aar') {
         transitive = true
         exclude group: 'id.zelory', module: 'compressor'
@@ -339,11 +340,13 @@ dependencies {
         exclude group: 'com.google.code.gson', module: 'gson'
         exclude group: 'com.simprints', module: 'libsimprints'
         exclude group: 'com.ibm.fhir', module: 'fhir-model'
+        exclude group: 'com.github.raihan-mpower', module:'FancyAlertDialog-Android'
     }
     implementation('com.google.android.material:material:1.4.0') {
         exclude group: 'com.android.support', module: 'recyclerview-v7'
         exclude group: 'com.android.support', module: 'cardview-v7'
     }
+    implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
 
     implementation 'androidx.appcompat:appcompat:1.3.1'
     annotationProcessor 'com.jakewharton:butterknife:10.2.1'

diff --git a/opensrp-path-zeir/src/main/assets/mother_vaccines.json b/opensrp-path-zeir/src/main/assets/mother_vaccines.json
@@ -0,0 +1 @@
+[]
diff --git a/opensrp-path-zeir/src/main/java/org/smartregister/path/application/ZeirApplication.java b/opensrp-path-zeir/src/main/java/org/smartregister/path/application/ZeirApplication.java
@@ -59,6 +59,7 @@
 import org.smartregister.path.repository.ClientRegisterTypeRepository;
 import org.smartregister.path.repository.ZeirRepository;
 import org.smartregister.path.util.AppConstants;
+import org.smartregister.path.util.AppExecutors;
 import org.smartregister.path.util.AppUtils;
 import org.smartregister.path.util.VaccineDuplicate;
 import org.smartregister.receiver.SyncStatusBroadcastReceiver;
@@ -99,6 +100,7 @@ public class ZeirApplication extends DrishtiApplication implements TimeChangedBr
     private CumulativeRepository cumulativeRepository;
     private CumulativePatientRepository cumulativePatientRepository;
     private CumulativeIndicatorRepository cumulativeIndicatorRepository;
+    private AppExecutors appExecutors;
 
     public static JsonSpecHelper getJsonSpecHelper() {
         return jsonSpecHelper;
@@ -515,5 +517,11 @@ public String getSyncLocations() {
             return LocationHelper.getInstance().locationIdsFromHierarchy();
         return "";
     }
+    public AppExecutors getAppExecutors() {
+        if (appExecutors == null) {
+            appExecutors = new AppExecutors();
+        }
+        return appExecutors;
+    }
 }
 
diff --git a/opensrp-path-zeir/src/main/java/org/smartregister/path/fragment/ChildRegisterFragment.java b/opensrp-path-zeir/src/main/java/org/smartregister/path/fragment/ChildRegisterFragment.java
@@ -114,6 +114,6 @@ public void setupSearchView(View view) {
         super.setupSearchView(view);
         ((View) searchView.getParent().getParent()).setBackgroundColor(
                 ContextCompat.getColor(requireContext(), R.color.toolbar_background));
-        searchView.setHint(getContext().getString(R.string.search_hint));
+        searchView.setHint(requireContext().getString(R.string.search_hint));
     }
 }
diff --git a/...p-path-zeir/src/main/java/org/smartregister/path/processor/AppClientProcessorForJava.java b/...p-path-zeir/src/main/java/org/smartregister/path/processor/AppClientProcessorForJava.java
@@ -192,7 +192,9 @@ public void processClient(List<EventClient> eventClients) {
             }
 
             // Process alerts for clients
-            Runnable runnable = () -> updateClientAlerts(clientsForAlertUpdates);
+            Runnable runnable = () -> {
+                updateClientAlerts(clientsForAlertUpdates);
+            };
             appExecutors.diskIO().execute(runnable);
             // Unsync events that are should not be in this device
             unSync(eventsToRemove);

diff --git a/...path-zeir/src/main/java/org/smartregister/path/widget/AdverseEffectDatePickerFactory.java b/...path-zeir/src/main/java/org/smartregister/path/widget/AdverseEffectDatePickerFactory.java
@@ -52,4 +52,6 @@ public void updateDatePicker(String date) {
             Timber.e(e);
         }
     }
+
+
 }
diff --git a/opensrp-path-zeir/src/main/res/anim/slide_down.xml b/opensrp-path-zeir/src/main/res/anim/slide_down.xml
diff --git a/opensrp-path-zeir/src/main/res/anim/slide_in.xml b/opensrp-path-zeir/src/main/res/anim/slide_in.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<translate
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:duration="@android:integer/config_mediumAnimTime"
+    android:fromXDelta="100%p"
+    android:toXDelta="0"/>
diff --git a/opensrp-path-zeir/src/main/res/anim/slide_out.xml b/opensrp-path-zeir/src/main/res/anim/slide_out.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<translate
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:duration="@android:integer/config_mediumAnimTime"
+    android:fromXDelta="0"
+    android:toXDelta="100%p"/>
diff --git a/opensrp-path-zeir/src/main/res/anim/slide_up.xml b/opensrp-path-zeir/src/main/res/anim/slide_up.xml
-Original file line number
+Diff line change
@@ Expand Up / @@ -52,4 +52,6 @@ public void updateDatePicker(String date) { @@
                 Timber.e(e);
             }
         }
     }