Srs progress loading button (EXPOSUREAPP-14322) (#5710)

SamuraiKek · mtwalli · web-flow · commit 6fec90767f3b · 2022-11-16T11:40:12.000+01:00
* Add progress loading button to end of srs submission.

* Fix buttons state.

* Address comments.

Co-authored-by: Mohamed &lt;mohamed.metwalli@sap.com&gt;
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/srs/ui/symptoms/calendar/SrsSymptomsCalendarFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/srs/ui/symptoms/calendar/SrsSymptomsCalendarFragment.kt
@@ -66,6 +66,8 @@ class SrsSymptomsCalendarFragment : Fragment(R.layout.fragment_submission_sympto
 
         binding.toolbar.setNavigationOnClickListener { viewModel.onCancelConfirmed() }
 
+        viewModel.showLoadingIndicator.observe(viewLifecycleOwner) { binding.symptomButtonNext.isLoading = it }
+
         viewModel.events.observe(viewLifecycleOwner) {
             when (it) {
                 SrsSymptomsCalendarNavigation.ShowCloseDialog -> showCloseDialog { viewModel.goHome() }
@@ -114,7 +116,7 @@ class SrsSymptomsCalendarFragment : Fragment(R.layout.fragment_submission_sympto
             }
 
             symptomButtonNext.apply {
-                isEnabled = symptomStart != null
+                isActive = symptomStart != null
                 setOnClickListener { viewModel.onDone() }
             }
         }
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/srs/ui/symptoms/calendar/SrsSymptomsCalendarViewModel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/srs/ui/symptoms/calendar/SrsSymptomsCalendarViewModel.kt
@@ -32,6 +32,7 @@ class SrsSymptomsCalendarViewModel @AssistedInject constructor(
     val symptomStart = symptomStartInternal.asLiveData(context = dispatcherProvider.Default)
 
     val events = SingleLiveEvent<SrsSymptomsCalendarNavigation>()
+    val showLoadingIndicator = SingleLiveEvent<Boolean>()
 
     fun onCancelConfirmed() {
         Timber.d("Canceled SRS submission")
@@ -47,6 +48,7 @@ class SrsSymptomsCalendarViewModel @AssistedInject constructor(
             return
         }
         Timber.tag(TAG).d("onDone() clicked on calender screen.")
+        showLoadingIndicator.postValue(true)
         submitSrs()
     }
 
@@ -65,6 +67,8 @@ class SrsSymptomsCalendarViewModel @AssistedInject constructor(
             events.postValue(SrsSymptomsCalendarNavigation.GoToThankYouScreen(submissionType))
         } catch (e: Exception) {
             events.postValue(SrsSymptomsCalendarNavigation.Error(e))
+        } finally {
+            showLoadingIndicator.postValue(false)
         }
     }
 
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/srs/ui/symptoms/intro/SrsSymptomsIntroductionFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/srs/ui/symptoms/intro/SrsSymptomsIntroductionFragment.kt
@@ -56,6 +56,8 @@ class SrsSymptomsIntroductionFragment : Fragment(R.layout.fragment_submission_sy
             updateButtons(it)
         }
 
+        viewModel.showLoadingIndicator.observe(viewLifecycleOwner) { binding.symptomButtonNext.isLoading = it }
+
         viewModel.events.observe(viewLifecycleOwner) {
             when (it) {
                 SrsSymptomsIntroductionNavigation.ShowCloseDialog -> showCloseDialog { viewModel.goHome() }
@@ -105,8 +107,8 @@ class SrsSymptomsIntroductionFragment : Fragment(R.layout.fragment_submission_sy
         }
 
         binding.symptomButtonNext.apply {
-            isEnabled = symptomIndication != null
-            setText(
+            isActive = symptomIndication != null
+            defaultButton.setText(
                 when (symptomIndication) {
                     Symptoms.Indication.NEGATIVE -> R.string.submission_done_button_done
                     Symptoms.Indication.NO_INFORMATION -> R.string.submission_done_button_done
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/srs/ui/symptoms/intro/SrsSymptomsIntroductionViewModel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/srs/ui/symptoms/intro/SrsSymptomsIntroductionViewModel.kt
@@ -26,6 +26,7 @@ class SrsSymptomsIntroductionViewModel @AssistedInject constructor(
 ) : CWAViewModel(dispatcherProvider) {
 
     val events = SingleLiveEvent<SrsSymptomsIntroductionNavigation>()
+    val showLoadingIndicator = SingleLiveEvent<Boolean>()
 
     private val symptomIndicationInternal = MutableStateFlow<Symptoms.Indication?>(null)
     val symptomIndication = symptomIndicationInternal.asLiveData(context = dispatcherProvider.Default)
@@ -47,6 +48,7 @@ class SrsSymptomsIntroductionViewModel @AssistedInject constructor(
     }
 
     fun onWarningClicked() {
+        showLoadingIndicator.postValue(true)
         when (symptomIndication.value) {
             Symptoms.Indication.NEGATIVE -> {
                 submitSRS(Symptoms.Indication.NEGATIVE)
@@ -76,6 +78,8 @@ class SrsSymptomsIntroductionViewModel @AssistedInject constructor(
             events.postValue(SrsSymptomsIntroductionNavigation.GoToThankYouScreen(submissionType))
         } catch (e: Exception) {
             events.postValue(SrsSymptomsIntroductionNavigation.Error(e))
+        } finally {
+            showLoadingIndicator.postValue(false)
         }
     }
 
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/symptoms/calendar/SubmissionSymptomCalendarFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/symptoms/calendar/SubmissionSymptomCalendarFragment.kt
@@ -95,7 +95,7 @@ class SubmissionSymptomCalendarFragment :
             }
 
             symptomButtonNext.apply {
-                isEnabled = symptomStart != null
+                isActive = symptomStart != null
                 setOnClickListener { viewModel.onDone() }
             }
         }
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/symptoms/introduction/SubmissionSymptomIntroductionFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/symptoms/introduction/SubmissionSymptomIntroductionFragment.kt
@@ -85,8 +85,8 @@ class SubmissionSymptomIntroductionFragment :
         }
 
         binding.symptomButtonNext.apply {
-            isEnabled = symptomIndication != null
-            setText(
+            isActive = symptomIndication != null
+            defaultButton.setText(
                 when (symptomIndication) {
                     Symptoms.Indication.NEGATIVE -> R.string.submission_done_button_done
                     Symptoms.Indication.NO_INFORMATION -> R.string.submission_done_button_done
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_submission_symptom_calendar.xml b/Corona-Warn-App/src/main/res/layout/fragment_submission_symptom_calendar.xml
@@ -108,19 +108,20 @@
 
         </ScrollView>
 
-        <Button
+        <de.rki.coronawarnapp.ui.view.ProgressLoadingButton
             android:id="@+id/symptom_button_next"
             style="@style/buttonPrimary"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginHorizontal="@dimen/spacing_normal"
             android:layout_marginVertical="@dimen/spacing_small"
             android:layout_marginBottom="@dimen/spacing_small"
-            android:text="@string/submission_done_button_done"
+            app:buttonText="@string/submission_done_button_done"
+            app:isLoading="false"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/scrollView" />
+            app:layout_constraintTop_toBottomOf="@id/scrollView"
+            app:loadingText="@string/start_validation_rule_check_loading_text" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_submission_symptom_intro.xml b/Corona-Warn-App/src/main/res/layout/fragment_submission_symptom_intro.xml
@@ -96,17 +96,18 @@
 
         </ScrollView>
 
-        <Button
+        <de.rki.coronawarnapp.ui.view.ProgressLoadingButton
             android:id="@+id/symptom_button_next"
             style="@style/buttonPrimary"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginHorizontal="@dimen/spacing_normal"
             android:layout_marginVertical="@dimen/spacing_small"
-            android:text="@string/submission_symptom_further_button"
+            app:buttonText="@string/submission_symptom_further_button"
+            app:isLoading="false"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/scrollView" />
+            app:layout_constraintTop_toBottomOf="@id/scrollView"
+            app:loadingText="@string/start_validation_rule_check_loading_text" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>

Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,8 @@ class SrsSymptomsCalendarFragment : Fragment(R.layout.fragment_submission_sympto`
`66`	`66`
`67`	`67`	`binding.toolbar.setNavigationOnClickListener { viewModel.onCancelConfirmed() }`
`68`	`68`
	`69`	`+ viewModel.showLoadingIndicator.observe(viewLifecycleOwner) { binding.symptomButtonNext.isLoading = it }`
	`70`	`+`
`69`	`71`	`viewModel.events.observe(viewLifecycleOwner) {`
`70`	`72`	`when (it) {`
`71`	`73`	`SrsSymptomsCalendarNavigation.ShowCloseDialog -> showCloseDialog { viewModel.goHome() }`
`@@ -114,7 +116,7 @@ class SrsSymptomsCalendarFragment : Fragment(R.layout.fragment_submission_sympto`
`114`	`116`	`}`
`115`	`117`
`116`	`118`	`symptomButtonNext.apply {`
`117`		`- isEnabled = symptomStart != null`
	`119`	`+ isActive = symptomStart != null`
`118`	`120`	`setOnClickListener { viewModel.onDone() }`
`119`	`121`	`}`
`120`	`122`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@ class SrsSymptomsCalendarViewModel @AssistedInject constructor(`
`32`	`32`	`val symptomStart = symptomStartInternal.asLiveData(context = dispatcherProvider.Default)`
`33`	`33`
`34`	`34`	`val events = SingleLiveEvent<SrsSymptomsCalendarNavigation>()`
	`35`	`+ val showLoadingIndicator = SingleLiveEvent<Boolean>()`
`35`	`36`
`36`	`37`	`fun onCancelConfirmed() {`
`37`	`38`	`Timber.d("Canceled SRS submission")`
`@@ -47,6 +48,7 @@ class SrsSymptomsCalendarViewModel @AssistedInject constructor(`
`47`	`48`	`return`
`48`	`49`	`}`
`49`	`50`	`Timber.tag(TAG).d("onDone() clicked on calender screen.")`
	`51`	`+ showLoadingIndicator.postValue(true)`
`50`	`52`	`submitSrs()`
`51`	`53`	`}`
`52`	`54`
`@@ -65,6 +67,8 @@ class SrsSymptomsCalendarViewModel @AssistedInject constructor(`
`65`	`67`	`events.postValue(SrsSymptomsCalendarNavigation.GoToThankYouScreen(submissionType))`
`66`	`68`	`} catch (e: Exception) {`
`67`	`69`	`events.postValue(SrsSymptomsCalendarNavigation.Error(e))`
	`70`	`+ } finally {`
	`71`	`+ showLoadingIndicator.postValue(false)`
`68`	`72`	`}`
`69`	`73`	`}`
`70`	`74`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@ class SrsSymptomsIntroductionViewModel @AssistedInject constructor(`
`26`	`26`	`) : CWAViewModel(dispatcherProvider) {`
`27`	`27`
`28`	`28`	`val events = SingleLiveEvent<SrsSymptomsIntroductionNavigation>()`
	`29`	`+ val showLoadingIndicator = SingleLiveEvent<Boolean>()`
`29`	`30`
`30`	`31`	`private val symptomIndicationInternal = MutableStateFlow<Symptoms.Indication?>(null)`
`31`	`32`	`val symptomIndication = symptomIndicationInternal.asLiveData(context = dispatcherProvider.Default)`
`@@ -47,6 +48,7 @@ class SrsSymptomsIntroductionViewModel @AssistedInject constructor(`
`47`	`48`	`}`
`48`	`49`
`49`	`50`	`fun onWarningClicked() {`
	`51`	`+ showLoadingIndicator.postValue(true)`
`50`	`52`	`when (symptomIndication.value) {`
`51`	`53`	`Symptoms.Indication.NEGATIVE -> {`
`52`	`54`	`submitSRS(Symptoms.Indication.NEGATIVE)`
`@@ -76,6 +78,8 @@ class SrsSymptomsIntroductionViewModel @AssistedInject constructor(`
`76`	`78`	`events.postValue(SrsSymptomsIntroductionNavigation.GoToThankYouScreen(submissionType))`
`77`	`79`	`} catch (e: Exception) {`
`78`	`80`	`events.postValue(SrsSymptomsIntroductionNavigation.Error(e))`
	`81`	`+ } finally {`
	`82`	`+ showLoadingIndicator.postValue(false)`
`79`	`83`	`}`
`80`	`84`	`}`
`81`	`85`
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ class SubmissionSymptomCalendarFragment :`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`symptomButtonNext.apply {`
`98`		`- isEnabled = symptomStart != null`
	`98`	`+ isActive = symptomStart != null`
`99`	`99`	`setOnClickListener { viewModel.onDone() }`
`100`	`100`	`}`
`101`	`101`	`}`