diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/srs/ui/consent/SrsSubmissionConsentFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/srs/ui/consent/SrsSubmissionConsentFragment.kt index b0622c069e2..e682cc4e2aa 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/srs/ui/consent/SrsSubmissionConsentFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/srs/ui/consent/SrsSubmissionConsentFragment.kt @@ -50,6 +50,10 @@ class SrsSubmissionConsentFragment : Fragment(R.layout.fragment_srs_submission_c viewModel.submissionConsentAcceptButtonClicked() } + binding.srsSubmissionConsentCancelButton.setOnClickListener { + viewModel.onConsentCancel() + } + with(binding) { viewModel.timeBetweenSubmissionsInDays.observe2(this@SrsSubmissionConsentFragment) { srsSectionWarnInterval.text = getString(R.string.srs_section_warn_interval_text, it.toDays()) diff --git a/Corona-Warn-App/src/main/res/layout/fragment_srs_submission_consent.xml b/Corona-Warn-App/src/main/res/layout/fragment_srs_submission_consent.xml index 2268daada3f..1cdc6acba79 100644 --- a/Corona-Warn-App/src/main/res/layout/fragment_srs_submission_consent.xml +++ b/Corona-Warn-App/src/main/res/layout/fragment_srs_submission_consent.xml @@ -26,7 +26,7 @@ android:id="@+id/content_scrollcontainer" android:layout_width="0dp" android:layout_height="0dp" - app:layout_constraintBottom_toTopOf="@id/guideline_action" + app:layout_constraintBottom_toTopOf="@id/srs_submission_consent_accept_button" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/toolbar"> @@ -174,18 +174,25 @@ style="@style/buttonPrimary" android:layout_width="0dp" android:layout_height="wrap_content" + android:layout_marginTop="16dp" + android:layout_marginBottom="16dp" android:text="@string/submission_accept_button" - app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintBottom_toTopOf="@id/srs_submission_consent_cancel_button" app:layout_constraintEnd_toEndOf="@id/guideline_end" app:layout_constraintStart_toStartOf="@id/guideline_start" app:layout_constraintTop_toBottomOf="@id/content_scrollcontainer" /> - + android:layout_marginBottom="16dp" + android:text="@string/generic_action_abort" + app:layout_constraintTop_toBottomOf="@+id/srs_submission_consent_accept_button" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="@id/guideline_end" + app:layout_constraintStart_toStartOf="@id/guideline_start" />