From 0054eace526f5fd3dc344bc2e81f77dc18407fba Mon Sep 17 00:00:00 2001
From: Oliver Zimmerman <oezimmerman@gmail.com>
Date: Fri, 5 Jun 2020 08:08:35 +0100
Subject: [PATCH] =?UTF-8?q?Added=20text=20descriptions=20for=20images=20re?=
=?UTF-8?q?lated=20to=20Other=20Warning=20and=20Submi=E2=80=A6=20(#172)?=
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
---
Corona-Warn-App/src/main/res/layout/fragment_main.xml | 1 +
.../src/main/res/layout/fragment_submission_done.xml | 1 +
.../layout/fragment_submission_positive_other_warning.xml | 1 +
.../main/res/layout/include_information_details_header.xml | 5 +++++
.../src/main/res/layout/include_submission_done.xml | 7 ++++++-
Corona-Warn-App/src/main/res/values/strings.xml | 5 +++++
6 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_main.xml b/Corona-Warn-App/src/main/res/layout/fragment_main.xml
index dfaba52e5..0a064e385 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_main.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_main.xml
@@ -162,6 +162,7 @@
layout="@layout/include_submission_done"
android:layout_width="0dp"
android:layout_height="wrap_content"
+ app:illustrationDescription="@{@string/submission_done_illustration_description}"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
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 1568a90b1..f58cd85b4 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
@@ -23,6 +23,7 @@
layout="@layout/include_submission_done"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
+ app:illustrationDescription="@{@string/submission_done_illustration_description}"
app:layout_constraintEnd_toStartOf="@+id/guideline_end"
app:layout_constraintStart_toStartOf="@+id/guideline_start"
app:layout_constraintTop_toTopOf="@+id/guideline_top" />
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_submission_positive_other_warning.xml b/Corona-Warn-App/src/main/res/layout/fragment_submission_positive_other_warning.xml
index 1d94e24df..6e8d70789 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_submission_positive_other_warning.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_submission_positive_other_warning.xml
@@ -28,6 +28,7 @@
app:headline="@{@string/submission_positive_other_warning_headline}"
app:icon="@{@drawable/ic_back}"
app:illustration="@{@drawable/ic_submission_illustration_other_warning}"
+ app:illustrationDescription="@{@string/submission_positive_other_illustration_description}"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
diff --git a/Corona-Warn-App/src/main/res/layout/include_information_details_header.xml b/Corona-Warn-App/src/main/res/layout/include_information_details_header.xml
index f4fb2ace4..0036680a3 100644
--- a/Corona-Warn-App/src/main/res/layout/include_information_details_header.xml
+++ b/Corona-Warn-App/src/main/res/layout/include_information_details_header.xml
@@ -25,6 +25,10 @@
<variable
name="body"
type="String" />
+
+ <variable
+ name="illustrationDescription"
+ type="String" />
</data>
<androidx.constraintlayout.widget.ConstraintLayout
@@ -50,6 +54,7 @@
app:body="@{body}"
app:headline="@{headline}"
app:illustration="@{illustration}"
+ app:illustrationDescription="@{illustrationDescription}"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/information_header" />
diff --git a/Corona-Warn-App/src/main/res/layout/include_submission_done.xml b/Corona-Warn-App/src/main/res/layout/include_submission_done.xml
index 8973f3e63..3bd82a7c0 100644
--- a/Corona-Warn-App/src/main/res/layout/include_submission_done.xml
+++ b/Corona-Warn-App/src/main/res/layout/include_submission_done.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">
@@ -19,6 +23,7 @@
app:title="@{@string/submission_done_title}"
app:body="@{@string/submission_done_body}"
app:illustration="@{@drawable/ic_submission_illustration_thanks}"
+ app:illustrationDescription="@{illustrationDescription}"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
diff --git a/Corona-Warn-App/src/main/res/values/strings.xml b/Corona-Warn-App/src/main/res/values/strings.xml
index db519c5e9..ef7e771d6 100644
--- a/Corona-Warn-App/src/main/res/values/strings.xml
+++ b/Corona-Warn-App/src/main/res/values/strings.xml
@@ -682,6 +682,9 @@
<string name="submission_positive_dialog_confirmation_positive">Erlauben</string>
<!-- XBUT: submission(positive other warning) - negative button (left) -->
<string name="submission_positive_dialog_confirmation_negative">Nicht erlauben</string>
+ <!-- XACT: other warning - illustration description, explanation image -->
+ <string name="submission_positive_other_illustration_description">Ein Smartphone übermittelt einen positiven Testbefund verschlüsselt ins System.</string>
+
<!-- Submission Done -->
<!-- XHED: Page title for completed submission page -->
@@ -698,6 +701,8 @@
<string name="submission_done_isolate">Bitte isolieren Sie sich von anderen Personen.</string>
<!-- XBUT: submission finished button -->
<string name="submission_done_button_done">Fertig</string>
+ <!-- XACT: submission finished - illustration description, explanation image -->
+ <string name="submission_done_illustration_description">Eine vielfältige Gruppe begrüßt durch Jubel, dass jemand sein Testergebnis mit anderen geteilt hat.</string>
<!-- Submission Contact -->
<!-- XHED: Page title for contact page in submission flow -->
--
GitLab