From 7767726887fc47e15e5e64d327db459862bf15fd Mon Sep 17 00:00:00 2001 From: Fikri Milano Date: Mon, 16 Dec 2024 16:47:52 +0700 Subject: [PATCH 1/2] Get QR when using summary mode (#3661) --- .../fhircore/quest/ui/questionnaire/QuestionnaireViewModel.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireViewModel.kt b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireViewModel.kt index 8ad2172d7f..30f5d0e220 100644 --- a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireViewModel.kt +++ b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireViewModel.kt @@ -73,6 +73,7 @@ import org.smartregister.fhircore.engine.domain.model.ActionParameter import org.smartregister.fhircore.engine.domain.model.ActionParameterType import org.smartregister.fhircore.engine.domain.model.isEditable import org.smartregister.fhircore.engine.domain.model.isReadOnly +import org.smartregister.fhircore.engine.domain.model.isSummary import org.smartregister.fhircore.engine.rulesengine.RulesExecutor import org.smartregister.fhircore.engine.task.FhirCarePlanGenerator import org.smartregister.fhircore.engine.util.DispatcherProvider @@ -1136,6 +1137,7 @@ constructor( !resourceIdentifier.isNullOrEmpty() && (questionnaireConfig.isEditable() || questionnaireConfig.isReadOnly() || + questionnaireConfig.isSummary() || questionnaireConfig.saveDraft) ) { defaultRepository From ce5a557901cab03c280c56c8f1512d9769399938 Mon Sep 17 00:00:00 2001 From: Elly Kitoto Date: Mon, 16 Dec 2024 13:48:02 +0300 Subject: [PATCH 2/2] Disable apk minification (#3660) * Disable apk minification Signed-off-by: Elly Kitoto * Format code Signed-off-by: Elly Kitoto --------- Signed-off-by: Elly Kitoto --- android/quest/build.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/android/quest/build.gradle.kts b/android/quest/build.gradle.kts index ff2834411a..8c05a99080 100644 --- a/android/quest/build.gradle.kts +++ b/android/quest/build.gradle.kts @@ -116,8 +116,8 @@ android { } getByName("release") { - isMinifyEnabled = true - isShrinkResources = true + isMinifyEnabled = false + isShrinkResources = false proguardFiles( getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro",