From 9050510fd7f18fd83aea519006d1cf3cd23b4f63 Mon Sep 17 00:00:00 2001
From: axelherbstreith <75120552+axelherbstreith@users.noreply.github.com>
Date: Thu, 22 Apr 2021 18:24:26 +0200
Subject: [PATCH] Update "Thank You" Screen (EXPOSUREAPP-6006) (#2917)
* updated bullet points
* updated strings
* added missing comma
* updated strings
* added missing comma
Co-authored-by: Chilja Gossow <49635654+chiljamgossow@users.noreply.github.com>
---
.../src/main/res/drawable/ic_phone_white.xml | 10 +++++
.../src/main/res/drawable/ic_share_keys.xml | 10 +++++
.../include_submission_behaviour_row.xml | 3 +-
.../res/layout/include_submission_done.xml | 5 +--
.../include_submission_done_content.xml | 45 ++++++++++++-------
.../include_submission_done_further_info.xml | 2 +-
.../src/main/res/values-de/strings.xml | 5 +++
.../src/main/res/values/strings.xml | 4 ++
8 files changed, 63 insertions(+), 21 deletions(-)
create mode 100644 Corona-Warn-App/src/main/res/drawable/ic_phone_white.xml
create mode 100644 Corona-Warn-App/src/main/res/drawable/ic_share_keys.xml
diff --git a/Corona-Warn-App/src/main/res/drawable/ic_phone_white.xml b/Corona-Warn-App/src/main/res/drawable/ic_phone_white.xml
new file mode 100644
index 000000000..fb9133bf5
--- /dev/null
+++ b/Corona-Warn-App/src/main/res/drawable/ic_phone_white.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+ <path
+ android:pathData="M19.2117,15.2581L16.6917,14.9681C16.0817,14.8981 15.4817,15.1081 15.0517,15.5381L13.2017,17.3881C11.7827,16.6681 10.4957,15.7291 9.3837,14.6161C8.2707,13.5041 7.3317,12.2171 6.6117,10.7981L8.4617,8.9481C8.8917,8.5181 9.1017,7.9181 9.0317,7.3081L8.7417,4.7881C8.6217,3.7781 7.7717,3.0181 6.7517,3.0181H5.0217C3.8917,3.0181 2.9517,3.9581 3.0217,5.0881C3.2867,9.3571 5.1257,13.1961 7.9647,16.0351C10.8037,18.8741 14.6427,20.7131 18.9117,20.9781C20.0417,21.0481 20.9817,20.1081 20.9817,18.9781V17.2481C20.9817,16.2281 20.2217,15.3781 19.2117,15.2581Z"
+ android:fillColor="#ffffff"
+ android:fillType="evenOdd"/>
+</vector>
diff --git a/Corona-Warn-App/src/main/res/drawable/ic_share_keys.xml b/Corona-Warn-App/src/main/res/drawable/ic_share_keys.xml
new file mode 100644
index 000000000..78495b12b
--- /dev/null
+++ b/Corona-Warn-App/src/main/res/drawable/ic_share_keys.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="25dp"
+ android:viewportWidth="24"
+ android:viewportHeight="25">
+ <path
+ android:pathData="M12,4.5C15.64,4.5 18.67,7.09 19.35,10.54C21.95,10.72 24,12.86 24,15.5C24,18.26 21.76,20.5 19,20.5H6C2.69,20.5 0,17.81 0,14.5C0,11.41 2.34,8.86 5.35,8.54C6.6,6.14 9.11,4.5 12,4.5ZM14,17.5V13.5H17L12.36,8.85C12.16,8.65 11.85,8.65 11.65,8.85L7,13.5H10V17.5H14Z"
+ android:fillColor="#ffffff"
+ android:fillType="evenOdd"/>
+</vector>
diff --git a/Corona-Warn-App/src/main/res/layout/include_submission_behaviour_row.xml b/Corona-Warn-App/src/main/res/layout/include_submission_behaviour_row.xml
index 4f35ba769..046b5250d 100644
--- a/Corona-Warn-App/src/main/res/layout/include_submission_behaviour_row.xml
+++ b/Corona-Warn-App/src/main/res/layout/include_submission_behaviour_row.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto">
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools">
<data>
<variable
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 3e6226cf0..81daa387d 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
@@ -36,7 +36,7 @@
android:focusable="true"
app:layout_constraintEnd_toEndOf="@id/guideline_end"
app:layout_constraintStart_toStartOf="@id/guideline_start"
- app:layout_constraintTop_toBottomOf="@+id/submission_done_hero_illustration" />
+ app:layout_constraintTop_toBottomOf="@id/submission_done_hero_illustration" />
<include
android:id="@+id/submission_done_content"
@@ -47,8 +47,7 @@
app:illustrationDescription="@{@string/submission_done_illustration_description}"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/submission_done_headline" />
-
+ app:layout_constraintTop_toBottomOf="@id/submission_done_headline" />
<include layout="@layout/merge_guidelines_side" />
</androidx.constraintlayout.widget.ConstraintLayout>
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 0b4524865..e37bf7a95 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
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto">
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools">
<data>
<variable
@@ -20,8 +21,8 @@
android:layout_height="wrap_content"
android:text="@string/submission_done_body"
android:focusable="true"
- app:layout_constraintEnd_toEndOf="@+id/guideline_end"
- app:layout_constraintStart_toStartOf="@+id/guideline_start"
+ app:layout_constraintEnd_toEndOf="@id/guideline_end"
+ app:layout_constraintStart_toStartOf="@id/guideline_start"
app:layout_constraintTop_toTopOf="parent" />
<TextView
@@ -33,9 +34,21 @@
android:layout_marginTop="@dimen/spacing_normal"
android:text="@string/submission_done_subtitle"
android:focusable="true"
- app:layout_constraintEnd_toEndOf="@+id/guideline_end"
- app:layout_constraintStart_toStartOf="@+id/guideline_start"
- app:layout_constraintTop_toBottomOf="@+id/submission_done_text" />
+ app:layout_constraintEnd_toEndOf="@id/guideline_end"
+ app:layout_constraintStart_toStartOf="@id/guideline_start"
+ app:layout_constraintTop_toBottomOf="@id/submission_done_text" />
+
+ <include
+ android:id="@+id/submission_done_pcr_validation"
+ layout="@layout/include_submission_behaviour_row"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="@dimen/spacing_normal"
+ app:body="@{@string/submission_done_pcr_validation}"
+ app:icon="@{@drawable/ic_faq_information}"
+ app:layout_constraintEnd_toEndOf="@id/guideline_end"
+ app:layout_constraintStart_toStartOf="@id/guideline_start"
+ app:layout_constraintTop_toBottomOf="@id/submission_done_subtitle" />
<include
android:id="@+id/submission_done_contagious"
@@ -44,10 +57,10 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_normal"
app:body="@{@string/submission_done_contagious}"
- app:icon="@{@drawable/ic_risk_details_contact}"
- app:layout_constraintEnd_toEndOf="@+id/guideline_end"
- app:layout_constraintStart_toStartOf="@+id/guideline_start"
- app:layout_constraintTop_toBottomOf="@+id/submission_done_subtitle" />
+ app:icon="@{@drawable/ic_phone_white}"
+ app:layout_constraintEnd_toEndOf="@id/guideline_end"
+ app:layout_constraintStart_toStartOf="@id/guideline_start"
+ app:layout_constraintTop_toBottomOf="@id/submission_done_pcr_validation" />
<include
android:id="@+id/submission_done_isolate"
@@ -55,11 +68,11 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_normal"
- app:body="@{@string/submission_done_isolate}"
- app:icon="@{@drawable/ic_risk_details_home}"
- app:layout_constraintEnd_toEndOf="@+id/guideline_end"
- app:layout_constraintStart_toStartOf="@+id/guideline_start"
- app:layout_constraintTop_toBottomOf="@+id/submission_done_contagious" />
+ app:body="@{@string/submission_done_share_keys}"
+ app:icon="@{@drawable/ic_share_keys}"
+ app:layout_constraintEnd_toEndOf="@id/guideline_end"
+ app:layout_constraintStart_toStartOf="@id/guideline_start"
+ app:layout_constraintTop_toBottomOf="@id/submission_done_contagious" />
<include
layout="@layout/include_submission_done_further_info"
@@ -68,7 +81,7 @@
android:layout_marginTop="@dimen/spacing_normal"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/submission_done_isolate" />
+ app:layout_constraintTop_toBottomOf="@id/submission_done_isolate" />
<include layout="@layout/merge_guidelines_side" />
diff --git a/Corona-Warn-App/src/main/res/layout/include_submission_done_further_info.xml b/Corona-Warn-App/src/main/res/layout/include_submission_done_further_info.xml
index 361fd7ed1..6d76c5c1d 100644
--- a/Corona-Warn-App/src/main/res/layout/include_submission_done_further_info.xml
+++ b/Corona-Warn-App/src/main/res/layout/include_submission_done_further_info.xml
@@ -31,7 +31,7 @@
app:entries="@array/submission_done_further_info_bullet_points"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/further_info_title" />
+ app:layout_constraintTop_toBottomOf="@id/further_info_title" />
</androidx.constraintlayout.widget.ConstraintLayout>
</layout>
\ No newline at end of file
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 9c0a6e5a8..193bc970a 100644
--- a/Corona-Warn-App/src/main/res/values-de/strings.xml
+++ b/Corona-Warn-App/src/main/res/values-de/strings.xml
@@ -1214,10 +1214,15 @@
<string name="submission_done_body">"Dank Ihrer Mithilfe können andere gewarnt werden und entsprechend reagieren."</string>
<!-- XHED: Page subtitle for completed submission page -->
<string name="submission_done_subtitle">"Bitte beachten Sie:"</string>
+ <!-- YTXT: text after submission: pcr validation -->
+ <string name="submission_done_pcr_validation">"Machen Sie einen PCR-Test, um dieses Test-Ergebnis zu verifizieren."</string>
+ <!-- YTXT: text after submission: pcr validation -->
+ <string name="submission_done_share_keys">"Teilen Sie Ihre Zufalls-IDs, damit andere gewarnt werden können."</string>
<!-- YTXT: text after submission: contagious -->
<string name="submission_done_contagious">"Das Gesundheitsamt wird sich in den nächsten Tagen bei Ihnen melden."</string>
<!-- YTXT: text after submission: isolate -->
<string name="submission_done_isolate">"Sie sind ansteckend. Isolieren Sie sich von anderen Personen."</string>
+
<!-- XHED: Title for further info -->
<string name="submission_done_further_info_title">"Weitere Infos:"</string>
<!-- YTXT: submission done further info bullet points -->
diff --git a/Corona-Warn-App/src/main/res/values/strings.xml b/Corona-Warn-App/src/main/res/values/strings.xml
index 7c5e3825f..310241d50 100644
--- a/Corona-Warn-App/src/main/res/values/strings.xml
+++ b/Corona-Warn-App/src/main/res/values/strings.xml
@@ -1222,6 +1222,10 @@
<string name="submission_done_body">"Thanks to your support, other people can now be warned and respond appropriately."</string>
<!-- XHED: Page subtitle for completed submission page -->
<string name="submission_done_subtitle">"Please note:"</string>
+ <!-- YTXT: text after submission: pcr validation -->
+ <string name="submission_done_pcr_validation">"Machen Sie einen PCR-Test, um dieses Test-Ergebnis zu verifizieren."</string>
+ <!-- YTXT: text after submission: pcr validation -->
+ <string name="submission_done_share_keys">"Teilen Sie Ihre Zufalls-IDs, damit andere gewarnt werden können."</string>
<!-- YTXT: text after submission: contagious -->
<string name="submission_done_contagious">"The public health authority will contact you within the next few days."</string>
<!-- YTXT: text after submission: isolate -->
--
GitLab