diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/testresult/invalid/SubmissionTestResultInvalidFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/testresult/invalid/SubmissionTestResultInvalidFragment.kt
index 2bdd5415916b8abee52858e0fe63fb66d25a1e9c..98206cd2a658ca40361e64d29dfa9abe026ef07b 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/testresult/invalid/SubmissionTestResultInvalidFragment.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/testresult/invalid/SubmissionTestResultInvalidFragment.kt
@@ -4,9 +4,11 @@ import android.content.DialogInterface
import android.os.Bundle
import android.view.View
import android.view.accessibility.AccessibilityEvent
+import androidx.core.view.isVisible
import androidx.fragment.app.Fragment
import androidx.navigation.fragment.navArgs
import de.rki.coronawarnapp.R
+import de.rki.coronawarnapp.coronatest.type.CoronaTest
import de.rki.coronawarnapp.databinding.FragmentSubmissionTestResultInvalidBinding
import de.rki.coronawarnapp.util.ContextExtensions.getColorCompat
import de.rki.coronawarnapp.util.DialogHelper
@@ -44,6 +46,20 @@ class SubmissionTestResultInvalidFragment : Fragment(R.layout.fragment_submissio
submissionTestResultHeader.headerButtonBack.buttonIcon.setOnClickListener { popBackStack() }
}
+ binding.apply {
+
+ when (navArgs.testType) {
+ CoronaTest.Type.PCR -> {
+ testResultInvalidStepsPcrAdded.isVisible = true
+ testResultInvalidStepsRatAdded.isVisible = false
+ }
+ CoronaTest.Type.RAPID_ANTIGEN -> {
+ testResultInvalidStepsPcrAdded.isVisible = false
+ testResultInvalidStepsRatAdded.isVisible = true
+ }
+ }
+ }
+
viewModel.testResult.observe2(this) {
binding.submissionTestResultSection.setTestResultSection(it.coronaTest)
}
diff --git a/Corona-Warn-App/src/main/res/drawable/ic_test_result_step_deletion.xml b/Corona-Warn-App/src/main/res/drawable/ic_test_result_step_deletion.xml
new file mode 100644
index 0000000000000000000000000000000000000000..6b995295b96b00090aee4cd890ca39407daefe70
--- /dev/null
+++ b/Corona-Warn-App/src/main/res/drawable/ic_test_result_step_deletion.xml
@@ -0,0 +1,16 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="40dp"
+ android:height="40dp"
+ android:viewportWidth="40"
+ android:viewportHeight="40">
+ <path
+ android:pathData="M20,20m-20,0a20,20 0,1 1,40 0a20,20 0,1 1,-40 0"
+ android:fillColor="#F5F5F5"/>
+ <group>
+ <clip-path
+ android:pathData="M8,8h24v24h-24z"/>
+ <path
+ android:pathData="M24,17V27H16V17H24ZM22.5,11H17.5L16.5,12H13V14H27V12H23.5L22.5,11ZM26,15H14V27C14,28.1 14.9,29 16,29H24C25.1,29 26,28.1 26,27V15Z"
+ android:fillColor="#979797"/>
+ </group>
+</vector>
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_submission_test_result_invalid.xml b/Corona-Warn-App/src/main/res/layout/fragment_submission_test_result_invalid.xml
index 42606386e207a488c3573382f457db4d58ab4361..465e80a023138e7be6e82b0b57e8c61cc0d74866 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_submission_test_result_invalid.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_submission_test_result_invalid.xml
@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto">
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools">
- <androidx.constraintlayout.widget.ConstraintLayout
+<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/submission_test_result_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -27,10 +28,10 @@
android:layout_marginBottom="@dimen/button_padding_top_bottom"
android:accessibilityLiveRegion="assertive"
android:importantForAccessibility="yes"
- app:layout_constraintBottom_toTopOf="@+id/submission_test_result_button_invalid_remove_test"
+ app:layout_constraintBottom_toTopOf="@id/submission_test_result_button_invalid_remove_test"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/submission_test_result_header">
+ app:layout_constraintTop_toBottomOf="@id/submission_test_result_header">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
@@ -58,23 +59,34 @@
android:text="@string/submission_test_result_subtitle"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/submission_test_result_section" />
+ app:layout_constraintTop_toBottomOf="@id/submission_test_result_section" />
<de.rki.coronawarnapp.ui.view.SimpleStepEntry
- android:id="@+id/test_result_invalid_steps_added"
+ android:id="@+id/test_result_invalid_steps_pcr_added"
android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_marginStart="@dimen/spacing_normal"
android:layout_marginTop="@dimen/spacing_normal"
- android:layout_marginEnd="@dimen/spacing_normal"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
+ android:layout_height="wrap_content"
+ app:layout_constraintEnd_toEndOf="@id/submission_test_result_subtitle"
+ app:layout_constraintStart_toStartOf="@id/submission_test_result_subtitle"
app:layout_constraintTop_toBottomOf="@id/submission_test_result_subtitle"
- app:simple_step_entry_text="@string/submission_test_result_steps_added_body"
app:simple_step_entry_title="@string/submission_test_result_steps_added_heading"
app:step_entry_final="false"
app:step_entry_icon="@drawable/ic_test_result_step_done" />
+ <de.rki.coronawarnapp.ui.view.SimpleStepEntry
+ android:id="@+id/test_result_invalid_steps_rat_added"
+ android:layout_width="0dp"
+ android:layout_marginTop="@dimen/spacing_normal"
+ android:layout_height="wrap_content"
+ app:layout_constraintEnd_toEndOf="@id/submission_test_result_subtitle"
+ app:layout_constraintStart_toStartOf="@id/submission_test_result_subtitle"
+ app:layout_constraintTop_toBottomOf="@id/test_result_invalid_steps_pcr_added"
+ app:simple_step_entry_title="@string/submission_test_result_steps_added_rat_heading"
+ app:step_entry_final="false"
+ android:visibility="gone"
+ tools:visibility="visible"
+ app:step_entry_icon="@drawable/ic_test_result_step_done" />
+
<de.rki.coronawarnapp.ui.view.SimpleStepEntry
android:id="@+id/test_result_invalid_steps_invalid_result"
android:layout_width="0dp"
@@ -83,12 +95,25 @@
android:layout_marginEnd="@dimen/spacing_normal"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/test_result_invalid_steps_added"
+ app:layout_constraintTop_toBottomOf="@id/test_result_invalid_steps_rat_added"
app:simple_step_entry_text="@string/submission_test_result_invalid_steps_invalid_body"
app:simple_step_entry_title="@string/submission_test_result_invalid_steps_invalid_heading"
- app:step_entry_final="true"
app:step_entry_icon="@drawable/ic_test_result_step_invalid" />
+ <de.rki.coronawarnapp.ui.view.SimpleStepEntry
+ android:id="@+id/test_result_invalid_steps_remove_test"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="@dimen/spacing_normal"
+ android:layout_marginEnd="@dimen/spacing_normal"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@id/test_result_invalid_steps_invalid_result"
+ app:simple_step_entry_text="@string/submission_test_result_delete_steps_invalid_body"
+ app:simple_step_entry_title="@string/submission_test_result_delete_steps_invalid_heading"
+ app:step_entry_final="true"
+ app:step_entry_icon="@drawable/ic_test_result_step_deletion" />
+
</androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView>
diff --git a/Corona-Warn-App/src/main/res/values-de/strings.xml b/Corona-Warn-App/src/main/res/values-de/strings.xml
index cfda23f3a4f272895d63c25a8f905b37aafaaf15..93e0e3bfcbc0b7fc7d7e4f63a2556fb14361e0e4 100644
--- a/Corona-Warn-App/src/main/res/values-de/strings.xml
+++ b/Corona-Warn-App/src/main/res/values-de/strings.xml
@@ -1064,7 +1064,7 @@
<!-- XHED: Page subheadline for test result -->
<string name="submission_test_result_subtitle">"Info zum Ablauf:"</string>
<!-- XHED: Page headline for results next steps -->
- <string name="submission_test_result_steps_added_heading">"Test erfolgreich hinzugefügt"</string>
+ <string name="submission_test_result_steps_added_heading">"Ihr PCR-Test wurde hinzugefügt."</string>
<!-- YTXT: Body text for for results next steps -->
<string name="submission_test_result_steps_added_body">"Ihr Test wurde in der Corona-Warn-App registriert."</string>
<!-- XHED: Page headline for pending test result next steps -->
@@ -1102,10 +1102,19 @@
<string name="submission_test_result_positive_continue_button_with_symptoms">"Weiter mit Symptom-Erfassung"</string>
<!-- XBUT: positive test result : continue button without symptoms -->
<string name="submission_test_result_positive_continue_button_wo_symptoms">"Weiter ohne Symptom-Erfassung"</string>
+
+
+ <!-- XHED: Page headline for invalid test result screen -->
+ <string name="submission_test_result_invalid_steps_invalid_heading">"Test kann nicht ausgewertet werden"</string>
+
<!-- XHED: Page headline for invalid test result screen -->
- <string name="submission_test_result_invalid_steps_invalid_heading">"Ihr Testergebnis"</string>
+ <string name="submission_test_result_delete_steps_invalid_heading">"Test entfernen"</string>
+
+ <!-- YTXT: Body text for next steps section of invalid test result-->
+ <string name="submission_test_result_invalid_steps_invalid_body">"Es gab ein Problem bei der Auswertung Ihres Tests. Bitte kontaktieren Sie das Testcenter oder das zuständige Labor, um Informationen zum weiteren Vorgehen zu erhalten."</string>
<!-- YTXT: Body text for next steps section of invalid test result-->
- <string name="submission_test_result_invalid_steps_invalid_body">"Es gab ein Problem bei der Auswertung Ihres Tests. Bitte kontaktieren Sie das Testcenter oder das zuständige Labor, um Information zum weiteren Vorgehen zu erhalten.\n\nBitte entfernen Sie den Test wieder aus der Corona-Warn-App, damit Sie bei Bedarf einen neuen Test hinterlegen können."</string>
+ <string name="submission_test_result_delete_steps_invalid_body">"Bitte entfernen Sie den Test wieder aus der Corona-Warn-App, damit Sie bei Bedarf einen neuen Test hinterlegen können."</string>
+
<!-- XBUT: invalid test result : remove the test button -->
<string name="submission_test_result_invalid_remove_test_button">"Test entfernen"</string>
<!-- XHED: Dialog title for tracing required dailog -->
diff --git a/Corona-Warn-App/src/main/res/values/strings.xml b/Corona-Warn-App/src/main/res/values/strings.xml
index 88cc4c0bf2b5c847f9983563438f1c76fadcad5c..6901a354374c9079304532a17c23779bbfe567f8 100644
--- a/Corona-Warn-App/src/main/res/values/strings.xml
+++ b/Corona-Warn-App/src/main/res/values/strings.xml
@@ -1067,7 +1067,6 @@
<string name="submission_test_result_steps_added_heading">"Test added successfully"</string>
<!-- YTXT: Body text for for results next steps -->
<string name="submission_test_result_steps_added_body">"Your test has been stored in the Corona-Warn-App."</string>
-
<!-- XHED: Page headline for pending test result next steps -->
<string name="submission_test_result_pending_steps_waiting_heading">"Your test result is not available yet."</string>
<!-- YTXT: Body text for next steps section of waiting test result page -->
@@ -1107,10 +1106,18 @@
<string name="submission_test_result_positive_continue_button_with_symptoms">"Enter Symptoms"</string>
<!-- XBUT: positive test result : continue button without symptoms -->
<string name="submission_test_result_positive_continue_button_wo_symptoms">"Don’t Enter Symptoms"</string>
+
+
<!-- XHED: Page headline for invalid test result screen -->
<string name="submission_test_result_invalid_steps_invalid_heading">"Your Test Result"</string>
+ <!-- XHED: Page headline for invalid test result screen -->
+ <string name="submission_test_result_delete_steps_invalid_heading">"Test entfernen"</string>
+
<!-- YTXT: Body text for next steps section of invalid test result-->
<string name="submission_test_result_invalid_steps_invalid_body">"There was a problem evaluating your test. Please contact the test center or laboratory involved to find out how to proceed.\n\nPlease delete the test from your Corona-Warn-App so that you will be able to save a new test code there, if necessary."</string>
+ <!-- YTXT: Body text for next steps section of invalid test result-->
+ <string name="submission_test_result_delete_steps_invalid_body">"Bitte entfernen Sie den Test wieder aus der Corona-Warn-App, damit Sie bei Bedarf einen neuen Test hinterlegen können."</string>
+
<!-- XBUT: invalid test result : remove the test button -->
<string name="submission_test_result_invalid_remove_test_button">"Remove test"</string>
<!-- XHED: Dialog title for tracing required dailog -->