diff --git a/build.gradle b/build.gradle index d9248af7..84073777 100644 --- 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 index dfbfb7c0..53d54e83 100644 --- 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 new file mode 100644 index 00000000..0637a088 --- /dev/null +++ b/opensrp-path-zeir/src/main/assets/mother_vaccines.json @@ -0,0 +1 @@ +[] \ No newline at end of file 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 index 6aa226e9..38a0c2b5 100644 --- 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 index 2229d538..1081a312 100644 --- 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/opensrp-path-zeir/src/main/java/org/smartregister/path/processor/AppClientProcessorForJava.java b/opensrp-path-zeir/src/main/java/org/smartregister/path/processor/AppClientProcessorForJava.java index 8c2fadd4..950d5dde 100644 --- a/opensrp-path-zeir/src/main/java/org/smartregister/path/processor/AppClientProcessorForJava.java +++ b/opensrp-path-zeir/src/main/java/org/smartregister/path/processor/AppClientProcessorForJava.java @@ -192,7 +192,9 @@ public void processClient(List 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/opensrp-path-zeir/src/main/java/org/smartregister/path/widget/AdverseEffectDatePickerFactory.java b/opensrp-path-zeir/src/main/java/org/smartregister/path/widget/AdverseEffectDatePickerFactory.java index f8d90ecf..28cb4099 100644 --- a/opensrp-path-zeir/src/main/java/org/smartregister/path/widget/AdverseEffectDatePickerFactory.java +++ b/opensrp-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 deleted file mode 100644 index 7cc1141c..00000000 --- a/opensrp-path-zeir/src/main/res/anim/slide_down.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - \ No newline at end of file diff --git a/opensrp-path-zeir/src/main/res/anim/slide_in.xml b/opensrp-path-zeir/src/main/res/anim/slide_in.xml new file mode 100644 index 00000000..369ee121 --- /dev/null +++ b/opensrp-path-zeir/src/main/res/anim/slide_in.xml @@ -0,0 +1,6 @@ + + \ No newline at end of file diff --git a/opensrp-path-zeir/src/main/res/anim/slide_out.xml b/opensrp-path-zeir/src/main/res/anim/slide_out.xml new file mode 100644 index 00000000..df981bde --- /dev/null +++ b/opensrp-path-zeir/src/main/res/anim/slide_out.xml @@ -0,0 +1,6 @@ + + \ No newline at end of file diff --git a/opensrp-path-zeir/src/main/res/anim/slide_up.xml b/opensrp-path-zeir/src/main/res/anim/slide_up.xml deleted file mode 100644 index fd385568..00000000 --- a/opensrp-path-zeir/src/main/res/anim/slide_up.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - \ No newline at end of file