From 0d0ddbe8e8b4ac6edf701f98e002609c235bc532 Mon Sep 17 00:00:00 2001
From: AlexanderAlferov <64849422+AlexanderAlferov@users.noreply.github.com>
Date: Thu, 4 Mar 2021 12:48:37 +0300
Subject: [PATCH] New ventilation row in normal behavior block (#2514)
---
.../drawable/ic_risk_details_ventilation.xml | 18 ++++++++++++++++++
...acing_details_item_behavior_normal_view.xml | 11 +++++++++++
.../src/main/res/values-de/strings.xml | 2 ++
.../src/main/res/values/strings.xml | 2 ++
4 files changed, 33 insertions(+)
create mode 100644 Corona-Warn-App/src/main/res/drawable/ic_risk_details_ventilation.xml
diff --git a/Corona-Warn-App/src/main/res/drawable/ic_risk_details_ventilation.xml b/Corona-Warn-App/src/main/res/drawable/ic_risk_details_ventilation.xml
new file mode 100644
index 000000000..629dbc0ee
--- /dev/null
+++ b/Corona-Warn-App/src/main/res/drawable/ic_risk_details_ventilation.xml
@@ -0,0 +1,18 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="12"
+ android:viewportHeight="12">
+ <group
+ android:scaleX="0.5"
+ android:scaleY="0.5"
+ android:pivotX="4"
+ android:pivotY="4">
+ <path
+ android:fillColor="#ffffff"
+ android:fillType="nonZero"
+ android:pathData="M0.8804,5.3135C2.0757,4.9316 3.3125,4.7407 4.4912,4.7407C6.0186,4.7407 7.1392,4.9815 8.5835,4.9815C10.0777,4.9815 11.0073,3.9688 11.0073,2.6489C11.0073,1.2959 9.9781,0.333 8.6914,0.333C7.7451,0.333 6.9151,0.9224 6.5664,1.7109C6.4336,1.9849 6.4834,2.3086 6.7822,2.458C7.0396,2.5908 7.3633,2.5078 7.5376,2.1675C7.7202,1.7441 8.1685,1.4121 8.6914,1.4121C9.3804,1.4121 9.9282,1.8936 9.9282,2.6489C9.9282,3.4043 9.397,3.9023 8.5835,3.9023C7.2056,3.9023 6.0684,3.6533 4.4912,3.6533C3.1382,3.6533 1.7769,3.894 0.5484,4.2842C0.1997,4.3838 0.0669,4.6826 0.1499,4.9731C0.2329,5.2554 0.5069,5.4214 0.8804,5.3135ZM13.8628,9.1982C15.8052,9.1982 17.1665,7.9697 17.1665,6.2515C17.1665,4.5581 15.8633,3.3296 14.2446,3.3296C12.7422,3.3296 11.6299,4.3755 11.4307,5.7534C11.3809,6.0938 11.5718,6.3677 11.8706,6.4092C12.1778,6.4507 12.4434,6.2598 12.5181,5.8696C12.6509,5.0064 13.3731,4.4087 14.2446,4.4087C15.2656,4.4087 16.0791,5.1641 16.0791,6.2515C16.0791,7.3555 15.2075,8.1191 13.8628,8.1191C11.3311,8.1191 8.6001,6.6748 5.2798,6.6748C3.5698,6.6748 2.0176,6.9487 0.5484,7.4717C0.208,7.5879 0.0669,7.8784 0.1499,8.169C0.2329,8.4512 0.5152,8.6255 0.8804,8.501C2.2334,7.9863 3.6446,7.7622 5.2798,7.7622C8.5918,7.7622 11.0654,9.1982 13.8628,9.1982ZM8.5918,15.0503C9.8701,15.0503 10.8579,14.104 10.8579,12.751C10.8579,10.792 8.8574,9.6963 5.1719,9.6963C3.6363,9.6963 1.9595,9.9951 0.5484,10.4849C0.208,10.6011 0.0669,10.8916 0.1499,11.1821C0.2329,11.4644 0.5152,11.6387 0.8804,11.5142C2.2002,11.041 3.6778,10.7837 5.1719,10.7837C8.1851,10.7837 9.7788,11.5391 9.7788,12.751C9.7788,13.5146 9.2476,13.9712 8.5918,13.9712C7.936,13.9712 7.5376,13.5312 7.4214,12.834C7.3716,12.5269 7.1558,12.2778 6.7989,12.3027C6.417,12.3276 6.2676,12.6431 6.3174,12.9751C6.4668,14.1289 7.3218,15.0503 8.5918,15.0503Z"
+ android:strokeWidth="1"
+ android:strokeColor="#00000000" />
+ </group>
+</vector>
diff --git a/Corona-Warn-App/src/main/res/layout/tracing_details_item_behavior_normal_view.xml b/Corona-Warn-App/src/main/res/layout/tracing_details_item_behavior_normal_view.xml
index 42e7316ba..a37c2577b 100644
--- a/Corona-Warn-App/src/main/res/layout/tracing_details_item_behavior_normal_view.xml
+++ b/Corona-Warn-App/src/main/res/layout/tracing_details_item_behavior_normal_view.xml
@@ -74,5 +74,16 @@
tools:backgroundTint="@color/colorSurface2"
tools:foregroundTint="@color/colorTextSemanticNeutral" />
+ <de.rki.coronawarnapp.tracing.ui.details.items.behavior.BehaviorInfoRow
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:focusable="true"
+ android:backgroundTint="@{state.getBackgroundColor(context)}"
+ android:foregroundTint="@{state.getIconColor(context)}"
+ android:icon="@drawable/ic_risk_details_ventilation"
+ android:text="@string/risk_details_behavior_body_ventilation"
+ tools:backgroundTint="@color/colorSurface2"
+ tools:foregroundTint="@color/colorTextSemanticNeutral" />
+
</LinearLayout>
</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 4fb850acf..3b4958287 100644
--- a/Corona-Warn-App/src/main/res/values-de/strings.xml
+++ b/Corona-Warn-App/src/main/res/values-de/strings.xml
@@ -329,6 +329,8 @@
<!-- XTXT: Explains user about increased risk level: URL, has to be "translated" into english (relevant for all languages except german) - https://www.coronawarn.app/en/faq/#further_details -->
<string name="risk_details_increased_risk_faq_url">"https://www.coronawarn.app/de/faq/#red_card_how_to_test"</string>
+ <!-- XMSG: risk details - ventilation bullet point -->
+ <string name="risk_details_behavior_body_ventilation">"Lüften Sie Innenräume mehrmals täglich. Öffnen Sie dazu die Fenster einige Minuten lang so weit wie möglich (Stoßlüftung)."</string>
<!-- XMSG: risk details - cough/sneeze, something like a bullet point -->
<string name="risk_details_behavior_body_cough_sneeze">"Niesen oder husten Sie in die Armbeuge oder in ein Taschentuch."</string>
<!-- XMSG: risk details - contact your doctor, bullet point -->
diff --git a/Corona-Warn-App/src/main/res/values/strings.xml b/Corona-Warn-App/src/main/res/values/strings.xml
index 0ad1b02f4..28ff6ecec 100644
--- a/Corona-Warn-App/src/main/res/values/strings.xml
+++ b/Corona-Warn-App/src/main/res/values/strings.xml
@@ -339,6 +339,8 @@
<!-- XTXT: Explains user about increased risk level: URL, has to be "translated" into english (relevant for all languages except german) - https://www.coronawarn.app/en/faq/#further_details -->
<string name="risk_details_increased_risk_faq_url">"https://www.coronawarn.app/en/faq/#red_card_how_to_test"</string>
+ <!-- XMSG: risk details - ventilation bullet point -->
+ <string name="risk_details_behavior_body_ventilation">"Lüften Sie Innenräume mehrmals täglich. Öffnen Sie dazu die Fenster einige Minuten lang so weit wie möglich (Stoßlüftung)."</string>
<!-- XMSG: risk details - cough/sneeze, something like a bullet point -->
<string name="risk_details_behavior_body_cough_sneeze">"Sneeze or cough into your elbow or a tissue."</string>
<!-- XMSG: risk details - contact your doctor, bullet point -->
--
GitLab