Submission flow target screens (EXPOSUREAPP-14240)

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/familytest/ui/consent/FamilyTestConsentFragment.kt

@@ -62,22 +62,27 @@ class FamilyTestConsentFragment : Fragment(R.layout.fragment_family_test_consent
                             )
                     )
                 }
+
                 is FamilyTestConsentNavigationEvents.NavigateClose -> {
                     binding.root.hideKeyboard()
                     goBack()
                 }
+
                 is FamilyTestConsentNavigationEvents.NavigateToDataPrivacy -> findNavController().navigate(
                     FamilyTestConsentFragmentDirections.actionFamilyTestConsentFragmentToInformationPrivacyFragment()
                 )
+
                 is FamilyTestConsentNavigationEvents.NavigateToCertificateRequest -> findNavController().navigate(
                     NavGraphDirections.actionRequestCovidCertificateFragment(
                         testRegistrationRequest = it.coronaTestQRCode,
                         coronaTestConsent = it.consentGiven,
                         allowTestReplacement = it.allowReplacement,
-                        personName = it.personName
+                        personName = it.personName,
+                        comesFromDispatcherFragment = navArgs.comesFromDispatcherFragment
                     ),
                     navOptions
                 )
+
                 else -> Unit
             }
         }
@@ -90,9 +95,11 @@ class FamilyTestConsentFragment : Fragment(R.layout.fragment_family_test_consent
             when (state) {
                 TestRegistrationStateProcessor.State.Idle,
                 TestRegistrationStateProcessor.State.Working -> Unit
+
                 is TestRegistrationStateProcessor.State.Error -> {
                     state.showExceptionDialog(this) { popBackStack() }
                 }
+
                 is TestRegistrationStateProcessor.State.TestRegistered -> findNavController().navigate(
                     NavGraphDirections.actionSubmissionTestResultPendingFragment(
                         testIdentifier = state.test.identifier,
@@ -115,6 +122,7 @@ class FamilyTestConsentFragment : Fragment(R.layout.fragment_family_test_consent
                         }
                         false
                     }
+
                     else -> true
                 }
             }

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/testresult/invalid/SubmissionTestResultInvalidFragment.kt

@@ -3,6 +3,7 @@ package de.rki.coronawarnapp.ui.submission.testresult.invalid
 import android.os.Bundle
 import android.view.View
 import android.view.accessibility.AccessibilityEvent
+import androidx.activity.OnBackPressedCallback
 import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import androidx.navigation.fragment.findNavController
@@ -44,6 +45,11 @@ class SubmissionTestResultInvalidFragment : Fragment(R.layout.fragment_submissio
             }
             toolbar.setNavigationOnClickListener { goBack() }
         }
+        val backCallback = object : OnBackPressedCallback(true) {
+            override fun handleOnBackPressed() = goBack()
+        }
+        requireActivity().onBackPressedDispatcher.addCallback(viewLifecycleOwner, backCallback)
+
         viewModel.testResult.observe2(this) { uiState ->
             when (uiState.coronaTest.type) {
                 BaseCoronaTest.Type.PCR -> {
@@ -62,6 +68,7 @@ class SubmissionTestResultInvalidFragment : Fragment(R.layout.fragment_submissio
                         }
                     }
                 }
+
                 BaseCoronaTest.Type.RAPID_ANTIGEN -> {
                     binding.apply {
                         testResultInvalidStepsPcrAdded.isVisible = false

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/testresult/positive/SubmissionTestResultKeysSharedFragment.kt

@@ -3,6 +3,7 @@ package de.rki.coronawarnapp.ui.submission.testresult.positive
 import android.os.Bundle
 import android.view.View
 import android.view.accessibility.AccessibilityEvent
+import androidx.activity.OnBackPressedCallback
 import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import androidx.navigation.fragment.findNavController
@@ -47,8 +48,12 @@ class SubmissionTestResultKeysSharedFragment :
         viewModel.onTestOpened()
 
         binding.toolbar.setNavigationOnClickListener {
-            popBackStack()
+            navigateBackToFlowStart()
         }
+        val backCallback = object : OnBackPressedCallback(true) {
+            override fun handleOnBackPressed() = navigateBackToFlowStart()
+        }
+        requireActivity().onBackPressedDispatcher.addCallback(viewLifecycleOwner, backCallback)
 
         binding.deleteTest.setOnClickListener {
             viewModel.onShowDeleteTestDialog()
@@ -75,15 +80,19 @@ class SubmissionTestResultKeysSharedFragment :
         }
 
         viewModel.routeToScreen.observe2(this) {
-            if (navArgs.comesFromDispatcherFragment) {
-                findNavController().navigate(
-                    SubmissionTestResultKeysSharedFragmentDirections
-                        .actionSubmissionTestResultKeysSharedFragmentToMainFragment()
-                )
-            } else popBackStack()
+            navigateBackToFlowStart()
         }
     }
 
+    private fun navigateBackToFlowStart() {
+        if (navArgs.comesFromDispatcherFragment) {
+            findNavController().navigate(
+                SubmissionTestResultKeysSharedFragmentDirections
+                    .actionSubmissionTestResultKeysSharedFragmentToMainFragment()
+            )
+        } else popBackStack()
+    }
+
     override fun onResume() {
         super.onResume()
         binding.submissionTestResultContainer.sendAccessibilityEvent(AccessibilityEvent.TYPE_ANNOUNCEMENT)