From 11ccec86b6867aa5a21694468a2b7c04a4354f92 Mon Sep 17 00:00:00 2001
From: axelherbstreith <75120552+axelherbstreith@users.noreply.github.com>
Date: Fri, 15 Jan 2021 08:37:32 +0100
Subject: [PATCH] Layout for Risk History (EXPOSUREAPP-4577) (#2103)
* added basic layout
* added new strings to string res
* adapted naming of ids
* added variables for data binding
* removed nested constraint layout
---
.../main/res/drawable/ic_high_risk_alert.xml | 19 ++++
.../main/res/drawable/ic_low_risk_alert.xml | 19 ++++
...t_diary_overview_nested_list_item_risk.xml | 88 +++++++++++++++++++
.../res/values-de/contact_diary_strings.xml | 11 +++
.../main/res/values/contact_diary_strings.xml | 11 +++
5 files changed, 148 insertions(+)
create mode 100644 Corona-Warn-App/src/main/res/drawable/ic_high_risk_alert.xml
create mode 100644 Corona-Warn-App/src/main/res/drawable/ic_low_risk_alert.xml
create mode 100644 Corona-Warn-App/src/main/res/layout/contact_diary_overview_nested_list_item_risk.xml
diff --git a/Corona-Warn-App/src/main/res/drawable/ic_high_risk_alert.xml b/Corona-Warn-App/src/main/res/drawable/ic_high_risk_alert.xml
new file mode 100644
index 000000000..ec92e7b03
--- /dev/null
+++ b/Corona-Warn-App/src/main/res/drawable/ic_high_risk_alert.xml
@@ -0,0 +1,19 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="32dp"
+ android:height="32dp"
+ android:viewportWidth="32"
+ android:viewportHeight="32">
+ <path
+ android:pathData="M16,16m-16,0a16,16 0,1 1,32 0a16,16 0,1 1,-32 0"
+ android:fillColor="#BF0F2D"/>
+ <path
+ android:pathData="M15.1471,6.3963C15.5371,5.7582 16.4638,5.7582 16.8537,6.3963L26.0703,21.4786C26.4775,22.1449 25.9979,23 25.217,23H6.7831C6.0022,23 5.5226,22.1449 5.9298,21.4785L15.1471,6.3963Z"
+ android:fillColor="#ffffff"/>
+ <path
+ android:pathData="M14.6861,11.4884C14.5873,10.6981 15.2035,10 16,10C16.7965,10 17.4127,10.6981 17.3139,11.4884L16.562,17.5039C16.5266,17.7873 16.2856,18 16,18C15.7144,18 15.4734,17.7873 15.438,17.5039L14.6861,11.4884Z"
+ android:fillColor="#BF0F2D"/>
+ <path
+ android:pathData="M15.8354,19.0139C16.3805,18.9229 16.8952,19.287 16.9861,19.833C17.0769,20.3791 16.7136,20.8948 16.1685,20.9858C15.6321,21.0768 15.1217,20.7214 15.0179,20.184C14.9141,19.6423 15.2731,19.1179 15.8138,19.0139C15.8181,19.0139 15.8181,19.0139 15.8225,19.0139"
+ android:fillColor="#BF0F2D"
+ android:fillType="evenOdd"/>
+</vector>
diff --git a/Corona-Warn-App/src/main/res/drawable/ic_low_risk_alert.xml b/Corona-Warn-App/src/main/res/drawable/ic_low_risk_alert.xml
new file mode 100644
index 000000000..f9504a5ea
--- /dev/null
+++ b/Corona-Warn-App/src/main/res/drawable/ic_low_risk_alert.xml
@@ -0,0 +1,19 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="32dp"
+ android:height="32dp"
+ android:viewportWidth="32"
+ android:viewportHeight="32">
+ <path
+ android:pathData="M16,16m-16,0a16,16 0,1 1,32 0a16,16 0,1 1,-32 0"
+ android:fillColor="#5D6E80"/>
+ <path
+ android:pathData="M15.1471,6.3963C15.5371,5.7582 16.4638,5.7582 16.8537,6.3963L26.0703,21.4786C26.4775,22.1449 25.9979,23 25.217,23H6.7831C6.0022,23 5.5226,22.1449 5.9298,21.4785L15.1471,6.3963Z"
+ android:fillColor="#ffffff"/>
+ <path
+ android:pathData="M14.6861,11.4884C14.5873,10.6981 15.2035,10 16,10C16.7965,10 17.4127,10.6981 17.3139,11.4884L16.562,17.5039C16.5266,17.7873 16.2856,18 16,18C15.7144,18 15.4734,17.7873 15.438,17.5039L14.6861,11.4884Z"
+ android:fillColor="#5D6E80"/>
+ <path
+ android:pathData="M15.8354,19.0139C16.3805,18.9229 16.8952,19.287 16.9861,19.833C17.0769,20.3791 16.7136,20.8948 16.1685,20.9858C15.6321,21.0768 15.1217,20.7214 15.0179,20.184C14.9141,19.6423 15.2731,19.1179 15.8138,19.0139C15.8181,19.0139 15.8181,19.0139 15.8225,19.0139"
+ android:fillColor="#5D6E80"
+ android:fillType="evenOdd"/>
+</vector>
diff --git a/Corona-Warn-App/src/main/res/layout/contact_diary_overview_nested_list_item_risk.xml b/Corona-Warn-App/src/main/res/layout/contact_diary_overview_nested_list_item_risk.xml
new file mode 100644
index 000000000..738952a4f
--- /dev/null
+++ b/Corona-Warn-App/src/main/res/layout/contact_diary_overview_nested_list_item_risk.xml
@@ -0,0 +1,88 @@
+<?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:tools="http://schemas.android.com/tools">
+
+ <data>
+
+ <variable
+ name="title"
+ type="String" />
+
+ <variable
+ name="body"
+ type="String" />
+
+ <variable
+ name="icon"
+ type="android.graphics.drawable.Drawable" />
+
+ </data>
+
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:id="@+id/contact_diary_overview_risk_item"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginVertical="@dimen/spacing_tiny"
+ android:focusable="true"
+ android:paddingBottom="@dimen/spacing_tiny"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent">
+
+ <ImageView
+ android:id="@+id/contact_diary_overview_risk_item_image"
+ android:layout_width="wrap_content"
+ android:layout_height="0dp"
+ android:layout_marginStart="@dimen/spacing_small"
+ android:importantForAccessibility="no"
+ android:scaleType="centerInside"
+ android:src="@{icon}"
+ app:layout_constraintBaseline_toBaselineOf="@id/contact_diary_overview_item_risk_title"
+ app:layout_constraintEnd_toStartOf="@id/contact_diary_overview_item_risk_title"
+ app:layout_constraintStart_toStartOf="parent"
+ tools:src="@drawable/ic_high_risk_alert" />
+
+ <TextView
+ android:id="@+id/contact_diary_overview_item_risk_title"
+ style="@style/subtitle"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="@dimen/spacing_small"
+ android:layout_marginEnd="@dimen/spacing_small"
+ android:focusable="true"
+ android:text="@{title}"
+ app:layout_constraintBottom_toBottomOf="@+id/contact_diary_overview_risk_item_image"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toEndOf="@+id/contact_diary_overview_risk_item_image"
+ app:layout_constraintTop_toTopOf="parent"
+ tools:text="Erhöhtes Risiko" />
+
+ <TextView
+ android:id="@+id/contact_diary_overview_item_risk_body"
+ style="@style/subtitleMedium"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="@dimen/spacing_mega_tiny"
+ android:focusable="true"
+ android:text="@{body}"
+ app:layout_constraintEnd_toEndOf="@id/contact_diary_overview_item_risk_title"
+ app:layout_constraintStart_toStartOf="@+id/contact_diary_overview_item_risk_title"
+ app:layout_constraintTop_toBottomOf="@id/contact_diary_overview_item_risk_title"
+ tools:text="aufgrund der von der App ausgewerteten Begegnungen. Diese müssen nicht in Zusammenhang mit den von Ihnen erfassten Personen und Orten stehen." />
+
+ <View
+ android:id="@+id/contact_diary_overview_item_risk_divider"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/card_divider"
+ android:layout_marginTop="@dimen/spacing_small"
+ android:layout_marginBottom="@dimen/spacing_tiny"
+ android:background="?android:attr/listDivider"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/contact_diary_overview_item_risk_body" />
+
+ </androidx.constraintlayout.widget.ConstraintLayout>
+
+</layout>
\ No newline at end of file
diff --git a/Corona-Warn-App/src/main/res/values-de/contact_diary_strings.xml b/Corona-Warn-App/src/main/res/values-de/contact_diary_strings.xml
index cefdccb11..91c98f497 100644
--- a/Corona-Warn-App/src/main/res/values-de/contact_diary_strings.xml
+++ b/Corona-Warn-App/src/main/res/values-de/contact_diary_strings.xml
@@ -62,6 +62,17 @@
<!-- XTXT: Header for contact diary overview screen -->
<string name="contact_diary_overview_header">"Startseite"</string>
+
+ <!-- XTXT: Title for contact diary overview screen high risk information -->
+ <string name="contact_diary_high_risk_title">"Erhöhtes Risiko"</string>
+ <!-- XTXT: Title for contact diary overview screen low risk information -->
+ <string name="contact_diary_low_risk_title">"Niedriges Risiko"</string>
+ <!-- XTXT: Body for contact diary overview screen risk information -->
+ <string name="contact_diary_risk_body">"aufgrund der von der App ausgewerteten Begegnungen."</string>
+ <!-- XTXT: Extended Body for contact diary overview screen risk information -->
+ <string name="contact_diary_risk_body_extended">"aufgrund der von der App ausgewerteten Begegnungen. Diese müssen nicht in Zusammenhang mit den von Ihnen erfassten Personen und Orten stehen."</string>
+
+
<!-- XTXT: content description of contact journal image on home screen -->
<string name="contact_diary_homescreen_card_image_content_description">"Ein zugeklapptes Buch mit Lesezeichen"</string>
<!-- XTXT: content description of contact journal header image on onboarding screen -->
diff --git a/Corona-Warn-App/src/main/res/values/contact_diary_strings.xml b/Corona-Warn-App/src/main/res/values/contact_diary_strings.xml
index e85a9af17..76e54bbec 100644
--- a/Corona-Warn-App/src/main/res/values/contact_diary_strings.xml
+++ b/Corona-Warn-App/src/main/res/values/contact_diary_strings.xml
@@ -62,6 +62,17 @@
<!-- XTXT: Header for contact diary overview screen -->
<string name="contact_diary_overview_header">Start Page</string>
+
+ <!-- XTXT: Title for contact diary overview screen high risk information -->
+ <string name="contact_diary_high_risk_title"></string>
+ <!-- XTXT: Title for contact diary overview screen low risk information -->
+ <string name="contact_diary_low_risk_title"></string>
+ <!-- XTXT: Body for contact diary overview screen risk information -->
+ <string name="contact_diary_risk_body"></string>
+ <!-- XTXT: Extended Body for contact diary overview screen risk information -->
+ <string name="contact_diary_risk_body_extended"></string>
+
+
<!-- XTXT: content description of contact journal image on home screen -->
<string name="contact_diary_homescreen_card_image_content_description">"A closed book with a bookmark"</string>
<!-- XTXT: content description of contact journal header image on onboarding screen -->
--
GitLab