From aae02ced86bc35a192940c36ff2d872c400cd16b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Igor=20Cal=C3=AC?= <igor.cali0@gmail.com>
Date: Thu, 26 Dec 2019 14:39:06 +0100
Subject: [PATCH 1/3] Tidy Black themes #408

---
 app/src/main/res/values-v21/styles.xml | 10 ++++++++--
 app/src/main/res/values/colors.xml     |  4 ++++
 app/src/main/res/values/styles.xml     | 12 ++++++++++--
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
index 9b34d2d9..77c86db0 100644
--- a/app/src/main/res/values-v21/styles.xml
+++ b/app/src/main/res/values-v21/styles.xml
@@ -8,10 +8,12 @@
         <item name="android:navigationBarColor">@color/darkTheme_colorBackground</item>
     </style>
 
-    <style name="AppTheme.Black" parent="Theme.AppCompat">
+    <style name="AppTheme.Black" parent="AppTheme.Dark">
+        <!--
         <item name="colorPrimary">@color/blackTheme_colorPrimary</item>
         <item name="colorPrimaryDark">@color/blackTheme_colorPrimaryDark</item>
         <item name="colorAccent">@color/blackTheme_colorAccent</item>
+        -->
         <item name="android:colorBackground">@color/blackTheme_colorBackground</item>
         <item name="colorTintedBackground">@color/blackTheme_colorTintedBackground</item>
         <item name="android:navigationBarColor">@color/blackTheme_colorBackground</item>
@@ -27,13 +29,17 @@
         <item name="android:navigationBarColor">@color/classic_darkTheme_colorBackground</item>
     </style>
 
-    <style name="AppTheme.Classic.Black" parent="Theme.AppCompat">
+    <style name="AppTheme.Classic.Black" parent="AppTheme.Classic.Dark">
+        <!--
         <item name="colorPrimary">@color/classic_blackTheme_colorPrimary</item>
         <item name="colorPrimaryDark">@color/classic_blackTheme_colorPrimaryDark</item>
         <item name="colorAccent">@color/classic_blackTheme_colorAccent</item>
+        -->
         <item name="android:colorBackground">@color/classic_blackTheme_colorBackground</item>
         <item name="colorTintedBackground">@color/classic_blackTheme_colorTintedBackground</item>
+        <!--
         <item name="android:textColorPrimary">@android:color/white</item>
+        -->
         <item name="android:navigationBarColor">@color/blackTheme_colorBackground</item>
     </style>
 
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 87f1e804..0a0b4c19 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -13,9 +13,11 @@
     <color name="darkTheme_colorBackground">#303030</color>
     <color name="darkTheme_colorTintedBackground">#424242</color>
 
+    <!--
     <color name="blackTheme_colorPrimary">#2196F3</color>
     <color name="blackTheme_colorPrimaryDark">#1E88E5</color>
     <color name="blackTheme_colorAccent">#2196F3</color>
+    -->
     <color name="blackTheme_colorBackground">#000000</color>
     <color name="blackTheme_colorTintedBackground">#303030</color>
 
@@ -31,9 +33,11 @@
     <color name="classic_darkTheme_colorBackground">#303030</color>
     <color name="classic_darkTheme_colorTintedBackground">#263238</color>
 
+    <!--
     <color name="classic_blackTheme_colorPrimary">#37474f</color>
     <color name="classic_blackTheme_colorPrimaryDark">#263238</color>
     <color name="classic_blackTheme_colorAccent">#90a4ae</color>
+    -->
     <color name="classic_blackTheme_colorBackground">#000000</color>
     <color name="classic_blackTheme_colorTintedBackground">#303030</color>
 
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 2fd75af9..ab911083 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -17,10 +17,12 @@
         <item name="colorTintedBackground">@color/darkTheme_colorTintedBackground</item>
     </style>
 
