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 dfaba52e58adcf4540eca2e8c2d9f6c5b2a4e949..0a064e38540b096ef518f01f36c1905b918dc38c 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 1568a90b1356ce8c9c0d5ce63eed13457b389e63..f58cd85b45c3af9ca4ecc30f5177e28feb2b8904 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 1d94e24df14e6e93e5401cd9b11fd8dad4a09064..6e8d7078984ee785f9af3cb6b0ee93eb1de51a37 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 f4fb2ace4602986ab6ccd4f65419c588e767fef3..0036680a3e5976bdf7f04f0d299116f874a7e894 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 8973f3e63f4fc9e6162e372120b6b74fe85d9ab5..3bd82a7c029ddc68f0ff7ca3114c7d386e0a2a0a 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 db519c5e987cb60eb12c9ce45e7d238ce66be263..ef7e771d6fa9367c8d75b8021edb041e8f966a08 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 -->