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

Dialog refactoring - popup missing (EXPOSUREAPP-14288) #5685

Merged
merged 1 commit into from
Nov 4, 2022
Merged

Dialog refactoring - popup missing (EXPOSUREAPP-14288) #5685

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
14 changes: 8 additions & 6 deletions ...va/de/rki/coronawarnapp/ui/submission/covidcertificate/RequestCovidCertificateFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ class RequestCovidCertificateFragment : Fragment(R.layout.fragment_request_covid
State.Working -> {
// Handled above
}

is State.Error -> state.showExceptionDialog(this) { popBackStack() }
is State.TestRegistered -> when {
state.test.isPositive ->
Expand Down Expand Up @@ -116,12 +117,13 @@ class RequestCovidCertificateFragment : Fragment(R.layout.fragment_request_covid
private fun showCloseDialog() = displayDialog {
title(R.string.request_gc_dialog_title)
message(R.string.request_gc_dialog_message)
positiveButton(R.string.request_gc_dialog_positive_button)
if (args.comesFromDispatcherFragment) {
findNavController().navigate(
RequestCovidCertificateFragmentDirections.actionRequestCovidCertificateFragmentToHomeFragment()
)
} else popBackStack()
positiveButton(R.string.request_gc_dialog_positive_button) {
if (args.comesFromDispatcherFragment) {
findNavController().navigate(
RequestCovidCertificateFragmentDirections.actionRequestCovidCertificateFragmentToHomeFragment()
)
} else popBackStack()
}
negativeButton(R.string.request_gc_dialog_negative_button)
}

Expand Down