Skip to content
This repository was archived by the owner on Jun 20, 2023. It is now read-only.

Add cancel button for srs consent screen (EXPOSUREAPP-14456) #5761

Merged
merged 1 commit into from
Dec 15, 2022
Merged

Add cancel button for srs consent screen (EXPOSUREAPP-14456) #5761

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions ...arn-App/src/main/java/de/rki/coronawarnapp/srs/ui/consent/SrsSubmissionConsentFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down
21 changes: 14 additions & 7 deletions Corona-Warn-App/src/main/res/layout/fragment_srs_submission_consent.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down Expand Up @@ -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" />

<androidx.constraintlayout.widget.Guideline
android:id="@+id/guideline_action"
android:layout_width="wrap_content"
<Button
android:id="@+id/srs_submission_consent_cancel_button"
style="@style/buttonPrimary"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:orientation="horizontal"
app:layout_constraintGuide_end="@dimen/guideline_action" />
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" />

<include layout="@layout/merge_guidelines_side" />

Expand Down