From 4a8ac1ae98bbf7d6ed9dce8124ffcb3ea924e096 Mon Sep 17 00:00:00 2001
From: Oliver Zimmerman <oezimmerman@gmail.com>
Date: Wed, 7 Oct 2020 11:55:53 +0100
Subject: [PATCH] Remove text section "Your test result was verified as
positive." (EXPOSUREAPP-3075) (#1341)
* removed required text
* Removed unused string
* removed unused heading text
* re-added all strings except german for translation process, as requested
Co-authored-by: harambasicluka <64483219+harambasicluka@users.noreply.github.com>
---
.../layout/include_test_result_positive_steps.xml | 14 +-------------
Corona-Warn-App/src/main/res/values-de/strings.xml | 4 ----
Corona-Warn-App/src/main/res/values/strings.xml | 8 ++++----
3 files changed, 5 insertions(+), 21 deletions(-)
diff --git a/Corona-Warn-App/src/main/res/layout/include_test_result_positive_steps.xml b/Corona-Warn-App/src/main/res/layout/include_test_result_positive_steps.xml
index 93b8127a4..0fbdd7e6c 100644
--- a/Corona-Warn-App/src/main/res/layout/include_test_result_positive_steps.xml
+++ b/Corona-Warn-App/src/main/res/layout/include_test_result_positive_steps.xml
@@ -22,25 +22,13 @@
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_positive_steps_positive_result"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/test_result_positive_steps_added"
- app:simple_step_entry_text="@string/submission_test_result_positive_steps_positive_body"
- app:simple_step_entry_title="@string/submission_test_result_positive_steps_positive_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_positive_steps_warning_others"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/test_result_positive_steps_positive_result"
+ app:layout_constraintTop_toBottomOf="@+id/test_result_positive_steps_added"
app:simple_step_entry_text="@string/submission_test_result_positive_steps_warning_others_body"
app:simple_step_entry_title="@string/submission_test_result_positive_steps_warning_others_heading"
app:step_entry_final="true"
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 05f5efd9e..b717635bf 100644
--- a/Corona-Warn-App/src/main/res/values-de/strings.xml
+++ b/Corona-Warn-App/src/main/res/values-de/strings.xml
@@ -843,10 +843,6 @@
<string name="submission_test_result_negative_steps_negative_body">"Der Labortest hat keinen Nachweis für das Coronavirus SARS-CoV-2 bei Ihnen ergeben. \n\nBitte entfernen Sie den Test wieder aus der Corona-Warn-App, damit Sie bei Bedarf einen neuen Test hinterlegen können."</string>
<!-- XBUT: negative test result : remove the test button -->
<string name="submission_test_result_negative_remove_test_button">"Test entfernen"</string>
- <!-- XHED: Page headline for positive test result screen -->
- <string name="submission_test_result_positive_steps_positive_heading">"Ihr Testergebnis"</string>
- <!-- YTXT: Body text for next steps section of test positive result-->
- <string name="submission_test_result_positive_steps_positive_body">"Ihr Testergebnis wurde als positiv verifiziert."</string>
<!-- XHED: Page headline for other warnings screen -->
<string name="submission_test_result_positive_steps_warning_others_heading">"Andere warnen"</string>
<!-- YTXT: Body text for for other warnings screen-->
diff --git a/Corona-Warn-App/src/main/res/values/strings.xml b/Corona-Warn-App/src/main/res/values/strings.xml
index c0ad433af..d23fdb556 100644
--- a/Corona-Warn-App/src/main/res/values/strings.xml
+++ b/Corona-Warn-App/src/main/res/values/strings.xml
@@ -843,16 +843,16 @@
<string name="submission_test_result_pending_refresh_button">"Update"</string>
<!-- XBUT: test result pending : remove the test button -->
<string name="submission_test_result_pending_remove_test_button">"Delete Test"</string>
+ <!-- XHED: Page headline for positive test result screen -->
+ <string name="submission_test_result_positive_steps_positive_heading">"Your Test Result"</string>
+ <!-- YTXT: Body text for next steps section of test positive result-->
+ <string name="submission_test_result_positive_steps_positive_body">"Your test result was verified as positive."</string>
<!-- XHED: Page headline for negative test result next steps -->
<string name="submission_test_result_negative_steps_negative_heading">"Your Test Result"</string>
<!-- YTXT: Body text for next steps section of test negative result -->
<string name="submission_test_result_negative_steps_negative_body">"The laboratory result indicates no verification that you have coronavirus SARS-CoV-2.\n\nPlease delete the test from the Corona-Warn-App, so that you can save a new test code here if necessary."</string>
<!-- XBUT: negative test result : remove the test button -->
<string name="submission_test_result_negative_remove_test_button">"Delete Test"</string>
- <!-- XHED: Page headline for positive test result screen -->
- <string name="submission_test_result_positive_steps_positive_heading">"Your Test Result"</string>
- <!-- YTXT: Body text for next steps section of test positive result-->
- <string name="submission_test_result_positive_steps_positive_body">"Your test result was verified as positive."</string>
<!-- XHED: Page headline for other warnings screen -->
<string name="submission_test_result_positive_steps_warning_others_heading">"Warning Others"</string>
<!-- YTXT: Body text for for other warnings screen-->
--
GitLab