From bbe98cab72e2b4cd83b75995ae7ba5d61f0c6b81 Mon Sep 17 00:00:00 2001
From: Lukas Lechner <lukas.lechner@sap.com>
Date: Fri, 5 Mar 2021 18:57:17 +0100
Subject: [PATCH] Add Switzerland to country enum (EXPOSUREAPP-5282) #2535
* Adjust flag ImageView so that the quadratic flag of switzerland is not taller than the other flags
* Change country flag resource of Switzerland
---
.../src/main/res/drawable/ic_country_ch.xml | 35 ++++++-------------
.../view_country_list_entry_flag_item.xml | 2 +-
2 files changed, 12 insertions(+), 25 deletions(-)
diff --git a/Corona-Warn-App/src/main/res/drawable/ic_country_ch.xml b/Corona-Warn-App/src/main/res/drawable/ic_country_ch.xml
index 9a3ac8aac..bb8a9a3cc 100644
--- a/Corona-Warn-App/src/main/res/drawable/ic_country_ch.xml
+++ b/Corona-Warn-App/src/main/res/drawable/ic_country_ch.xml
@@ -1,28 +1,15 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="16dp"
- android:height="16dp"
- android:viewportWidth="16"
- android:viewportHeight="16">
- <group>
- <clip-path
- android:pathData="M0,0h16v16h-16z"/>
+ android:width="18dp"
+ android:height="18dp"
+ android:viewportWidth="18"
+ android:viewportHeight="18">
<path
- android:pathData="M0,0l16,0l0,16l-16,0z"
- android:strokeWidth="1"
- android:fillColor="#FF3D00"
- android:fillType="nonZero"
- android:strokeColor="#00000000"/>
+ android:pathData="M0,0h17.6763v17.5h-17.6763z"
+ android:fillColor="#EC3237" />
<path
- android:pathData="M6.3636,3.2727l3.2727,0l0,9.8182l-3.2727,0z"
- android:strokeWidth="1"
- android:fillColor="#EDF0F2"
- android:fillType="nonZero"
- android:strokeColor="#00000000"/>
+ android:pathData="M7.097,2.9082h3.4824v11.7695h-3.4824z"
+ android:fillColor="#ffffff" />
<path
- android:pathData="M3.0909,6.5455l9.8182,0l0,3.2727l-9.8182,0z"
- android:strokeWidth="1"
- android:fillColor="#EDF0F2"
- android:fillType="nonZero"
- android:strokeColor="#00000000"/>
- </group>
-</vector>
+ android:pathData="M2.8571,10.6265l0,-3.4824l11.7695,-0l0,3.4824z"
+ android:fillColor="#ffffff" />
+</vector>
\ No newline at end of file
diff --git a/Corona-Warn-App/src/main/res/layout/view_country_list_entry_flag_item.xml b/Corona-Warn-App/src/main/res/layout/view_country_list_entry_flag_item.xml
index 1d37e33e4..6ea32fe13 100644
--- a/Corona-Warn-App/src/main/res/layout/view_country_list_entry_flag_item.xml
+++ b/Corona-Warn-App/src/main/res/layout/view_country_list_entry_flag_item.xml
@@ -2,7 +2,7 @@
<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/country_list_entry_image"
- android:layout_width="28dp"
+ android:layout_width="wrap_content"
android:layout_height="28dp"
android:layout_margin="4dp"
app:srcCompat="@drawable/ic_country_eu" />
--
GitLab