-    <style name="AppTheme.Black" parent="Theme.AppCompat">
+    <style name="AppTheme.Black" parent="AppTheme.Dark">
+        <!--
         <item name="colorPrimary">@color/blackTheme_colorPrimary</item>
         <item name="colorPrimaryDark">@color/blackTheme_colorPrimaryDark</item>
         <item name="colorAccent">@color/blackTheme_colorAccent</item>
+        -->
         <item name="android:colorBackground">@color/blackTheme_colorBackground</item>
         <item name="colorTintedBackground">@color/blackTheme_colorTintedBackground</item>
     </style>
@@ -42,16 +44,22 @@
         <item name="android:textColorPrimary">@android:color/white</item>
     </style>
 
-    <style name="AppTheme.Classic.Black" parent="Theme.AppCompat">
+    <style name="AppTheme.Classic.Black" parent="AppTheme.Classic.Dark">
+        <!--
         <item name="colorPrimary">@color/classic_blackTheme_colorPrimary</item>
         <item name="colorPrimaryDark">@color/classic_blackTheme_colorPrimaryDark</item>
         <item name="colorAccent">@color/classic_blackTheme_colorAccent</item>
+        -->
         <item name="android:colorBackground">@color/classic_blackTheme_colorBackground</item>
         <item name="colorTintedBackground">@color/classic_blackTheme_colorTintedBackground</item>
+        <!--
         <item name="android:textColorPrimary">@android:color/white</item>
+        -->
     </style>
 
+    <!--
     <style name="AppTheme.NoStatusBar" parent="AppTheme.NoActionBar"></style>
+    -->
 
     <style name="AppTheme.NoActionBar" parent="AppTheme">
         <item name="windowActionBar">false</item>

From 25c488df92b4a06f31fabf77f6725cd0c5896a6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Igor=20Cal=C3=AC?= <igor.cali0@gmail.com>
Date: Thu, 26 Dec 2019 14:58:32 +0100
Subject: [PATCH 2/3] Translatable widget labels + Italian translations

---
 app/src/main/AndroidManifest.xml       |  8 ++++----
 app/src/main/res/values-it/strings.xml | 11 ++++++++---
 app/src/main/res/values/strings.xml    |  5 +++++
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index ba463430..921956f0 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -31,7 +31,7 @@
             android:name=".activities.SettingsActivity"
             android:theme="@style/AppTheme" />
 
-        <receiver android:name=".widgets.ExtensiveWidgetProvider">
+        <receiver android:name=".widgets.ExtensiveWidgetProvider" android:label="@string/widget_label_extensive">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
             </intent-filter>
@@ -40,7 +40,7 @@
                 android:name="android.appwidget.provider"
                 android:resource="@xml/extensive_widget" />
         </receiver>
-        <receiver android:name=".widgets.TimeWidgetProvider">
+        <receiver android:name=".widgets.TimeWidgetProvider" android:label="@string/widget_label_time">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
             </intent-filter>
@@ -49,7 +49,7 @@
                 android:name="android.appwidget.provider"
                 android:resource="@xml/time_widget" />
         </receiver>
-        <receiver android:name=".widgets.SimpleWidgetProvider">
+        <receiver android:name=".widgets.SimpleWidgetProvider" android:label="@string/widget_label_simple">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
             </intent-filter>
@@ -58,7 +58,7 @@
                 android:name="android.appwidget.provider"
                 android:resource="@xml/simple_widget" />
         </receiver>
-        <receiver android:name=".widgets.ClassicTimeWidgetProvider" android:label="Forecastie Classic">
+        <receiver android:name=".widgets.ClassicTimeWidgetProvider" android:label="@string/widget_label_classic">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
             </intent-filter>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 35b1a3d2..4371e126 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -23,8 +23,8 @@
 
     <string name="search_title">Cerca città</string>
 
