From 67c07c9697c721dbff9feb0a53bf4a21afeadd4d Mon Sep 17 00:00:00 2001
From: Matthias Urhahn <matthias.urhahn@sap.com>
Date: Wed, 28 Apr 2021 20:02:58 +0200
Subject: [PATCH] Show progress spinner over button, not overlaying
text/content (DEV) (#3002)
---
.../SubmissionDeletionWarningFragment.kt | 2 +-
.../fragment_submission_deletion_warning.xml | 27 ++++++++++---------
2 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/deletionwarning/SubmissionDeletionWarningFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/deletionwarning/SubmissionDeletionWarningFragment.kt
index 38b737b09..03e2b7cd6 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/deletionwarning/SubmissionDeletionWarningFragment.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/deletionwarning/SubmissionDeletionWarningFragment.kt
@@ -60,7 +60,6 @@ class SubmissionDeletionWarningFragment : Fragment(R.layout.fragment_submission_
}
continueButton.setOnClickListener {
-
viewModel.deleteExistingAndRegisterNewTest()
}
@@ -84,6 +83,7 @@ class SubmissionDeletionWarningFragment : Fragment(R.layout.fragment_submission_
viewModel.registrationState.observe2(this) { state ->
binding.submissionQrCodeScanSpinner.isVisible = state.apiRequestState == ApiRequestState.STARTED
+ binding.continueButton.isVisible = state.apiRequestState != ApiRequestState.STARTED
if (ApiRequestState.SUCCESS == state.apiRequestState) {
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_submission_deletion_warning.xml b/Corona-Warn-App/src/main/res/layout/fragment_submission_deletion_warning.xml
index 27fdf7bca..5b89dec0d 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_submission_deletion_warning.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_submission_deletion_warning.xml
@@ -18,19 +18,6 @@
app:navigationIcon="@drawable/ic_close"
app:title="@string/submission_deletion_warning_title" />
- <ProgressBar
- android:id="@+id/submission_qr_code_scan_spinner"
- style="?android:attr/progressBarStyle"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginTop="@dimen/spacing_normal"
- android:visibility="gone"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintTop_toTopOf="parent"
- tools:visibility="visible" />
-
<ScrollView
android:layout_width="0dp"
android:layout_height="0dp"
@@ -114,5 +101,19 @@
app:layout_constraintStart_toStartOf="parent"
tools:text="@string/submission_deletion_warning_continue_button" />
+ <ProgressBar
+ android:id="@+id/submission_qr_code_scan_spinner"
+ style="?android:attr/progressBarStyle"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:indeterminateTint="@color/colorAccentTintIcon"
+ android:indeterminateTintMode="src_in"
+ android:layout_marginBottom="@dimen/spacing_normal"
+ android:visibility="gone"
+ app:layout_constraintBottom_toBottomOf="@id/continue_button"
+ app:layout_constraintEnd_toEndOf="@id/continue_button"
+ app:layout_constraintStart_toStartOf="@id/continue_button"
+ tools:visibility="visible" />
+
</androidx.constraintlayout.widget.ConstraintLayout>
--
GitLab