From 143420c58efedb8b73fc2e95d2c3c8ff0f53143b Mon Sep 17 00:00:00 2001
From: Oliver Zimmerman <oezimmerman@gmail.com>
Date: Tue, 24 Nov 2020 15:33:44 +0000
Subject: [PATCH] Update the dispatch screen (EXPOSUREAPP-3730) (#1613)
* Dispatcher layout changes
* String changes and removal for translation
* Changes to align with translation process - whoops
* Changes as requested by Janet - previous string too long for title
* Adjusted margin of last card to remain consistent with the rest.
Co-authored-by: Matthias Urhahn <matthias.urhahn@sap.com>
Co-authored-by: Ralf Gehrer <ralfgehrer@users.noreply.github.com>
---
.../layout/include_submission_dispatcher.xml | 41 +++++++++++++++++--
.../src/main/res/values-bg/strings.xml | 4 ++
.../src/main/res/values-de/strings.xml | 18 ++++----
.../src/main/res/values-en/strings.xml | 4 ++
.../src/main/res/values-pl/strings.xml | 4 ++
.../src/main/res/values-ro/strings.xml | 4 ++
.../src/main/res/values-tr/strings.xml | 4 ++
.../src/main/res/values/strings.xml | 4 ++
8 files changed, 72 insertions(+), 11 deletions(-)
diff --git a/Corona-Warn-App/src/main/res/layout/include_submission_dispatcher.xml b/Corona-Warn-App/src/main/res/layout/include_submission_dispatcher.xml
index d25114735..7e73de12a 100644
--- a/Corona-Warn-App/src/main/res/layout/include_submission_dispatcher.xml
+++ b/Corona-Warn-App/src/main/res/layout/include_submission_dispatcher.xml
@@ -12,6 +12,15 @@
android:focusable="true"
android:paddingBottom="@dimen/spacing_normal">
+ <ImageView
+ android:id="@+id/submission_dispatcher_illustration"
+ android:layout_width="@dimen/match_constraint"
+ android:layout_height="wrap_content"
+ android:src="@drawable/ic_illustration_test"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
+
<TextView
android:id="@+id/submission_dispatcher_text"
style="@style/subtitle"
@@ -22,7 +31,19 @@
android:focusable="true"
app:layout_constraintEnd_toStartOf="@+id/guideline_end"
app:layout_constraintStart_toStartOf="@+id/guideline_start"
- app:layout_constraintTop_toTopOf="parent" />
+ app:layout_constraintTop_toBottomOf="@+id/submission_dispatcher_illustration" />
+
+ <TextView
+ android:id="@+id/submission_dispatcher_needs_testing_text"
+ style="@style/headline6"
+ android:layout_width="@dimen/match_constraint"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="@dimen/spacing_normal"
+ android:text="@string/submission_dispatcher_needs_testing_subheadline"
+ android:focusable="true"
+ app:layout_constraintEnd_toStartOf="@+id/guideline_end"
+ app:layout_constraintStart_toStartOf="@+id/guideline_start"
+ app:layout_constraintTop_toBottomOf="@+id/submission_dispatcher_text" />
<include
android:id="@+id/submission_dispatcher_qr"
@@ -37,7 +58,7 @@
app:illustration="@{@drawable/ic_submission_illustration_qr_code_card}"
app:layout_constraintEnd_toStartOf="@+id/guideline_card_end"
app:layout_constraintStart_toStartOf="@+id/guideline_card_start"
- app:layout_constraintTop_toBottomOf="@+id/submission_dispatcher_text" />
+ app:layout_constraintTop_toBottomOf="@+id/submission_dispatcher_needs_testing_text" />
<include
android:id="@+id/submission_dispatcher_tan_code"
@@ -54,12 +75,24 @@
app:layout_constraintStart_toStartOf="@+id/guideline_card_start"
app:layout_constraintTop_toBottomOf="@+id/submission_dispatcher_qr" />
+ <TextView
+ android:id="@+id/submission_dispatcher_already_positive_text"
+ style="@style/headline6"
+ android:layout_width="@dimen/match_constraint"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="@dimen/spacing_normal"
+ android:text="@string/submission_dispatcher_already_positive_subheadline"
+ android:focusable="true"
+ app:layout_constraintEnd_toStartOf="@+id/guideline_end"
+ app:layout_constraintStart_toStartOf="@+id/guideline_start"
+ app:layout_constraintTop_toBottomOf="@+id/submission_dispatcher_tan_code" />
+
<include
android:id="@+id/submission_dispatcher_tan_tele"
layout="@layout/include_dispatcher_card"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
- android:layout_marginTop="@dimen/spacing_small"
+ android:layout_marginTop="@dimen/spacing_normal"
android:clickable="true"
android:focusable="true"
app:body="@{@string/submission_dispatcher_tan_tele_card_text}"
@@ -67,7 +100,7 @@
app:illustration="@{@drawable/ic_submission_illustration_tan_hotline_card}"
app:layout_constraintEnd_toStartOf="@+id/guideline_card_end"
app:layout_constraintStart_toStartOf="@+id/guideline_card_start"
- app:layout_constraintTop_toBottomOf="@+id/submission_dispatcher_tan_code" />
+ app:layout_constraintTop_toBottomOf="@+id/submission_dispatcher_already_positive_text" />
<include layout="@layout/merge_guidelines_side" />
diff --git a/Corona-Warn-App/src/main/res/values-bg/strings.xml b/Corona-Warn-App/src/main/res/values-bg/strings.xml
index 469ac6b4b..5e76436e3 100644
--- a/Corona-Warn-App/src/main/res/values-bg/strings.xml
+++ b/Corona-Warn-App/src/main/res/values-bg/strings.xml
@@ -951,6 +951,10 @@
<string name="submission_dispatcher_headline">"Избор"</string>
<!-- XHED: Page subheadline for dispatcher menu -->
<string name="submission_dispatcher_subheadline">"С каква Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ñ€Ð°Ð·Ð¿Ð¾Ð»Ð°Ð³Ð°Ñ‚Ðµ?"</string>
+ <!-- XHED: Page subheadline for dispatcher options asking if they have already been tested: QR and TAN -->
+ <string name="submission_dispatcher_needs_testing_subheadline">""</string>
+ <!-- XHED: Page subheadline for dispatcher options asking if they already have a positive test: tele-TAN -->
+ <string name="submission_dispatcher_already_positive_subheadline">""</string>
<!-- YTXT: Dispatcher text for QR code option -->
<string name="submission_dispatcher_card_qr">"Документ Ñ QR код"</string>
<!-- YTXT: Body text for QR code dispatcher option -->
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 b46a566c1..fbc7a3ef4 100644
--- a/Corona-Warn-App/src/main/res/values-de/strings.xml
+++ b/Corona-Warn-App/src/main/res/values-de/strings.xml
@@ -987,11 +987,15 @@
<!-- Dispatcher -->
<!-- XHED: Page headline for dispatcher menu -->
- <string name="submission_dispatcher_headline">"Auswahl"</string>
+ <string name="submission_dispatcher_headline">"Testergebnis abrufen"</string>
<!-- XHED: Page subheadline for dispatcher menu -->
- <string name="submission_dispatcher_subheadline">"Welche Informationen liegen Ihnen vor?"</string>
+ <string name="submission_dispatcher_subheadline">"Rufen Sie über die App Ihr Testergebnis ab und warnen Sie anschließend Ihre Mitmenschen. So schützen Sie sich und andere und helfen mit, die Ausbreitung von Corona zu verhindern."</string>
+ <!-- XHED: Page subheadline for dispatcher options asking if they have already been tested: QR and TAN -->
+ <string name="submission_dispatcher_needs_testing_subheadline">"Sie haben sich bereits testen lassen?"</string>
+ <!-- XHED: Page subheadline for dispatcher options asking if they already have a positive test: tele-TAN -->
+ <string name="submission_dispatcher_already_positive_subheadline">"Ihr Test ist positiv?"</string>
<!-- YTXT: Dispatcher text for QR code option -->
- <string name="submission_dispatcher_card_qr">"Dokument mit QR-Code"</string>
+ <string name="submission_dispatcher_card_qr">"Test mit QR-Code"</string>
<!-- YTXT: Body text for QR code dispatcher option -->
<string name="submission_dispatcher_qr_card_text">"Registrieren Sie Ihren Test, indem Sie den QR-Code ihres Test-Dokuments scannen."</string>
<!-- XHED: Dialog headline for dispatcher QR prviacy dialog -->
@@ -1003,13 +1007,13 @@
<!-- XBUT: submission(dispatcher QR Dialog) - negative button (left) -->
<string name="submission_dispatcher_qr_privacy_dialog_button_negative">"Nicht erlauben"</string>
<!-- YTXT: Dispatcher text for TAN code option -->
- <string name="submission_dispatcher_card_tan_code">"TAN"</string>
+ <string name="submission_dispatcher_card_tan_code">"TAN-Eingabe"</string>
<!-- YTXT: Body text for TAN code dispatcher option -->
- <string name="submission_dispatcher_tan_code_card_text">"Registrieren Sie Ihren Test per manueller TAN-Eingabe."</string>
+ <string name="submission_dispatcher_tan_code_card_text">"Ihnen liegt eine TAN vor? Weiter zur TAN-Eingabe, um andere zu warnen. "</string>
<!-- YTXT: Dispatcher text for TELE-TAN option -->
- <string name="submission_dispatcher_card_tan_tele">"TAN anfragen"</string>
+ <string name="submission_dispatcher_card_tan_tele">"Noch keine TAN?"</string>
<!-- YTXT: Body text for TELE_TAN dispatcher option -->
- <string name="submission_dispatcher_tan_tele_card_text">"Bitte rufen Sie uns an, falls Sie Corona-positiv getestet wurden."</string>
+ <string name="submission_dispatcher_tan_tele_card_text">"Rufen Sie uns an und erhalten Sie eine TAN."</string>
<!-- XACT: Dispatcher Tan page title -->
<string name="submission_dispatcher_accessibility_title">"Welche Informationen liegen Ihnen vor?"</string>
diff --git a/Corona-Warn-App/src/main/res/values-en/strings.xml b/Corona-Warn-App/src/main/res/values-en/strings.xml
index a5e01cdef..c84d50665 100644
--- a/Corona-Warn-App/src/main/res/values-en/strings.xml
+++ b/Corona-Warn-App/src/main/res/values-en/strings.xml
@@ -951,6 +951,10 @@
<string name="submission_dispatcher_headline">"Selection"</string>
<!-- XHED: Page subheadline for dispatcher menu -->
<string name="submission_dispatcher_subheadline">"What information do you have?"</string>
+ <!-- XHED: Page subheadline for dispatcher options asking if they have already been tested: QR and TAN -->
+ <string name="submission_dispatcher_needs_testing_subheadline">""</string>
+ <!-- XHED: Page subheadline for dispatcher options asking if they already have a positive test: tele-TAN -->
+ <string name="submission_dispatcher_already_positive_subheadline">""</string>
<!-- YTXT: Dispatcher text for QR code option -->
<string name="submission_dispatcher_card_qr">"Document with QR code"</string>
<!-- YTXT: Body text for QR code dispatcher option -->
diff --git a/Corona-Warn-App/src/main/res/values-pl/strings.xml b/Corona-Warn-App/src/main/res/values-pl/strings.xml
index eded35c4b..59ab0e027 100644
--- a/Corona-Warn-App/src/main/res/values-pl/strings.xml
+++ b/Corona-Warn-App/src/main/res/values-pl/strings.xml
@@ -951,6 +951,10 @@
<string name="submission_dispatcher_headline">"Wybór"</string>
<!-- XHED: Page subheadline for dispatcher menu -->
<string name="submission_dispatcher_subheadline">"Jakie informacje posiadasz?"</string>
+ <!-- XHED: Page subheadline for dispatcher options asking if they have already been tested: QR and TAN -->
+ <string name="submission_dispatcher_needs_testing_subheadline">""</string>
+ <!-- XHED: Page subheadline for dispatcher options asking if they already have a positive test: tele-TAN -->
+ <string name="submission_dispatcher_already_positive_subheadline">""</string>
<!-- YTXT: Dispatcher text for QR code option -->
<string name="submission_dispatcher_card_qr">"Dokument z kodem QR"</string>
<!-- YTXT: Body text for QR code dispatcher option -->
diff --git a/Corona-Warn-App/src/main/res/values-ro/strings.xml b/Corona-Warn-App/src/main/res/values-ro/strings.xml
index 0c5a9e4f4..e819e0e88 100644
--- a/Corona-Warn-App/src/main/res/values-ro/strings.xml
+++ b/Corona-Warn-App/src/main/res/values-ro/strings.xml
@@ -951,6 +951,10 @@
<string name="submission_dispatcher_headline">"Selecție"</string>
<!-- XHED: Page subheadline for dispatcher menu -->
<string name="submission_dispatcher_subheadline">"Ce informații aveți?"</string>
+ <!-- XHED: Page subheadline for dispatcher options asking if they have already been tested: QR and TAN -->
+ <string name="submission_dispatcher_needs_testing_subheadline">""</string>
+ <!-- XHED: Page subheadline for dispatcher options asking if they already have a positive test: tele-TAN -->
+ <string name="submission_dispatcher_already_positive_subheadline">""</string>
<!-- YTXT: Dispatcher text for QR code option -->
<string name="submission_dispatcher_card_qr">"Document cu cod QR"</string>
<!-- YTXT: Body text for QR code dispatcher option -->
diff --git a/Corona-Warn-App/src/main/res/values-tr/strings.xml b/Corona-Warn-App/src/main/res/values-tr/strings.xml
index 78dc5a455..42e37f2e4 100644
--- a/Corona-Warn-App/src/main/res/values-tr/strings.xml
+++ b/Corona-Warn-App/src/main/res/values-tr/strings.xml
@@ -951,6 +951,10 @@
<string name="submission_dispatcher_headline">"Seçim"</string>
<!-- XHED: Page subheadline for dispatcher menu -->
<string name="submission_dispatcher_subheadline">"Hangi bilgilere sahipsiniz?"</string>
+ <!-- XHED: Page subheadline for dispatcher options asking if they have already been tested: QR and TAN -->
+ <string name="submission_dispatcher_needs_testing_subheadline">""</string>
+ <!-- XHED: Page subheadline for dispatcher options asking if they already have a positive test: tele-TAN -->
+ <string name="submission_dispatcher_already_positive_subheadline">""</string>
<!-- YTXT: Dispatcher text for QR code option -->
<string name="submission_dispatcher_card_qr">"QR kod ile belgeleyin"</string>
<!-- YTXT: Body text for QR 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 09331c944..7ce347f8f 100644
--- a/Corona-Warn-App/src/main/res/values/strings.xml
+++ b/Corona-Warn-App/src/main/res/values/strings.xml
@@ -993,6 +993,10 @@
<string name="submission_dispatcher_headline">"Selection"</string>
<!-- XHED: Page subheadline for dispatcher menu -->
<string name="submission_dispatcher_subheadline">"What information do you have?"</string>
+ <!-- XHED: Page subheadline for dispatcher options asking if they have already been tested: QR and TAN -->
+ <string name="submission_dispatcher_needs_testing_subheadline">""</string>
+ <!-- XHED: Page subheadline for dispatcher options asking if they already have a positive test: tele-TAN -->
+ <string name="submission_dispatcher_already_positive_subheadline">""</string>
<!-- YTXT: Dispatcher text for QR code option -->
<string name="submission_dispatcher_card_qr">"Document with QR code"</string>
<!-- YTXT: Body text for QR code dispatcher option -->
--
GitLab