-    <string name="downloading_data">Download dati in corso ...</string>
-    <string name="getting_location">Geolocalizzazione in corso ...</string>
+    <string name="downloading_data">Download dati in corso…</string>
+    <string name="getting_location">Geolocalizzazione in corso…</string>
 
     <string name="error_dateFormat">ERRORE FORMATO DATA</string>
 
@@ -153,7 +153,7 @@
     <string name="about_icons">Le icone sono <a href="https://erikflowers.github.io/weather-icons/">Weather Icons</a>, di <a href="http://www.twitter.com/artill">Lukas Bischoff</a> e <a href="http://www.twitter.com/Erik_UX">Erik Flowers</a>, sotto la licenza <a href="http://scripts.sil.org/OFL">SIL OFL 1.1</a>.</string>
     <string name="about_issues">È possibile segnalare problemi <a href="https://github.com/martykan/forecastie/issues">qui</a>.</string>
     <string name="about_src">Il codice è disponibile in <a href="https://github.com/martykan/forecastie">Forecastie</a>.</string>
-    <string name="loading_data">Caricamento...</string>
+    <string name="loading_data">Caricamento…</string>
     <string name="setting_theme_black">Fresco nero</string>
     <string name="setting_theme_classic_black">Classico nero</string>
     <string name="settings_12hour">12 h</string>
@@ -164,4 +164,9 @@
     <string name="settings_30min">30 min</string>
     <string name="settings_6hour">6 h</string>
     <string name="uvi_no_info">Nessuna informazione</string>
+
+    <string name="widget_label_extensive">Forecastie esteso</string>
+    <string name="widget_label_time">Forecastie orario</string>
+    <string name="widget_label_simple">Forecastie semplice</string>
+    <string name="widget_label_classic">Forecastie classico</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ab7f7617..ff8345df 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -194,4 +194,9 @@
     <string name="about_issues">Bugs and enhancements can be posted on our <a href='https://github.com/martykan/forecastie/issues'>Github issues page</a>.</string>
     <string name="about_data">Data provided by <a href='https://openweathermap.org/'>OpenWeatherMap</a>, under the <a href='http://creativecommons.org/licenses/by-sa/2.0/'>Creative Commons CC-BY-SA licence</a>.</string>
     <string name="about_icons">Icons are <a href='https://erikflowers.github.io/weather-icons/'>Weather Icons</a>, by <a href='http://www.twitter.com/artill'>Lukas Bischoff</a> and <a href='http://www.twitter.com/Erik_UX'>Erik Flowers</a>, under the <a href='http://scripts.sil.org/OFL'>SIL OFL 1.1</a> licence.</string>
+
+    <string name="widget_label_extensive">Forecastie Extensive</string>
+    <string name="widget_label_time">Forecastie Time</string>
+    <string name="widget_label_simple">Forecastie Simple</string>
+    <string name="widget_label_classic">Forecastie Classic</string>
 </resources>

From 059508758561b7848c14d07e752be2b07f74d403 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Igor=20Cal=C3=AC?= <igor.cali0@gmail.com>
Date: Sat, 28 Dec 2019 15:17:21 +0100
Subject: [PATCH 3/3] Code cleanup #408

---
 app/src/main/res/values-v21/styles.xml | 13 -------------
 app/src/main/res/values/colors.xml     | 10 ----------
 app/src/main/res/values/styles.xml     | 17 -----------------
 3 files changed, 40 deletions(-)

diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
index 77c86db0..f894b313 100644
--- a/app/src/main/res/values-v21/styles.xml
+++ b/app/src/main/res/values-v21/styles.xml
@@ -9,11 +9,6 @@
     </style>
 
     <style name="AppTheme.Black" parent="AppTheme.Dark">
