Add option to skip Symptoms Screens from Test Result (EXPOSUREAPP-3075) (#1334)

* Added button in layout for continuing without symptoms. Adjusted existing button text

* Added new button, tweaked navigation and logic

* Changed symptom indication to no indication appropriately

* code style changes

* added navigation related boolean to method rather than predefined

* code style

Co-authored-by: Ralf Gehrer <ralfgehrer@users.noreply.github.com>

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() {

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"

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