diff --git a/CHANGELOG.md b/CHANGELOG.md index ea7e1149ca5..36ee3c8a562 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,16 @@ - Bump AndroidX Test Runner to v1.7.0 - Bump AndroidX Test Rules to v1.7.0 - Bump AndroidX JUnit to v1.3.0 +- Bump Jackson Core to v2.20.0 +- Bump Play Services Auth to v21.4.0 +- Bump Material Components to v1.12.0 +- Bump Kotlin to v2.2.20 +- Bump AndroidX Work to v2.10.4 +- Bump AndroidX ViewModel to v2.9.4 + +### Changes + +- Hide next button when registration is going ## 2025.09.09 diff --git a/app/src/main/java/org/simple/clinic/registration/phone/RegistrationPhoneScreen.kt b/app/src/main/java/org/simple/clinic/registration/phone/RegistrationPhoneScreen.kt index ca8a9b283b5..777ebb7dfed 100644 --- a/app/src/main/java/org/simple/clinic/registration/phone/RegistrationPhoneScreen.kt +++ b/app/src/main/java/org/simple/clinic/registration/phone/RegistrationPhoneScreen.kt @@ -174,6 +174,14 @@ class RegistrationPhoneScreen : progressView.visibility = View.GONE } + override fun showNextButton() { + nextButtonFrame.visibility = View.VISIBLE + } + + override fun hideNextButton() { + nextButtonFrame.visibility = View.GONE + } + override fun openLoginPinEntryScreen() { router.push(LoginPinScreenKey()) } diff --git a/app/src/main/java/org/simple/clinic/registration/phone/RegistrationPhoneUi.kt b/app/src/main/java/org/simple/clinic/registration/phone/RegistrationPhoneUi.kt index 07856a70d3e..a2d508c5cc4 100644 --- a/app/src/main/java/org/simple/clinic/registration/phone/RegistrationPhoneUi.kt +++ b/app/src/main/java/org/simple/clinic/registration/phone/RegistrationPhoneUi.kt @@ -7,4 +7,6 @@ interface RegistrationPhoneUi { fun hideAnyError() fun showProgressIndicator() fun hideProgressIndicator() + fun showNextButton() + fun hideNextButton() } diff --git a/app/src/main/java/org/simple/clinic/registration/phone/RegistrationPhoneUiRenderer.kt b/app/src/main/java/org/simple/clinic/registration/phone/RegistrationPhoneUiRenderer.kt index 41e3e16d2ee..6c83ff4973c 100644 --- a/app/src/main/java/org/simple/clinic/registration/phone/RegistrationPhoneUiRenderer.kt +++ b/app/src/main/java/org/simple/clinic/registration/phone/RegistrationPhoneUiRenderer.kt @@ -21,8 +21,10 @@ class RegistrationPhoneUiRenderer( if (mode == RegistrationUiMode.RegistrationOngoing) { registrationResultValueCallback.clear() ui.showProgressIndicator() + ui.hideNextButton() } else { ui.hideProgressIndicator() + ui.showNextButton() } } diff --git a/app/src/test/java/org/simple/clinic/registration/phone/RegistrationPhoneScreenLogicTest.kt b/app/src/test/java/org/simple/clinic/registration/phone/RegistrationPhoneScreenLogicTest.kt index 7f7fa65af7f..76af8bba9a6 100644 --- a/app/src/test/java/org/simple/clinic/registration/phone/RegistrationPhoneScreenLogicTest.kt +++ b/app/src/test/java/org/simple/clinic/registration/phone/RegistrationPhoneScreenLogicTest.kt @@ -155,6 +155,7 @@ class RegistrationPhoneScreenLogicTest { // then verify(ui).showProgressIndicator() + verify(ui).hideNextButton() verify(findUserWithPhoneNumber).find(inputNumber) } @@ -176,6 +177,8 @@ class RegistrationPhoneScreenLogicTest { // then verify(ui).showProgressIndicator() verify(ui).hideProgressIndicator() + verify(ui).hideNextButton() + verify(ui).showNextButton() verify(ui).showUnexpectedErrorMessage() clearInvocations(ui) @@ -186,6 +189,8 @@ class RegistrationPhoneScreenLogicTest { // then verify(ui).showProgressIndicator() verify(ui).hideProgressIndicator() + verify(ui).hideNextButton() + verify(ui).showNextButton() verify(ui).showNetworkErrorMessage() } @@ -291,6 +296,7 @@ class RegistrationPhoneScreenLogicTest { // then verify(ui).showProgressIndicator() + verify(ui).hideNextButton() verify(facilitySync).pullWithResult() } @@ -324,6 +330,7 @@ class RegistrationPhoneScreenLogicTest { // then verify(ui).hideProgressIndicator() + verify(ui).showNextButton() verify(ui).showNetworkErrorMessage() verify(findUserWithPhoneNumber, never()).find(phoneNumber) } @@ -342,6 +349,7 @@ class RegistrationPhoneScreenLogicTest { // then verify(ui).hideProgressIndicator() + verify(ui).showNextButton() verify(ui).showUnexpectedErrorMessage() verify(findUserWithPhoneNumber, never()).find(phoneNumber) } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 8a8f8c7ccbf..7100061e772 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -5,16 +5,16 @@ androidx-cameraView = "1.4.2" androidx-camera = "1.4.2" androidx-paging = "3.3.6" androidx-room = "2.7.2" -androidx-work = "2.10.3" +androidx-work = "2.10.4" androidx-security-crypto = "1.1.0-alpha07" -androidx-viewmodel = "2.9.3" +androidx-viewmodel = "2.9.4" androidx-lifecycle = "2.9.4" androidx-activity = "1.10.1" chucker = "4.2.0" dagger = "2.57.1" -kotlin = "2.2.10" +kotlin = "2.2.20" ksp = "2.2.10-2.0.2" @@ -116,7 +116,7 @@ itemanimators = "com.mikepenz:itemanimators:1.1.0" itext7 = "com.itextpdf:itext7-core:7.2.5" -jackson-core = "com.fasterxml.jackson.core:jackson-core:2.19.2" +jackson-core = "com.fasterxml.jackson.core:jackson-core:2.20.0" jbcrypt = "org.mindrot:jbcrypt:0.4" @@ -140,7 +140,7 @@ logback-classic = "ch.qos.logback:logback-classic:1.2.11" lottie = "com.airbnb.android:lottie-compose:6.6.7" -material = "com.google.android.material:material:1.12.0" +material = "com.google.android.material:material:1.13.0" mockito-kotlin = "org.mockito.kotlin:mockito-kotlin:5.4.0" @@ -160,7 +160,7 @@ okhttp-interceptor-logging = { module = "com.squareup.okhttp3:logging-intercepto openCsv = "com.opencsv:opencsv:5.12.0" play-app-update = "com.google.android.play:app-update-ktx:2.1.0" -play-services-auth = "com.google.android.gms:play-services-auth:21.3.0" +play-services-auth = "com.google.android.gms:play-services-auth:21.4.0" play-services-location = "com.google.android.gms:play-services-location:21.3.0" play-services-mlkit-barcode = "com.google.android.gms:play-services-mlkit-barcode-scanning:18.3.1"