From 1435726deed0fa0f782fd3e84cb9703f656aa3db Mon Sep 17 00:00:00 2001
From: Muschko <marc.muschko@sap.com>
Date: Fri, 12 Jun 2020 00:58:52 +0200
Subject: [PATCH] updated external link visual help

---
 .../src/main/res/drawable/ic_link.xml         | 13 +++++++++
 .../main/res/layout/fragment_information.xml  |  3 ++-
 .../main/res/layout/include_main_faq_card.xml |  6 ++---
 .../src/main/res/layout/include_row.xml       | 27 ++++++++++---------
 .../src/main/res/values/dimens.xml            |  1 +
 5 files changed, 33 insertions(+), 17 deletions(-)
 create mode 100644 Corona-Warn-App/src/main/res/drawable/ic_link.xml

diff --git a/Corona-Warn-App/src/main/res/drawable/ic_link.xml b/Corona-Warn-App/src/main/res/drawable/ic_link.xml
new file mode 100644
index 00000000000..d49fc9674ec
--- /dev/null
+++ b/Corona-Warn-App/src/main/res/drawable/ic_link.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="18dp"
+    android:height="18dp"
+    android:viewportWidth="18"
+    android:viewportHeight="18">
+  <path
+      android:pathData="M2,0C0.9069,0 0,0.9069 0,2L0,16C0,17.0931 0.9069,18 2,18L16,18C17.0931,18 18,17.0931 18,16L18,9L16,9L16,16L2,16L2,2L9,2L9,0L2,0ZM11,0L11,2L14.5859,2L5.293,11.293L6.707,12.707L16,3.4141L16,7L18,7L18,0L11,0Z"
+      android:strokeWidth="1"
+      android:fillColor="#17191A"
+      android:fillAlpha="1"
+      android:fillType="evenOdd"
+      android:strokeColor="#00000000"/>
+</vector>
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_information.xml b/Corona-Warn-App/src/main/res/layout/fragment_information.xml
index 299174395f2..d51c313a917 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_information.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_information.xml
@@ -54,6 +54,7 @@
                     layout="@layout/include_row"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
+                    app:icon="@{@drawable/ic_link}"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@+id/information_about"
@@ -115,8 +116,8 @@
                     android:layout_width="@dimen/match_constraint"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="@dimen/spacing_small"
-                    android:text="@{FormatterInformationHelper.formatVersion()}"
                     android:focusable="true"
+                    android:text="@{FormatterInformationHelper.formatVersion()}"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="@+id/guideline_body"
                     app:layout_constraintTop_toBottomOf="@+id/information_legal" />
diff --git a/Corona-Warn-App/src/main/res/layout/include_main_faq_card.xml b/Corona-Warn-App/src/main/res/layout/include_main_faq_card.xml
index fbb3dc3ea47..a146bef26b9 100644
--- a/Corona-Warn-App/src/main/res/layout/include_main_faq_card.xml
+++ b/Corona-Warn-App/src/main/res/layout/include_main_faq_card.xml
@@ -45,10 +45,10 @@
             <ImageView
                 android:id="@+id/main_card_header_icon_end"
                 style="@style/icon"
-                android:layout_width="@dimen/icon_size_button"
-                android:layout_height="@dimen/icon_size_button"
+                android:layout_width="@dimen/icon_size_external_link"
+                android:layout_height="@dimen/icon_size_external_link"
                 android:importantForAccessibility="no"
-                android:src="@drawable/ic_forward"
+                android:src="@drawable/ic_link"
                 app:layout_constraintBottom_toBottomOf="@+id/main_card_header_headline"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toTopOf="@+id/main_card_header_headline" />
diff --git a/Corona-Warn-App/src/main/res/layout/include_row.xml b/Corona-Warn-App/src/main/res/layout/include_row.xml
index 17a0cd02410..1f599733491 100644
--- a/Corona-Warn-App/src/main/res/layout/include_row.xml
+++ b/Corona-Warn-App/src/main/res/layout/include_row.xml
@@ -41,28 +41,29 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent">
 
-            <ImageView
-                android:layout_width="@dimen/icon_size_main_card"
-                android:layout_height="@dimen/icon_size_main_card"
-                android:importantForAccessibility="no"
-                android:src="@{icon}"
-                android:tint="@{FormatterHelper.formatColorIcon(iconTint)}"
-                android:visibility="@{FormatterHelper.formatVisibilityIcon(icon)}"
-                app:layout_constraintBottom_toBottomOf="@+id/main_row_item_subtitle"
-                app:layout_constraintEnd_toStartOf="@+id/main_row_item_subtitle"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="@+id/main_row_item_subtitle" />
-
             <TextView
                 android:id="@+id/main_row_item_subtitle"
                 style="@style/subtitle"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
+                android:layout_marginEnd="@dimen/spacing_tiny"
                 android:text="@{subtitle}"
-                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintEnd_toStartOf="@+id/main_row_item_icon"
                 app:layout_constraintStart_toEndOf="@+id/guideline_body"
                 app:layout_constraintTop_toTopOf="parent" />
 
+            <ImageView
+                android:id="@+id/main_row_item_icon"
+                style="@style/icon"
+                android:layout_width="@dimen/icon_size_external_link"
+                android:layout_height="@dimen/icon_size_external_link"
+                android:importantForAccessibility="no"
+                android:src="@{icon}"
+                android:visibility="@{FormatterHelper.formatVisibilityIcon(icon)}"
+                app:layout_constraintBottom_toBottomOf="@+id/main_row_item_subtitle"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="@+id/main_row_item_subtitle" />
+
             <androidx.constraintlayout.widget.Guideline
                 android:id="@+id/guideline_body"
                 android:layout_width="wrap_content"
diff --git a/Corona-Warn-App/src/main/res/values/dimens.xml b/Corona-Warn-App/src/main/res/values/dimens.xml
index aa4bbad5f4a..02a3e4fb80e 100644
--- a/Corona-Warn-App/src/main/res/values/dimens.xml
+++ b/Corona-Warn-App/src/main/res/values/dimens.xml
@@ -68,6 +68,7 @@
     <dimen name="icon_size_button">40dp</dimen>
     <dimen name="icon_size_settings">40dp</dimen>
     <dimen name="icon_size_risk_details_behavior">25dp</dimen>
+    <dimen name="icon_size_external_link">18dp</dimen>
     <dimen name="icon_margin_risk_details_behavior">8dp</dimen>
 
     <!-- Circle sizes -->