From be27e9e660b81899f10af0efa207ef4e82205608 Mon Sep 17 00:00:00 2001
From: Alexandru Paulescu <alex.paulescu@gmail.com>
Date: Tue, 15 Nov 2022 12:29:05 +0200
Subject: [PATCH 1/3] Add progress loading button to end of srs submission.

---
 .../ui/symptoms/calendar/SrsSymptomsCalendarFragment.kt  | 2 ++
 .../ui/symptoms/calendar/SrsSymptomsCalendarViewModel.kt | 2 ++
 .../ui/symptoms/intro/SrsSymptomsIntroductionFragment.kt | 4 +++-
 .../symptoms/intro/SrsSymptomsIntroductionViewModel.kt   | 2 ++
 .../SubmissionSymptomIntroductionFragment.kt             | 7 +++++--
 .../res/layout/fragment_submission_symptom_calendar.xml  | 9 +++++----
 .../res/layout/fragment_submission_symptom_intro.xml     | 9 +++++----
 7 files changed, 24 insertions(+), 11 deletions(-)

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
index af3ed069b7d..bed2e814f84 100644
--- 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 = true }
+
         viewModel.events.observe(viewLifecycleOwner) {
             when (it) {
                 SrsSymptomsCalendarNavigation.ShowCloseDialog -> showCloseDialog { viewModel.goHome() }
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
index 079cef8fb57..20cd111362a 100644
--- 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<Unit>()
 
     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(Unit)
         submitSrs()
     }
 
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
index 2aeff2a13bc..7a84ef150c2 100644
--- 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 = true }
+
         viewModel.events.observe(viewLifecycleOwner) {
             when (it) {
                 SrsSymptomsIntroductionNavigation.ShowCloseDialog -> showCloseDialog { viewModel.goHome() }
@@ -106,7 +108,7 @@ class SrsSymptomsIntroductionFragment : Fragment(R.layout.fragment_submission_sy
 
         binding.symptomButtonNext.apply {
             isEnabled = symptomIndication != null
-            setText(
+            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
index 9282395ce4f..ba3a351a710 100644
--- 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<Unit>()
 
     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(Unit)
         when (symptomIndication.value) {
             Symptoms.Indication.NEGATIVE -> {
                 submitSRS(Symptoms.Indication.NEGATIVE)
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
index 04fc3397d60..76d8b8d4b20 100644
--- 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
@@ -86,14 +86,17 @@ class SubmissionSymptomIntroductionFragment :
 
         binding.symptomButtonNext.apply {
             isEnabled = symptomIndication != null
-            setText(
+            defaultButton.setText(
                 when (symptomIndication) {
                     Symptoms.Indication.NEGATIVE -> R.string.submission_done_button_done
                     Symptoms.Indication.NO_INFORMATION -> R.string.submission_done_button_done
                     else -> R.string.submission_symptom_further_button
                 }
             )
-            setOnClickListener { viewModel.onNextClicked() }
+            setOnClickListener {
+                isLoading = true
+                viewModel.onNextClicked()
+            }
         }
     }
 
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
index a986117117e..dad1688e49c 100644
--- 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
index 666e201611d..a357cbea3e2 100644
--- 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>

From bdb912549e066c472626908fa3f1bc7754f6b196 Mon Sep 17 00:00:00 2001
From: Alexandru Paulescu <alex.paulescu@gmail.com>
Date: Tue, 15 Nov 2022 16:01:10 +0200
Subject: [PATCH 2/3] Fix buttons state.

---
 .../srs/ui/symptoms/calendar/SrsSymptomsCalendarFragment.kt  | 4 ++--
 .../srs/ui/symptoms/calendar/SrsSymptomsCalendarViewModel.kt | 5 +++--
 .../srs/ui/symptoms/intro/SrsSymptomsIntroductionFragment.kt | 4 ++--
 .../ui/symptoms/intro/SrsSymptomsIntroductionViewModel.kt    | 5 +++--
 4 files changed, 10 insertions(+), 8 deletions(-)

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
index bed2e814f84..20413ed00a2 100644
--- 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,7 +66,7 @@ class SrsSymptomsCalendarFragment : Fragment(R.layout.fragment_submission_sympto
 
         binding.toolbar.setNavigationOnClickListener { viewModel.onCancelConfirmed() }
 
-        viewModel.showLoadingIndicator.observe(viewLifecycleOwner) { binding.symptomButtonNext.isLoading = true }
+        viewModel.showLoadingIndicator.observe(viewLifecycleOwner) { binding.symptomButtonNext.isLoading = it }
 
         viewModel.events.observe(viewLifecycleOwner) {
             when (it) {
@@ -116,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
index 20cd111362a..679e2368f57 100644
--- 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,7 +32,7 @@ class SrsSymptomsCalendarViewModel @AssistedInject constructor(
     val symptomStart = symptomStartInternal.asLiveData(context = dispatcherProvider.Default)
 
     val events = SingleLiveEvent<SrsSymptomsCalendarNavigation>()
-    val showLoadingIndicator = SingleLiveEvent<Unit>()
+    val showLoadingIndicator = SingleLiveEvent<Boolean>()
 
     fun onCancelConfirmed() {
         Timber.d("Canceled SRS submission")
@@ -48,7 +48,7 @@ class SrsSymptomsCalendarViewModel @AssistedInject constructor(
             return
         }
         Timber.tag(TAG).d("onDone() clicked on calender screen.")
-        showLoadingIndicator.postValue(Unit)
+        showLoadingIndicator.postValue(true)
         submitSrs()
     }
 
@@ -66,6 +66,7 @@ class SrsSymptomsCalendarViewModel @AssistedInject constructor(
             )
             events.postValue(SrsSymptomsCalendarNavigation.GoToThankYouScreen(submissionType))
         } catch (e: Exception) {
+            showLoadingIndicator.postValue(false)
             events.postValue(SrsSymptomsCalendarNavigation.Error(e))
         }
     }
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
index 7a84ef150c2..ba073f773d4 100644
--- 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,7 +56,7 @@ class SrsSymptomsIntroductionFragment : Fragment(R.layout.fragment_submission_sy
             updateButtons(it)
         }
 
-        viewModel.showLoadingIndicator.observe(viewLifecycleOwner) { binding.symptomButtonNext.isLoading = true }
+        viewModel.showLoadingIndicator.observe(viewLifecycleOwner) { binding.symptomButtonNext.isLoading = it }
 
         viewModel.events.observe(viewLifecycleOwner) {
             when (it) {
@@ -107,7 +107,7 @@ class SrsSymptomsIntroductionFragment : Fragment(R.layout.fragment_submission_sy
         }
 
         binding.symptomButtonNext.apply {
-            isEnabled = symptomIndication != null
+            isActive = symptomIndication != null
             defaultButton.setText(
                 when (symptomIndication) {
                     Symptoms.Indication.NEGATIVE -> 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
index ba3a351a710..98f5189ac4b 100644
--- 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,7 +26,7 @@ class SrsSymptomsIntroductionViewModel @AssistedInject constructor(
 ) : CWAViewModel(dispatcherProvider) {
 
     val events = SingleLiveEvent<SrsSymptomsIntroductionNavigation>()
-    val showLoadingIndicator = SingleLiveEvent<Unit>()
+    val showLoadingIndicator = SingleLiveEvent<Boolean>()
 
     private val symptomIndicationInternal = MutableStateFlow<Symptoms.Indication?>(null)
     val symptomIndication = symptomIndicationInternal.asLiveData(context = dispatcherProvider.Default)
@@ -48,7 +48,7 @@ class SrsSymptomsIntroductionViewModel @AssistedInject constructor(
     }
 
     fun onWarningClicked() {
-        showLoadingIndicator.postValue(Unit)
+        showLoadingIndicator.postValue(true)
         when (symptomIndication.value) {
             Symptoms.Indication.NEGATIVE -> {
                 submitSRS(Symptoms.Indication.NEGATIVE)
@@ -77,6 +77,7 @@ class SrsSymptomsIntroductionViewModel @AssistedInject constructor(
             )
             events.postValue(SrsSymptomsIntroductionNavigation.GoToThankYouScreen(submissionType))
         } catch (e: Exception) {
+            showLoadingIndicator.postValue(false)
             events.postValue(SrsSymptomsIntroductionNavigation.Error(e))
         }
     }

From e7d1ce02e26fd3e14bdcb5005e251707fe46592c Mon Sep 17 00:00:00 2001
From: Alexandru Paulescu <alex.paulescu@gmail.com>
Date: Wed, 16 Nov 2022 11:57:52 +0200
Subject: [PATCH 3/3] Address comments.

---
 .../ui/symptoms/calendar/SrsSymptomsCalendarViewModel.kt   | 3 ++-
 .../ui/symptoms/intro/SrsSymptomsIntroductionViewModel.kt  | 3 ++-
 .../symptoms/calendar/SubmissionSymptomCalendarFragment.kt | 2 +-
 .../introduction/SubmissionSymptomIntroductionFragment.kt  | 7 ++-----
 4 files changed, 7 insertions(+), 8 deletions(-)

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
index 679e2368f57..0dcb23e0803 100644
--- 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
@@ -66,8 +66,9 @@ class SrsSymptomsCalendarViewModel @AssistedInject constructor(
             )
             events.postValue(SrsSymptomsCalendarNavigation.GoToThankYouScreen(submissionType))
         } catch (e: Exception) {
-            showLoadingIndicator.postValue(false)
             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/SrsSymptomsIntroductionViewModel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/srs/ui/symptoms/intro/SrsSymptomsIntroductionViewModel.kt
index 98f5189ac4b..5c7692e997c 100644
--- 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
@@ -77,8 +77,9 @@ class SrsSymptomsIntroductionViewModel @AssistedInject constructor(
             )
             events.postValue(SrsSymptomsIntroductionNavigation.GoToThankYouScreen(submissionType))
         } catch (e: Exception) {
-            showLoadingIndicator.postValue(false)
             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
index b94b9eebab1..3a3632ea757 100644
--- 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
index 76d8b8d4b20..6d37a6c487e 100644
--- 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,7 +85,7 @@ class SubmissionSymptomIntroductionFragment :
         }
 
         binding.symptomButtonNext.apply {
-            isEnabled = symptomIndication != null
+            isActive = symptomIndication != null
             defaultButton.setText(
                 when (symptomIndication) {
                     Symptoms.Indication.NEGATIVE -> R.string.submission_done_button_done
@@ -93,10 +93,7 @@ class SubmissionSymptomIntroductionFragment :
                     else -> R.string.submission_symptom_further_button
                 }
             )
-            setOnClickListener {
-                isLoading = true
-                viewModel.onNextClicked()
-            }
+            setOnClickListener { viewModel.onNextClicked() }
         }
     }