Merge pull request #5646 from simpledotorg/master

tramline-github[bot] · web-flow · commit 2a2d8c6f4ff8 · 2025-10-06T03:30:09.000Z
diff --git a/.github/workflows/benchmark_suite.yml b/.github/workflows/benchmark_suite.yml
@@ -21,10 +21,10 @@ jobs:
           sudo udevadm trigger --name-match=kvm
 
       - name: Checkout Android source
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Setup JDK
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: 'zulu'
           java-version: 17
diff --git a/.github/workflows/build_prod.yml b/.github/workflows/build_prod.yml
@@ -43,10 +43,10 @@ jobs:
 
       - name: Checkout
         if: github.event.inputs.tramline-input == null || github.event.inputs.tramline-input == ''
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Setup JDK
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           java-version: 17
           distribution: zulu
diff --git a/.github/workflows/build_sandbox.yml b/.github/workflows/build_sandbox.yml
@@ -42,10 +42,10 @@ jobs:
 
       - name: Checkout
         if: github.event.inputs.tramline-input == null || github.event.inputs.tramline-input == ''
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Setup JDK
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           java-version: 17
           distribution: zulu
diff --git a/.github/workflows/build_staging.yml b/.github/workflows/build_staging.yml
@@ -42,10 +42,10 @@ jobs:
 
       - name: Checkout
         if: github.event.inputs.tramline-input == null || github.event.inputs.tramline-input == ''
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Setup JDK
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           java-version: 17
           distribution: zulu
diff --git a/.github/workflows/ci_checks.yml b/.github/workflows/ci_checks.yml
@@ -18,7 +18,7 @@ jobs:
     runs-on: [ ubuntu-latest ]
     if: github.event_name == 'pull_request'
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Verify PR description
         run: .github/scripts/story_link_check.sh '${{ github.event.pull_request.body }}'
 
@@ -27,13 +27,13 @@ jobs:
     if: github.event_name == 'pull_request'
     steps:
       - name: Checkout master
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           ref: master
           path: master
 
       - name: Checkout current
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           path: current
 
@@ -43,10 +43,10 @@ jobs:
   lint:
     runs-on: [ ubuntu-latest ]
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Setup JDK
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: 'zulu'
           java-version: 17
@@ -58,10 +58,10 @@ jobs:
   unit_tests:
     runs-on: [ ubuntu-latest ]
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Setup JDK
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: 'zulu'
           java-version: 17
@@ -87,7 +87,7 @@ jobs:
 
 
       - name: Checkout Android source
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Start Simple Docker server
         run: |
@@ -116,7 +116,7 @@ jobs:
           script: echo "Generated AVD snapshot for caching."
 
       - name: set up JDK
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: 'zulu'
           java-version: 17
@@ -182,13 +182,13 @@ jobs:
     runs-on: [ ubuntu-latest ]
     steps:
       - name: Checkout master
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           ref: master
           path: master
 
       - name: Checkout current
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           path: current
 
@@ -199,7 +199,7 @@ jobs:
     runs-on: [ ubuntu-latest ]
     if: github.event_name == 'pull_request'
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           ref: ${{github.event.pull_request.head.ref}}
           fetch-depth: 0
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,15 +3,43 @@
 ## Next Release
 
 ### Internal
-- Bump Sentry to v8.21.1
+- Bump Sentry to v8.22.0
+- Bump AndroidX Lifecycle to v2.9.4
+- 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.5
+- Bump AndroidX ViewModel to v2.9.4
+- Bump Lottie Compose to v6.6.9
+- Bump Gson to v2.13.2
+- Bump KSP to v2.2.20-2.0.2
+- Bump firebase remote config to v23.0.1
+- Bump Google Truth to v1.4.5
+- Bump AndroidX Benchmark to v1.4.1
+- Bump AndroidX Camera to v1.5.0
+- Bump AndroidX Camera View to v1.5.0
+- Bump dagger to v2.57.2
+- Bump UUID generator to v5.1.1
+- Bump Compose BOM to v2025.09.01
+- Bump Sentry Android to v5.12.0
+- Update GH Actions `checkout` to v5
+- Update GH Actions `setup-jdk` to to v5
+- Bump Gradle to v9.1.0
+- Bump Mockito Kotlin to v6.0.0
+
+### Changes
+
+- Hide next button when registration is going
 
 ## 2025.09.09
 
 ### Internal
 - Bump AGP to v8.13.0
 - Bump Lint to v31.13.0
-- Bump Kotlin to v2.2.0
-- Bump KSP to v2.2.0-2.0.2
 - Bump dagger to v2.57.1
 - Bump okhttp to v5.1.0
 - Bump retrofit to v3.0.0
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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
diff --git a/gradlew b/gradlew
diff --git a/gradlew.bat b/gradlew.bat

Original file line number	Diff line number	Diff line change
`@@ -174,6 +174,14 @@ class RegistrationPhoneScreen :`
`174`	`174`	`progressView.visibility = View.GONE`
`175`	`175`	`}`
`176`	`176`
	`177`	`+ override fun showNextButton() {`
	`178`	`+ nextButtonFrame.visibility = View.VISIBLE`
	`179`	`+ }`
	`180`	`+`
	`181`	`+ override fun hideNextButton() {`
	`182`	`+ nextButtonFrame.visibility = View.GONE`
	`183`	`+ }`
	`184`	`+`
`177`	`185`	`override fun openLoginPinEntryScreen() {`
`178`	`186`	`router.push(LoginPinScreenKey())`
`179`	`187`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,4 +7,6 @@ interface RegistrationPhoneUi {`
`7`	`7`	`fun hideAnyError()`
`8`	`8`	`fun showProgressIndicator()`
`9`	`9`	`fun hideProgressIndicator()`
	`10`	`+ fun showNextButton()`
	`11`	`+ fun hideNextButton()`
`10`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,10 @@ class RegistrationPhoneUiRenderer(`
`21`	`21`	`if (mode == RegistrationUiMode.RegistrationOngoing) {`
`22`	`22`	`registrationResultValueCallback.clear()`
`23`	`23`	`ui.showProgressIndicator()`
	`24`	`+ ui.hideNextButton()`
`24`	`25`	`} else {`
`25`	`26`	`ui.hideProgressIndicator()`
	`27`	`+ ui.showNextButton()`
`26`	`28`	`}`
`27`	`29`	`}`
`28`	`30`