-        <!--
-        <item name="colorPrimary">@color/blackTheme_colorPrimary</item>
-        <item name="colorPrimaryDark">@color/blackTheme_colorPrimaryDark</item>
-        <item name="colorAccent">@color/blackTheme_colorAccent</item>
-        -->
         <item name="android:colorBackground">@color/blackTheme_colorBackground</item>
         <item name="colorTintedBackground">@color/blackTheme_colorTintedBackground</item>
         <item name="android:navigationBarColor">@color/blackTheme_colorBackground</item>
@@ -30,16 +25,8 @@
     </style>
 
     <style name="AppTheme.Classic.Black" parent="AppTheme.Classic.Dark">
-        <!--
-        <item name="colorPrimary">@color/classic_blackTheme_colorPrimary</item>
-        <item name="colorPrimaryDark">@color/classic_blackTheme_colorPrimaryDark</item>
-        <item name="colorAccent">@color/classic_blackTheme_colorAccent</item>
-        -->
         <item name="android:colorBackground">@color/classic_blackTheme_colorBackground</item>
         <item name="colorTintedBackground">@color/classic_blackTheme_colorTintedBackground</item>
-        <!--
-        <item name="android:textColorPrimary">@android:color/white</item>
-        -->
         <item name="android:navigationBarColor">@color/blackTheme_colorBackground</item>
     </style>
 
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 0a0b4c19..4cbe43ae 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -13,11 +13,6 @@
     <color name="darkTheme_colorBackground">#303030</color>
     <color name="darkTheme_colorTintedBackground">#424242</color>
 
-    <!--
-    <color name="blackTheme_colorPrimary">#2196F3</color>
-    <color name="blackTheme_colorPrimaryDark">#1E88E5</color>
-    <color name="blackTheme_colorAccent">#2196F3</color>
-    -->
     <color name="blackTheme_colorBackground">#000000</color>
     <color name="blackTheme_colorTintedBackground">#303030</color>
 
@@ -33,11 +28,6 @@
     <color name="classic_darkTheme_colorBackground">#303030</color>
     <color name="classic_darkTheme_colorTintedBackground">#263238</color>
 
-    <!--
-    <color name="classic_blackTheme_colorPrimary">#37474f</color>
-    <color name="classic_blackTheme_colorPrimaryDark">#263238</color>
-    <color name="classic_blackTheme_colorAccent">#90a4ae</color>
-    -->
     <color name="classic_blackTheme_colorBackground">#000000</color>
     <color name="classic_blackTheme_colorTintedBackground">#303030</color>
 
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index ab911083..a6840f07 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -18,11 +18,6 @@
     </style>
 
     <style name="AppTheme.Black" parent="AppTheme.Dark">
-        <!--
-        <item name="colorPrimary">@color/blackTheme_colorPrimary</item>
-        <item name="colorPrimaryDark">@color/blackTheme_colorPrimaryDark</item>
-        <item name="colorAccent">@color/blackTheme_colorAccent</item>
-        -->
         <item name="android:colorBackground">@color/blackTheme_colorBackground</item>
         <item name="colorTintedBackground">@color/blackTheme_colorTintedBackground</item>
     </style>
@@ -45,22 +40,10 @@
     </style>
 
     <style name="AppTheme.Classic.Black" parent="AppTheme.Classic.Dark">
-        <!--
-        <item name="colorPrimary">@color/classic_blackTheme_colorPrimary</item>
-        <item name="colorPrimaryDark">@color/classic_blackTheme_colorPrimaryDark</item>
-        <item name="colorAccent">@color/classic_blackTheme_colorAccent</item>
-        -->
         <item name="android:colorBackground">@color/classic_blackTheme_colorBackground</item>
         <item name="colorTintedBackground">@color/classic_blackTheme_colorTintedBackground</item>
-        <!--
-        <item name="android:textColorPrimary">@android:color/white</item>
-        -->
     </style>
 
-    <!--
-    <style name="AppTheme.NoStatusBar" parent="AppTheme.NoActionBar"></style>
-    -->
-
     <style name="AppTheme.NoActionBar" parent="AppTheme">
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>