diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/fragment/SubmissionTestResultFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/fragment/SubmissionTestResultFragment.kt index 4e70213b31b9bb6de86a8a0ec9ef1cc0dbe6f0ff..98187e8c82d96ff9ab1192ad11216098d854e56f 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/fragment/SubmissionTestResultFragment.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/fragment/SubmissionTestResultFragment.kt @@ -132,7 +132,12 @@ class SubmissionTestResultFragment : Fragment(R.layout.fragment_submission_test_ } binding.submissionTestResultButtonPositiveContinue.setOnClickListener { - continueIfTracingEnabled() + continueIfTracingEnabled(false) + } + + binding.submissionTestResultButtonPositiveContinueWithoutSymptoms.setOnClickListener { + submissionViewModel.onNoInformationSymptomIndication() + continueIfTracingEnabled(true) } binding.submissionTestResultButtonInvalidRemoveTest.setOnClickListener { @@ -146,7 +151,7 @@ class SubmissionTestResultFragment : Fragment(R.layout.fragment_submission_test_ } } - private fun continueIfTracingEnabled() { + private fun continueIfTracingEnabled(skipSymptomSubmission: Boolean) { if (tracingViewModel.isTracingEnabled.value != true) { val tracingRequiredDialog = DialogHelper.DialogInstance( requireActivity(), @@ -158,10 +163,17 @@ class SubmissionTestResultFragment : Fragment(R.layout.fragment_submission_test_ return } - findNavController().doNavigate( - SubmissionTestResultFragmentDirections - .actionSubmissionResultFragmentToSubmissionSymptomIntroductionFragment() - ) + if (skipSymptomSubmission) { + findNavController().doNavigate( + SubmissionTestResultFragmentDirections + .actionSubmissionResultFragmentToSubmissionResultPositiveOtherWarningFragment() + ) + } else { + findNavController().doNavigate( + SubmissionTestResultFragmentDirections + .actionSubmissionResultFragmentToSubmissionSymptomIntroductionFragment() + ) + } } private fun removeTestAfterConfirmation() { diff --git a/Corona-Warn-App/src/main/res/layout/fragment_submission_test_result.xml b/Corona-Warn-App/src/main/res/layout/fragment_submission_test_result.xml index d7bcd4594ed7ba7ca5321331ad721d152b3e6035..a1b0cf12e9148e470da888cf38253f6500edf8ee 100644 --- a/Corona-Warn-App/src/main/res/layout/fragment_submission_test_result.xml +++ b/Corona-Warn-App/src/main/res/layout/fragment_submission_test_result.xml @@ -105,12 +105,24 @@ style="@style/buttonPrimary" android:layout_width="@dimen/match_constraint" android:layout_height="wrap_content" - android:text="@string/submission_test_result_positive_continue_button" + android:text="@string/submission_test_result_positive_continue_button_with_symptoms" + android:visibility="@{FormatterSubmissionHelper.formatTestResultPositiveStepsVisible(submissionViewModel.deviceUiState)}" + app:layout_constraintBottom_toTopOf="@+id/submission_test_result_button_positive_continue_without_symptoms" + app:layout_constraintEnd_toStartOf="@+id/guideline_end" + app:layout_constraintStart_toStartOf="@id/guideline_start" + app:layout_constraintTop_toBottomOf="@+id/guideline_action_large" /> + + <Button + android:id="@+id/submission_test_result_button_positive_continue_without_symptoms" + style="@style/buttonPrimary" + android:layout_width="@dimen/match_constraint" + android:layout_height="wrap_content" + android:text="@string/submission_test_result_positive_continue_button_wo_symptoms" android:visibility="@{FormatterSubmissionHelper.formatTestResultPositiveStepsVisible(submissionViewModel.deviceUiState)}" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@+id/guideline_end" app:layout_constraintStart_toStartOf="@id/guideline_start" - app:layout_constraintTop_toTopOf="@id/guideline_action" /> + app:layout_constraintTop_toBottomOf="@+id/submission_test_result_button_positive_continue" /> <Button android:id="@+id/submission_test_result_button_negative_remove_test" diff --git a/Corona-Warn-App/src/main/res/navigation/nav_graph.xml b/Corona-Warn-App/src/main/res/navigation/nav_graph.xml index ac0bff96c293d40617e2417b5314444020403fc9..b8cdefde72a5d9ce7d1b36242cd442db8920d25a 100644 --- a/Corona-Warn-App/src/main/res/navigation/nav_graph.xml +++ b/Corona-Warn-App/src/main/res/navigation/nav_graph.xml @@ -261,6 +261,9 @@ <action android:id="@+id/action_submissionResultFragment_to_submissionSymptomIntroductionFragment" app:destination="@id/submissionSymptomIntroductionFragment" /> + <action + android:id="@+id/action_submissionResultFragment_to_submissionResultPositiveOtherWarningFragment" + app:destination="@id/submissionResultPositiveOtherWarningFragment" /> </fragment> <fragment