One Europe:

Added flags for countries that are always included in the key download for Germany. Closes #68.
mh- · Oct 26, 2020 · 29c8287 · 29c8287
1 parent a9f7326
commit 29c8287
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 2 deletions.
diff --git a/corona-warn-companion/src/main/java/org/tosl/coronawarncompanion/Country.java b/corona-warn-companion/src/main/java/org/tosl/coronawarncompanion/Country.java
@@ -18,7 +18,7 @@ public enum Country {
     Belgium(R.id.belgium, R.string.country_code_belgium, R.string.flag_belgium, new DKDownloadBelgium()),
     Canada(R.id.canada, R.string.country_code_canada, R.string.flag_canada, new DKDownloadCanada()),
     Czechia(R.id.czechia, R.string.country_code_czechia, R.string.flag_czechia, new DKDownloadCzechia()),
-    Germany(R.id.germany, R.string.country_code_germany, R.string.flag_germany, new DKDownloadGermany()),
+    Germany(R.id.germany, R.string.country_code_germany, R.string.flags_one_europe, new DKDownloadGermany()),
     Netherlands(R.id.netherlands, R.string.country_code_netherlands, R.string.flag_netherlands, new DKDownloadNetherlands()),
     Poland(R.id.poland, R.string.country_code_poland, R.string.flag_poland, new DKDownloadPoland()),
     Switzerland(R.id.switzerland, R.string.country_code_switzerland, R.string.flag_switzerland, new DKDownloadSwitzerland());

diff --git a/corona-warn-companion/src/main/res/menu/main_activity_menu.xml b/corona-warn-companion/src/main/res/menu/main_activity_menu.xml
@@ -27,7 +27,7 @@
                 <item android:id="@+id/czechia"
                     android:title="@string/country_czechia" />
                 <item android:id="@+id/germany"
-                    android:title="@string/country_germany" />
+                    android:title="@string/countries_one_europe" />
                 <item android:id="@+id/netherlands"
                     android:title="@string/country_netherlands" />
                 <item android:id="@+id/poland"

diff --git a/corona-warn-companion/src/main/res/values-de/strings.xml b/corona-warn-companion/src/main/res/values-de/strings.xml
@@ -76,4 +76,7 @@
     <string name="toast_download_error">Fehler während Download: %s</string>
     <string name="country_canada">🇨🇦 Kanada</string>
     <string name="country_czechia">🇨🇿 Tschechien</string>
+    <string name="country_ireland">🇮🇪 Irland</string>
+    <string name="country_italy">🇮🇹 Italien</string>
+    <string name="countries_one_europe">🇩🇪 Deutschland, 🇮🇪 Irland, 🇮🇹 Italien</string>
 </resources>
diff --git a/corona-warn-companion/src/main/res/values/strings.xml b/corona-warn-companion/src/main/res/values/strings.xml
@@ -92,5 +92,13 @@
     <string name="country_netherlands">🇳🇱 Netherlands</string>
     <string name="flag_netherlands" translatable="false">🇳🇱</string>
     <string name="country_code_netherlands" translatable="false">NL</string>
+    <string name="country_ireland">🇮🇪 Ireland</string>
+    <string name="flag_ireland" translatable="false">🇮🇪</string>
+    <string name="country_code_ireland" translatable="false">IE</string>
+    <string name="country_italy">🇮🇹 Italy</string>
+    <string name="flag_italy" translatable="false">🇮🇹</string>
+    <string name="country_code_italy" translatable="false">IT</string>
+    <string name="countries_one_europe">🇩🇪 Germany, 🇮🇪 Ireland, 🇮🇹 Italy</string>
+    <string name="flags_one_europe" translatable="false">🇩🇪🇮🇪🇮🇹</string>
     <string name="toast_download_error">Error during download: %s</string>
 </resources>