From be8d241ff80ac9cc9ccf30e76de23871dc3b5454 Mon Sep 17 00:00:00 2001
From: Alex Paulescu <alex.paulescu@gmail.com>
Date: Tue, 1 Jun 2021 12:22:52 +0300
Subject: [PATCH] Green card submission flow update texts
(EXPOSUREAPP-7424,7425,7535) (#3294)
* Adjusted strings to new design.
* UA typo fix (#3301)
changed "abrufen" to "abzurufen"
* UA change requested (#3312)
* UA typo fix
changed "abrufen" to "abzurufen"
* UA change requested
changed the sentence to make it clearer and easier to read. Pleas apply, thanks!
Co-authored-by: Mohamed Metwalli <mohamed.metwalli@sap.com>
Co-authored-by: BMItter <Berndus@gmx.de>
Co-authored-by: Juraj Kusnier <jurajkusnier@users.noreply.github.com>
Co-authored-by: ChristinaTsigganos <83332313+ChristinaTsigganos@users.noreply.github.com>
Co-authored-by: Mohamed Metwalli <mohamed.metwalli@sap.com>
---
.../main/res/drawable/ic_star_checkmark.xml | 9 ++
.../include_submission_consent_intro.xml | 85 ++++++++++++-------
.../main/res/values-de/antigen_strings.xml | 3 +-
.../src/main/res/values-de/strings.xml | 4 +-
.../src/main/res/values/strings.xml | 2 +
5 files changed, 70 insertions(+), 33 deletions(-)
create mode 100644 Corona-Warn-App/src/main/res/drawable/ic_star_checkmark.xml
diff --git a/Corona-Warn-App/src/main/res/drawable/ic_star_checkmark.xml b/Corona-Warn-App/src/main/res/drawable/ic_star_checkmark.xml
new file mode 100644
index 000000000..74c457897
--- /dev/null
+++ b/Corona-Warn-App/src/main/res/drawable/ic_star_checkmark.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="22dp"
+ android:height="21dp"
+ android:viewportWidth="22"
+ android:viewportHeight="21">
+ <path
+ android:pathData="M21.6104,10.3141L19.2136,7.5735L19.5476,3.9488L16.0015,3.1433L14.145,0L10.8052,1.4341L7.4654,0L5.6089,3.1335L2.0628,3.9292L2.3968,7.5636L0,10.3141L2.3968,13.0547L2.0628,16.6891L5.6089,17.4946L7.4654,20.6281L10.8052,19.1842L14.145,20.6183L16.0015,17.4848L19.5476,16.6793L19.2136,13.0547L21.6104,10.3141ZM8.929,14.9505L5.1963,11.2079L6.6501,9.7542L8.929,12.0429L14.6754,6.2768L16.1292,7.7306L8.929,14.9505Z"
+ android:fillColor="#007FAD"/>
+</vector>
diff --git a/Corona-Warn-App/src/main/res/layout/include_submission_consent_intro.xml b/Corona-Warn-App/src/main/res/layout/include_submission_consent_intro.xml
index 4bd8c6d0b..106a55e12 100644
--- a/Corona-Warn-App/src/main/res/layout/include_submission_consent_intro.xml
+++ b/Corona-Warn-App/src/main/res/layout/include_submission_consent_intro.xml
@@ -8,50 +8,50 @@
<TextView
android:id="@+id/submission_consent_call_test_result"
+ style="@style/headline6"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_normal"
- app:layout_constraintTop_toBottomOf="@+id/submission_consent_illustration"
- app:layout_constraintStart_toStartOf="@id/guideline_start"
- app:layout_constraintEnd_toEndOf="@id/guideline_end"
android:text="@string/submission_consent_call_test_result"
- style="@style/headline6" />
+ app:layout_constraintEnd_toEndOf="@id/guideline_end"
+ app:layout_constraintStart_toStartOf="@id/guideline_start"
+ app:layout_constraintTop_toBottomOf="@+id/submission_consent_illustration" />
<TextView
android:id="@+id/submission_consent_call_test_result_body"
+ style="@style/subtitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_normal"
- app:layout_constraintTop_toBottomOf="@id/submission_consent_call_test_result"
- app:layout_constraintStart_toStartOf="@id/guideline_start"
- app:layout_constraintEnd_toEndOf="@id/guideline_end"
android:text="@string/submission_consent_main_headline_body"
- style="@style/subtitle" />
+ app:layout_constraintEnd_toEndOf="@id/guideline_end"
+ app:layout_constraintStart_toStartOf="@id/guideline_start"
+ app:layout_constraintTop_toBottomOf="@id/submission_consent_call_test_result" />
<ImageView
android:id="@+id/submission_consent_icon_scan"
android:layout_width="@dimen/circle_icon"
android:layout_height="@dimen/circle_icon"
android:layout_marginTop="@dimen/spacing_normal"
- app:srcCompat="@drawable/ic_qr_code"
android:background="@drawable/circle"
android:backgroundTint="@color/card_dark"
- android:padding="@dimen/circle_icon_padding"
android:importantForAccessibility="no"
+ android:padding="@dimen/circle_icon_padding"
+ app:layout_constraintStart_toStartOf="@id/guideline_start"
app:layout_constraintTop_toBottomOf="@+id/submission_consent_call_test_result_body"
- app:layout_constraintStart_toStartOf="@id/guideline_start"/>
+ app:srcCompat="@drawable/ic_qr_code" />
<TextView
android:id="@+id/submission_consent_call_test_result_scan_your_test_only"
+ style="@style/subtitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
- android:layout_marginTop="@dimen/spacing_normal"
android:layout_marginStart="@dimen/spacing_tiny"
- app:layout_constraintTop_toBottomOf="@+id/submission_consent_call_test_result_body"
- app:layout_constraintStart_toEndOf="@id/submission_consent_icon_scan"
- app:layout_constraintEnd_toEndOf="@id/guideline_end"
+ android:layout_marginTop="@dimen/spacing_normal"
android:text="@string/submission_consent_call_test_result_scan_your_test_only"
- style="@style/subtitle" />
+ app:layout_constraintEnd_toEndOf="@id/guideline_end"
+ app:layout_constraintStart_toEndOf="@id/submission_consent_icon_scan"
+ app:layout_constraintTop_toBottomOf="@+id/submission_consent_call_test_result_body" />
<ImageView
android:id="@+id/submission_consent_icon_single_test"
@@ -60,45 +60,70 @@
android:layout_marginTop="@dimen/spacing_normal"
android:background="@drawable/circle"
android:backgroundTint="@color/card_dark"
- app:srcCompat="@drawable/ic_qr_1x_test"
android:importantForAccessibility="no"
android:padding="8dp"
+ app:layout_constraintStart_toStartOf="@id/guideline_start"
app:layout_constraintTop_toBottomOf="@+id/submission_consent_call_test_result_scan_your_test_only"
- app:layout_constraintStart_toStartOf="@id/guideline_start"/>
+ app:srcCompat="@drawable/ic_qr_1x_test" />
<TextView
android:id="@+id/submission_consent_call_test_result_scan_test_only_once"
+ style="@style/subtitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
- android:layout_marginTop="@dimen/spacing_normal"
android:layout_marginStart="@dimen/spacing_tiny"
- app:layout_constraintTop_toBottomOf="@+id/submission_consent_call_test_result_scan_your_test_only"
+ android:layout_marginTop="@dimen/spacing_normal"
+ android:text="@string/submission_consent_call_test_result_scan_test_only_once"
+ app:layout_constraintEnd_toEndOf="@id/guideline_end"
app:layout_constraintStart_toEndOf="@id/submission_consent_icon_single_test"
+ app:layout_constraintTop_toBottomOf="@+id/submission_consent_call_test_result_scan_your_test_only" />
+
+ <ImageView
+ android:id="@+id/submission_star_checkmark"
+ android:layout_width="@dimen/circle_icon"
+ android:layout_height="@dimen/circle_icon"
+ android:layout_marginTop="@dimen/spacing_normal"
+ android:background="@drawable/circle"
+ android:backgroundTint="@color/card_dark"
+ android:importantForAccessibility="no"
+ android:padding="8dp"
+ app:layout_constraintStart_toStartOf="@id/guideline_start"
+ app:layout_constraintTop_toBottomOf="@id/submission_consent_call_test_result_scan_test_only_once"
+ app:srcCompat="@drawable/ic_star_checkmark" />
+
+ <TextView
+ android:id="@+id/submission_star_checkmark_text"
+ style="@style/subtitle"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="@dimen/spacing_tiny"
+ android:layout_marginTop="@dimen/spacing_normal"
+ android:text="@string/submission_consent_call_test_result_checkmark_text"
app:layout_constraintEnd_toEndOf="@id/guideline_end"
- android:text="@string/submission_consent_call_test_result_scan_test_only_once"
- style="@style/subtitle" />
+ app:layout_constraintStart_toEndOf="@id/submission_star_checkmark"
+ app:layout_constraintTop_toBottomOf="@id/submission_consent_call_test_result_scan_test_only_once" />
<TextView
android:id="@+id/submission_consent_help_by_warning_others_headline"
+ style="@style/headline6"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_normal"
- app:layout_constraintTop_toBottomOf="@+id/submission_consent_call_test_result_scan_test_only_once"
- app:layout_constraintStart_toStartOf="@id/guideline_start"
- app:layout_constraintEnd_toEndOf="@id/guideline_end"
android:text="@string/submission_consent_help_by_warning_others_headline"
- style="@style/headline6" />
+ app:layout_constraintEnd_toEndOf="@id/guideline_end"
+ app:layout_constraintStart_toStartOf="@id/guideline_start"
+ app:layout_constraintTop_toBottomOf="@+id/submission_star_checkmark_text" />
<TextView
android:id="@+id/submission_consent_help_by_warning_others_body"
+ style="@style/subtitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_normal"
- app:layout_constraintTop_toBottomOf="@+id/submission_consent_help_by_warning_others_headline"
- app:layout_constraintStart_toStartOf="@id/guideline_start"
- app:layout_constraintEnd_toEndOf="@id/guideline_end"
android:text="@string/submission_consent_help_by_warning_others_body"
- style="@style/subtitle" />
+ app:layout_constraintEnd_toEndOf="@id/guideline_end"
+ app:layout_constraintStart_toStartOf="@id/guideline_start"
+ app:layout_constraintTop_toBottomOf="@+id/submission_consent_help_by_warning_others_headline" />
<include layout="@layout/merge_guidelines_side" />
diff --git a/Corona-Warn-App/src/main/res/values-de/antigen_strings.xml b/Corona-Warn-App/src/main/res/values-de/antigen_strings.xml
index a6b5ffce0..7a1ddd897 100644
--- a/Corona-Warn-App/src/main/res/values-de/antigen_strings.xml
+++ b/Corona-Warn-App/src/main/res/values-de/antigen_strings.xml
@@ -7,8 +7,7 @@
<!-- XHED: Register test homescreen card: title -->
<string name="ag_homescreen_card_test_register_title">"Test registrieren"</string>
<!-- XTXT: Register test homescreen card: body -->
- <string name="ag_homescreen_card_test_register_body">"Nutzen Sie die App, um Ihre Tests zu registrieren und Testergebnisse abzurufen, um andere schneller warnen zu können."</string>
-
+ <string name="ag_homescreen_card_test_register_body">"Nutzen Sie die App, um Ihr Testergebnis abzurufen und andere schneller warnen zu können, oder um Ihr COVID-19-Testzertifikat anzufordern."</string>
<!-- ####################################
Homescreen cards - common buttons
###################################### -->
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 7da9b7e99..6cbc89af5 100644
--- a/Corona-Warn-App/src/main/res/values-de/strings.xml
+++ b/Corona-Warn-App/src/main/res/values-de/strings.xml
@@ -1030,6 +1030,8 @@
<string name="submission_consent_call_test_result_scan_your_test_only">"Scannen Sie nun per QR-Code Ihren eigenen Test und rufen Sie Ihr Testergebnis ab."</string>
<!-- YTXT: Body sub text 2 for Submission Consent call test result -->
<string name="submission_consent_call_test_result_scan_test_only_once">"Jeder Test kann nur einmal gescannt werden. Die App kann maximal einen Schnelltest und einen PCR-Test gleichzeitig verwalten."</string>
+ <!-- YTXT: Body sub text 3 for Submission Consent call test result -->
+ <string name="submission_consent_call_test_result_checkmark_text">"Wenn Ihr Testergebnis negativ ist, können Sie dies in Form eines offiziellen COVID-19-Testzertifikats bestätigen lassen. Fordern Sie hierfür in den folgenden Schritten das Testzertifikat an."</string>
<!-- XHED: Page subheadline for consent help by warning others -->
<string name="submission_consent_help_by_warning_others_headline">"Helfen Sie mit, indem Sie andere warnen, denen Sie begegnet sind!"</string>
<!-- YTXT: Body for consent help by warning others -->
@@ -1182,7 +1184,7 @@
<!-- YTXT: Dispatcher text for QR code option -->
<string name="submission_dispatcher_card_qr">"QR-Code scannen"</string>
<!-- YTXT: Body text for QR code dispatcher option -->
- <string name="submission_dispatcher_qr_card_text">"Erhalten Sie Ihr Testergebnis in der App und warnen Sie andere."</string>
+ <string name="submission_dispatcher_qr_card_text">"Erhalten Sie Ihr Testergebnis in der App und warnen Sie andere oder fordern Sie Ihr COVID-19-Testzertifikat an."</string>
<!-- YTXT: Dispatcher text for TAN code option -->
<string name="submission_dispatcher_card_tan_code">"TAN für PCR-Test eingeben"</string>
<!-- YTXT: Body text for TAN code dispatcher option -->
diff --git a/Corona-Warn-App/src/main/res/values/strings.xml b/Corona-Warn-App/src/main/res/values/strings.xml
index cfb76b271..c473c765b 100644
--- a/Corona-Warn-App/src/main/res/values/strings.xml
+++ b/Corona-Warn-App/src/main/res/values/strings.xml
@@ -1030,6 +1030,8 @@
<string name="submission_consent_call_test_result_scan_your_test_only">"Now scan the QR code for your test and retrieve your test result."</string>
<!-- YTXT: Body sub text 2 for Submission Consent call test result -->
<string name="submission_consent_call_test_result_scan_test_only_once">"Each test can only be scanned once. The app can manage a maximum of one rapid test and one PCR test at the same time."</string>
+ <!-- YTXT: Body sub text 3 for Submission Consent call test result -->
+ <string name="submission_consent_call_test_result_checkmark_text">"Wenn Ihr Testergebnis negativ ist, können Sie dies in Form eines offiziellen COVID-19-Testzertifikats bestätigen lassen. Fordern Sie hierfür in den folgenden Schritten das Testzertifikat an."</string>
<!-- XHED: Page subheadline for consent help by warning others -->
<string name="submission_consent_help_by_warning_others_headline">"Please help others you have encountered by warning them!"</string>
<!-- YTXT: Body for consent help by warning others -->
--
GitLab