Skip to content
Snippets Groups Projects
Unverified Commit 67c07c96 authored by Matthias Urhahn's avatar Matthias Urhahn Committed by GitHub
Browse files

Show progress spinner over button, not overlaying text/content (DEV) (#3002)

parent cee0fef6
No related branches found
No related tags found
No related merge requests found
...@@ -60,7 +60,6 @@ class SubmissionDeletionWarningFragment : Fragment(R.layout.fragment_submission_ ...@@ -60,7 +60,6 @@ class SubmissionDeletionWarningFragment : Fragment(R.layout.fragment_submission_
} }
continueButton.setOnClickListener { continueButton.setOnClickListener {
viewModel.deleteExistingAndRegisterNewTest() viewModel.deleteExistingAndRegisterNewTest()
} }
...@@ -84,6 +83,7 @@ class SubmissionDeletionWarningFragment : Fragment(R.layout.fragment_submission_ ...@@ -84,6 +83,7 @@ class SubmissionDeletionWarningFragment : Fragment(R.layout.fragment_submission_
viewModel.registrationState.observe2(this) { state -> viewModel.registrationState.observe2(this) { state ->
binding.submissionQrCodeScanSpinner.isVisible = state.apiRequestState == ApiRequestState.STARTED binding.submissionQrCodeScanSpinner.isVisible = state.apiRequestState == ApiRequestState.STARTED
binding.continueButton.isVisible = state.apiRequestState != ApiRequestState.STARTED
if (ApiRequestState.SUCCESS == state.apiRequestState) { if (ApiRequestState.SUCCESS == state.apiRequestState) {
......
...@@ -18,19 +18,6 @@ ...@@ -18,19 +18,6 @@
app:navigationIcon="@drawable/ic_close" app:navigationIcon="@drawable/ic_close"
app:title="@string/submission_deletion_warning_title" /> 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 <ScrollView
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
...@@ -114,5 +101,19 @@ ...@@ -114,5 +101,19 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
tools:text="@string/submission_deletion_warning_continue_button" /> 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> </androidx.constraintlayout.widget.ConstraintLayout>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment