From 9ce64dcdd24d031733250c5cdd229294e71b218c Mon Sep 17 00:00:00 2001
From: Oliver Zimmerman <oezimmerman@gmail.com>
Date: Sun, 7 Jun 2020 10:16:28 +0100
Subject: [PATCH] Feature/submission image texts (#183)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* Added text descriptions for images related to Other Warning and Submission Done screen
-Added required image description string text to strings.xml
-Edited requred fragments and includes layouts to provide image description strings
* Update include_information_details_header.xml
Fixed incorrectly named variable
* Submission introduction illustration text added
Submission introduction illustration text added
* Update strings.xml
Added more finalized strings.
* merge conflict resolution
* Update strings.xml
minor linebreak and space change
Co-authored-by: harambasicluka <64483219+harambasicluka@users.noreply.github.com>
Co-authored-by: Kolya Opahle <k.opahle@sap.com>
Co-authored-by: Jakob Möller <jakob.moeller@sap.com>
---
.../res/layout/fragment_submission_done.xml | 1 +
.../layout/include_submission_done_card.xml | 1 +
.../include_submission_done_content.xml | 6 ++++-
.../res/layout/include_submission_intro.xml | 1 +
.../src/main/res/values/strings.xml | 25 +++++++++++++------
5 files changed, 26 insertions(+), 8 deletions(-)
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_submission_done.xml b/Corona-Warn-App/src/main/res/layout/fragment_submission_done.xml
index 02d9686e2..518a2bc09 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_submission_done.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_submission_done.xml
@@ -50,6 +50,7 @@
layout="@layout/include_submission_done_content"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
+ app:illustrationDescription="@{@string/submission_done_illustration_description}"
android:layout_marginTop="@dimen/spacing_normal"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
diff --git a/Corona-Warn-App/src/main/res/layout/include_submission_done_card.xml b/Corona-Warn-App/src/main/res/layout/include_submission_done_card.xml
index 680fec8f6..929d2201a 100644
--- a/Corona-Warn-App/src/main/res/layout/include_submission_done_card.xml
+++ b/Corona-Warn-App/src/main/res/layout/include_submission_done_card.xml
@@ -48,6 +48,7 @@
layout="@layout/include_submission_done_content"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
+ app:illustrationDescription="@{@string/submission_done_illustration_description}"
android:layout_marginTop="@dimen/spacing_normal"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
diff --git a/Corona-Warn-App/src/main/res/layout/include_submission_done_content.xml b/Corona-Warn-App/src/main/res/layout/include_submission_done_content.xml
index 60cb28d20..94660425b 100644
--- a/Corona-Warn-App/src/main/res/layout/include_submission_done_content.xml
+++ b/Corona-Warn-App/src/main/res/layout/include_submission_done_content.xml
@@ -3,10 +3,14 @@
xmlns:app="http://schemas.android.com/apk/res-auto">
<data>
-
<import type="de.rki.coronawarnapp.risk.RiskLevelConstants" />
+
+ <variable
+ name="illustrationDescription"
+ type="String" />
</data>
+
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
diff --git a/Corona-Warn-App/src/main/res/layout/include_submission_intro.xml b/Corona-Warn-App/src/main/res/layout/include_submission_intro.xml
index 55360a3e7..3b015e2c1 100644
--- a/Corona-Warn-App/src/main/res/layout/include_submission_intro.xml
+++ b/Corona-Warn-App/src/main/res/layout/include_submission_intro.xml
@@ -15,6 +15,7 @@
android:id="@+id/submission_intro_hero_illustration"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
+ contentDescription="@{@string/submission_intro_illustration_description}"
android:importantForAccessibility="no"
android:src="@drawable/ic_illustration_test"
app:layout_constraintEnd_toEndOf="parent"
diff --git a/Corona-Warn-App/src/main/res/values/strings.xml b/Corona-Warn-App/src/main/res/values/strings.xml
index 8c2863622..cc7079064 100644
--- a/Corona-Warn-App/src/main/res/values/strings.xml
+++ b/Corona-Warn-App/src/main/res/values/strings.xml
@@ -1747,9 +1747,13 @@ as modifying the License.
<string name="submission_error_dialog_web_tan_invalid_button_positive">Zurück</string>
<!-- Permission Rationale Dialog -->
- <string name="submission_qr_code_scan_permission_rationale_dialog_headline">Kamera Berechtigung benötigt</string>
- <string name="submission_qr_code_scan_permission_rationale_dialog_body">Bitte erlauben Sie die Autorisierung der Kamera für das Scannen von QR-Codes.</string>
+ <!-- XHED: Dialog headline QR Scan permission rationale -->
+ <string name="submission_qr_code_scan_permission_rationale_dialog_headline">Kamera Zugriff benötigt</string>
+ <!-- YTXT: Dialog Body text for QR Scan permission rationale -->
+ <string name="submission_qr_code_scan_permission_rationale_dialog_body">Für die Erfassung des QR-Codes wird der Zugriff auf die Kamera benötigt.</string>
+ <!-- XBUT: Dialog(QR Scan permission rationale) - positive button (right) -->
<string name="submission_qr_code_scan_permission_rationale_dialog_button_positive">Erlauben</string>
+ <!-- XBUT: Dialog(QR Scan permission rationale) - negative button (left) -->
<string name="submission_qr_code_scan_permission_rationale_dialog_button_negative">Nicht erlauben</string>
<!-- QR Code Scan Successful Dialog -->
@@ -1759,9 +1763,13 @@ as modifying the License.
<string name="submission_qr_code_scan_successful_dialog_button_negative">Abbrechen</string>
<!-- QR Code Scan Invalid Dialog -->
- <string name="submission_qr_code_scan_invalid_dialog_headline">Falscher QR Code</string>
- <string name="submission_qr_code_scan_invalid_dialog_body">Es scheint, dass der falsche QR-Code gescannt wurde</string>
+ <!-- XHED: Dialog headline for invalid QR code -->
+ <string name="submission_qr_code_scan_invalid_dialog_headline">QR-Code nicht korrekt</string>
+ <!-- YTXT: Dialog Body text for invalid QR code -->
+ <string name="submission_qr_code_scan_invalid_dialog_body">Der QR-Code ist nicht korrekt. Bitte versuchen Sie es erneut.</string>
+ <!-- XBUT: Dialog(Invalid QR code) - positive button (right) -->
<string name="submission_qr_code_scan_invalid_dialog_button_positive">Erneut versuchen</string>
+ <!-- XBUT: Dialog(Invalid QR code) - negative button (left) -->
<string name="submission_qr_code_scan_invalid_dialog_button_negative">Abbrechen</string>
<!-- QR Code Scan Screen -->
@@ -1769,7 +1777,8 @@ as modifying the License.
<string name="submission_qr_code_scan_body">Positionieren Sie den QR Code in den Rahmen</string>
<!-- Register Device Screen -->
- <string name="submission_register_device_headline">Gerät Registrieren</string>
+ <!-- XHED: Text headline for test registration loading -->
+ <string name="submission_register_device_headline">Test registrieren</string>
<string name="submission_register_device_body">@string/lorem_ipsum</string>
<!-- Submission Test Result -->
@@ -1836,13 +1845,15 @@ as modifying the License.
<!-- XHED: Page title for menu at the start of the submission process -->
<string name="submission_intro_title">Wurden Sie getestet?</string>
<!-- XHED: Page headline for menu the at start of the submission process -->
- <string name="submission_intro_headline">So funktionert das Corona-Warn-System</string>
+ <string name="submission_intro_headline">So funktionert das\nCorona-Warn-System</string>
<!-- YTXT: submission introduction text -->
<string name="submission_intro_text">Damit die Corona-Warn-App funktioniert, sind wir auf die Mithilfe von Corona-positiven Personen angewiesen.\n\nDa nur verschlüsselte Zufallscodes ausgetauscht werden, bleiben Sie unerkannt. Sie können jetzt wie folgt vorgehen:\n</string>
<!-- YTXT: submission introduction enumeration -->
<string name="submission_intro_enum"><li>Wenn Sie positiv getestet wurden, können Sie andere warnen.</li>\n\n<li>Wenn Ihnen für einen positiven Test eine TAN mitgeteilt wurde , können Sie diese für die Registrierung des Tests nutzen.</li>\n\n<li>Wenn Sie keine TAN haben, können Sie diese telefonisch anfragen.</li></string>
<!-- XBUT: Submission introduction next button-->
<string name="submission_intro_button_next">Weiter</string>
+ <!-- XACT: Submission intro - illustration description, explanation image -->
+ <string name="submission_intro_illustration_description">Ein positiver Testbefund wird verschlüsselt ins System übermittelt, das nun andere Nutzerinnen und Nutzer warnt.</string>
<!-- Notification -->
<!-- XHED: Dialog headline for result dialog -->
@@ -1881,7 +1892,7 @@ as modifying the License.
<!-- XHED: Page headline for the positive result additional warning page-->
<string name="submission_positive_other_warning_headline">Helfen Sie mit!</string>
<!-- YTXT: Body text for the positive result additional warning page-->
- <string name="submission_positive_other_warning_body">Als Nächstes können Sie dafür sorgen, dass das Corona-Warn-System Ihre lokal gespeicherten Zufallscodes der letzten 14 Tage an andere verteilt. So können Sie Ihre Mitmenschen warnen und helfen, die Infektionskette zu unterbrechen. \n\n Da nur unpersönliche Zufallscodes übertragen werden, bleibt Ihre Identität unbekannt.</string>
+ <string name="submission_positive_other_warning_body">Als Nächstes können Sie dafür sorgen, dass das Corona-Warn-System Ihre lokal gespeicherten Zufallscodes der letzten 14 Tage an andere verteilt. So können Sie Ihre Mitmenschen warnen und helfen, die Infektionskette zu unterbrechen. \n\nDa nur unpersönliche Zufallscodes übertragen werden, bleibt Ihre Identität unbekannt.</string>
<!-- XHED: Title for the privacy card-->
<string name="submission_positive_other_warning_privacy_title">Datenschutz</string>
<!-- YTXT: Body text for the privacy card-->
--
GitLab