Fix migration sync issues (#3229)

* Fix UserSettingScreen UI padding and scroll Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Update SDK engine library version Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Update fhir-engine library version Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Update APK Release version to 1.0.5 * Update fhir engine version Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Bump up the Version code and number --------- Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> Co-authored-by: Elly Kitoto <junkmailstoelly@gmail.com> Co-authored-by: Martin Ndegwa <ndegwamartin@users.noreply.github.com>
opensrp · May 2, 2024 · a571668 · a571668
1 parent 2fe4f29
commit a571668
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/...ne/src/main/java/org/smartregister/fhircore/engine/configuration/ConfigurationRegistry.kt b/...ne/src/main/java/org/smartregister/fhircore/engine/configuration/ConfigurationRegistry.kt
@@ -475,7 +475,7 @@ constructor(
           if (bundleEntryComponent.resource != null) {
             addOrUpdateRemote(bundleEntryComponent.resource)
             Timber.d(
-              "Fetched and processed resources ${bundleEntryComponent.resource.resourceType}/${bundleEntryComponent.resource.id}"
+              "Fetched and processed resources ${bundleEntryComponent.resource.resourceType}/${bundleEntryComponent.resource.logicalId}"
             )
           }
         }

diff --git a/android/gradle/libs.versions.toml b/android/gradle/libs.versions.toml
@@ -25,7 +25,7 @@ desugar-jdk-libs = "1.1.5"
 easy-rules-jexl = "4.1.0"
 espresso-core = "3.5.0"
 fhir-common-utils = "0.0.10-SNAPSHOT"
-fhir-engine = "0.1.0-beta03-preview9.5.4-SNAPSHOT"
+fhir-engine = "0.1.0-beta03-preview9.5.5-RC3-SNAPSHOT"
 foundation = "1.3.1"
 fragment-ktx = "1.5.5"
 fragment-testing = "1.5.2"

diff --git a/android/quest/build.gradle.kts b/android/quest/build.gradle.kts
@@ -53,8 +53,8 @@ android {
     applicationId = "org.smartregister.opensrp"
     minSdk = 26
     targetSdk = 33
-    versionCode = 10
-    versionName = "1.0.4"
+    versionCode = 12
+    versionName = "1.0.6"
     multiDexEnabled = true
 
     buildConfigField("boolean", "SKIP_AUTH_CHECK", "false")

diff --git a/.../quest/src/main/java/org/smartregister/fhircore/quest/ui/usersetting/UserSettingScreen.kt b/.../quest/src/main/java/org/smartregister/fhircore/quest/ui/usersetting/UserSettingScreen.kt
@@ -26,12 +26,15 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.requiredHeight
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.layout.wrapContentWidth
+import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.AlertDialog
 import androidx.compose.material.CircularProgressIndicator
 import androidx.compose.material.Divider
@@ -141,7 +144,7 @@ fun UserSettingScreen(
       )
     }
   ) {
-    Column(modifier = modifier.background(Color.White)) {
+    Column(modifier = modifier.background(Color.White).verticalScroll(rememberScrollState())) {
       if (!username.isNullOrEmpty()) {
         Column(
           modifier = modifier.background(Color.White).padding(vertical = 24.dp).fillMaxWidth(),
@@ -311,7 +314,7 @@ fun UserSettingScreen(
         modifier =
           modifier.background(color = colorResource(id = R.color.backgroundGray)).fillMaxWidth()
       ) {
-        Spacer(modifier = Modifier.weight(1f))
+        Spacer(modifier = Modifier.height(24.dp))
 
         Image(
           painterResource(R.drawable.logo_fhir_core),