From 9f2fe457f8c4f607ecdccf948c7a1ec2cc98daaa Mon Sep 17 00:00:00 2001
From: harambasicluka <64483219+harambasicluka@users.noreply.github.com>
Date: Wed, 7 Apr 2021 15:51:03 +0200
Subject: [PATCH] Paragraph format & dark mode icons (EXPOSUREAPP-6188,
EXPOSUREAPP-6211) (#2753)
* reused existing icons with dark mode and deleted wrong unused icons
* update font styling
* removed font weight
Co-authored-by: BMItter <46747780+BMItter@users.noreply.github.com>
Co-authored-by: Mohamed <mohamed.metwalli@sap.com>
Co-authored-by: I502720 <axel.herbstreith@sap.com>
---
.../main/res/drawable/trace_location_stay.xml | 9 -----
.../res/drawable/trace_location_warning.xml | 28 ---------------
.../fragment_trace_location_onboarding.xml | 34 ++++++++++---------
.../layout/trace_location_privacy_card.xml | 6 ++--
4 files changed, 22 insertions(+), 55 deletions(-)
delete mode 100644 Corona-Warn-App/src/main/res/drawable/trace_location_stay.xml
delete mode 100644 Corona-Warn-App/src/main/res/drawable/trace_location_warning.xml
diff --git a/Corona-Warn-App/src/main/res/drawable/trace_location_stay.xml b/Corona-Warn-App/src/main/res/drawable/trace_location_stay.xml
deleted file mode 100644
index ddd2f57d7..000000000
--- a/Corona-Warn-App/src/main/res/drawable/trace_location_stay.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="18dp"
- android:height="21dp"
- android:viewportWidth="18"
- android:viewportHeight="21">
- <path
- android:pathData="M13,11C10.24,11 8,13.24 8,16C8,18.76 10.24,21 13,21C15.76,21 18,18.76 18,16C18,13.24 15.76,11 13,11ZM14.65,18.35L12.5,16.2V13H13.5V15.79L15.35,17.64L14.65,18.35ZM14,2H10.82C10.4,0.84 9.3,0 8,0C6.7,0 5.6,0.84 5.18,2H2C0.9,2 0,2.9 0,4V19C0,20.1 0.9,21 2,21H8.11C7.52,20.43 7.04,19.75 6.69,19H2V4H4V7H12V4H14V9.08C14.71,9.18 15.38,9.39 16,9.68V4C16,2.9 15.1,2 14,2ZM8,4C7.45,4 7,3.55 7,3C7,2.45 7.45,2 8,2C8.55,2 9,2.45 9,3C9,3.55 8.55,4 8,4Z"
- android:fillColor="#007FAD"/>
-</vector>
diff --git a/Corona-Warn-App/src/main/res/drawable/trace_location_warning.xml b/Corona-Warn-App/src/main/res/drawable/trace_location_warning.xml
deleted file mode 100644
index 82e171873..000000000
--- a/Corona-Warn-App/src/main/res/drawable/trace_location_warning.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<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="#F5F5F5"/>
- <path
- android:pathData="M22.4593,15.7042C22.4593,19.3782 19.4813,22.3562 15.8073,22.3562C12.1333,22.3562 9.1553,19.3782 9.1553,15.7042C9.1553,12.0302 12.1333,9.0522 15.8073,9.0522C19.4813,9.0522 22.4593,12.0302 22.4593,15.7042Z"
- android:strokeWidth="1.5"
- android:fillColor="#00000000"
- android:fillType="evenOdd"
- android:strokeColor="#007FAD"/>
- <group>
- <clip-path
- android:pathData="M5,9.0332H8.9876V23.3061H5V9.0332Z"
- android:fillType="evenOdd"/>
- <path
- android:pathData="M8.2726,23.3062C1.6166,16.4932 7.1646,9.1062 7.2216,9.0332L8.0146,9.6422C7.8046,9.9152 2.9456,16.4222 8.9876,22.6072L8.2726,23.3062Z"
- android:fillColor="#007FAD"
- android:fillType="evenOdd"/>
- </group>
- <path
- android:pathData="M23.3117,23.273C29.9677,16.46 24.4197,9.073 24.3627,9L23.5697,9.609C23.7797,9.882 28.6387,16.389 22.5967,22.574L23.3117,23.273Z"
- android:fillColor="#007FAD"
- android:fillType="evenOdd"/>
-</vector>
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_trace_location_onboarding.xml b/Corona-Warn-App/src/main/res/layout/fragment_trace_location_onboarding.xml
index d34935e17..8100354a0 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_trace_location_onboarding.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_trace_location_onboarding.xml
@@ -77,12 +77,13 @@
<ImageView
android:id="@+id/check_in_warning_image"
- android:layout_width="32dp"
- android:layout_height="32dp"
- android:layout_marginTop="24dp"
- android:src="@drawable/trace_location_warning"
- android:layout_marginStart="24dp"
- app:layout_constraintTop_toBottomOf="@+id/check_in_onboarding_subtitle"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="@dimen/spacing_normal"
+ android:layout_marginTop="@dimen/spacing_large"
+ android:importantForAccessibility="no"
+ android:src="@drawable/ic_qr_tracing_static"
+ app:layout_constraintTop_toBottomOf="@id/check_in_onboarding_subtitle"
app:layout_constraintStart_toStartOf="parent" />
<TextView
@@ -98,12 +99,13 @@
<ImageView
android:id="@+id/check_in_stay_image"
- android:layout_width="32dp"
- android:layout_height="32dp"
- android:layout_marginTop="24dp"
- android:src="@drawable/trace_location_stay"
- android:layout_marginStart="24dp"
- app:layout_constraintTop_toBottomOf="@+id/check_in_onboarding_warning"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="@dimen/spacing_normal"
+ android:layout_marginTop="@dimen/spacing_medium"
+ android:importantForAccessibility="no"
+ android:src="@drawable/ic_qr_time"
+ app:layout_constraintTop_toBottomOf="@id/check_in_onboarding_warning"
app:layout_constraintStart_toStartOf="parent" />
<TextView
@@ -148,7 +150,7 @@
android:layout_marginTop="4dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/check_in_onboarding_card_title" />
+ app:layout_constraintTop_toBottomOf="@id/check_in_onboarding_card_title" />
<ImageView
android:id="@+id/check_in_onboarding_bulletpoint1"
@@ -156,7 +158,7 @@
android:layout_height="8dp"
android:src="@drawable/bullet_point"
android:layout_marginTop="24dp"
- app:layout_constraintTop_toBottomOf="@+id/check_in_onboarding_card_subtitle"
+ app:layout_constraintTop_toBottomOf="@id/check_in_onboarding_card_subtitle"
app:layout_constraintStart_toStartOf="parent" />
<TextView
@@ -192,7 +194,7 @@
android:layout_height="8dp"
android:src="@drawable/bullet_point"
android:layout_marginTop="22dp"
- app:layout_constraintTop_toBottomOf="@+id/check_in_onboarding_body3"
+ app:layout_constraintTop_toBottomOf="@id/check_in_onboarding_body3"
app:layout_constraintStart_toStartOf="parent" />
<TextView
@@ -215,7 +217,7 @@
android:layout_height="8dp"
android:src="@drawable/bullet_point"
android:layout_marginTop="22dp"
- app:layout_constraintTop_toBottomOf="@+id/check_in_onboarding_body4"
+ app:layout_constraintTop_toBottomOf="@id/check_in_onboarding_body4"
app:layout_constraintStart_toStartOf="parent" />
<TextView
diff --git a/Corona-Warn-App/src/main/res/layout/trace_location_privacy_card.xml b/Corona-Warn-App/src/main/res/layout/trace_location_privacy_card.xml
index 3d36130cb..cd37450cf 100644
--- a/Corona-Warn-App/src/main/res/layout/trace_location_privacy_card.xml
+++ b/Corona-Warn-App/src/main/res/layout/trace_location_privacy_card.xml
@@ -41,7 +41,8 @@
<TextView
android:id="@+id/first_bulletpoint_title"
- style="@style/subtitleBoldSixteen"
+ style="@style/subtitle"
+ android:textStyle="bold"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/spacing_normal"
@@ -71,7 +72,8 @@
<TextView
android:id="@+id/second_bulletpoint_title"
- style="@style/subtitleBoldSixteen"
+ style="@style/subtitle"
+ android:textStyle="bold"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_normal"
--
GitLab