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

Swap faq/ok buttons in SRS error dialog (EXPOSUREAPP-144399) #5772

Merged
merged 2 commits into from
Dec 21, 2022
Merged

Swap faq/ok buttons in SRS error dialog (EXPOSUREAPP-144399) #5772

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6500093
Swap faq/ok buttons.
SamuraiKek Dec 21, 2022
225abef
Merge branch 'release/3.0.x' into fix/exposureapp144399-srs-dialog-bu…
mtwalli Dec 21, 2022
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
9 changes: 7 additions & 2 deletions ...src/main/java/de/rki/coronawarnapp/ui/submission/fragment/SubmissionDispatcherFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,20 +36,24 @@ class SubmissionDispatcherFragment : Fragment(R.layout.fragment_submission_dispa
when (it) {
is SubmissionNavigationEvents.NavigateToMainActivity ->
findNavController().popBackStack()

is SubmissionNavigationEvents.NavigateToTAN ->
findNavController().navigate(
SubmissionDispatcherFragmentDirections
.actionSubmissionDispatcherFragmentToSubmissionTanFragment(
comesFromDispatcherFragment = true
)
)

is SubmissionNavigationEvents.OpenTestCenterUrl ->
openUrl(getString(R.string.submission_dispatcher_card_test_center_link))

is SubmissionNavigationEvents.NavigateToContact ->
findNavController().navigate(
SubmissionDispatcherFragmentDirections
.actionSubmissionDispatcherFragmentToSubmissionContactFragment()
)

is SubmissionNavigationEvents.NavigateToQRCodeScan -> openUniversalScanner()

is SubmissionNavigationEvents.NavigateToProfileList -> {
Expand All @@ -63,6 +67,7 @@ class SubmissionDispatcherFragment : Fragment(R.layout.fragment_submission_dispa
.actionSubmissionDispatcherFragmentToRapidTestProfileNavGraph()
)
}

is SubmissionNavigationEvents.NavigateToSelfTestConsentScreen -> {
findNavController().navigate(
R.id.srs_nav_graph,
Expand All @@ -77,8 +82,8 @@ class SubmissionDispatcherFragment : Fragment(R.layout.fragment_submission_dispa
viewModel.srsError.observe2(this) {
displayDialog {
setError(it)
positiveButton(R.string.nm_faq_label) { openUrl(R.string.srs_faq_url) }
negativeButton(android.R.string.ok)
positiveButton(android.R.string.ok)
negativeButton(R.string.nm_faq_label) { openUrl(R.string.srs_faq_url) }
}
}
}
Expand Down