Merge pull request #416 from igor-cali/master

Styles tidy up + Widget translatable labels
martykan · Dec 28, 2019 · 791c36f · 791c36f
2 parents 0eb3d08 + 0595087
commit 791c36f
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 33 deletions.
diff --git 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
@@ -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-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
@@ -8,10 +8,7 @@
         <item name="android:navigationBarColor">@color/darkTheme_colorBackground</item>
     </style>
 
-    <style name="AppTheme.Black" parent="Theme.AppCompat">
-        <item name="colorPrimary">@color/blackTheme_colorPrimary</item>
-        <item name="colorPrimaryDark">@color/blackTheme_colorPrimaryDark</item>
-        <item name="colorAccent">@color/blackTheme_colorAccent</item>
+    <style name="AppTheme.Black" parent="AppTheme.Dark">
         <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 +24,9 @@
         <item name="android:navigationBarColor">@color/classic_darkTheme_colorBackground</item>
     </style>
 
-    <style name="AppTheme.Classic.Black" parent="Theme.AppCompat">
-        <item name="colorPrimary">@color/classic_blackTheme_colorPrimary</item>
-        <item name="colorPrimaryDark">@color/classic_blackTheme_colorPrimaryDark</item>
-        <item name="colorAccent">@color/classic_blackTheme_colorAccent</item>
+    <style name="AppTheme.Classic.Black" parent="AppTheme.Classic.Dark">
         <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
@@ -13,9 +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>
 
@@ -31,9 +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/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>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
@@ -17,10 +17,7 @@
         <item name="colorTintedBackground">@color/darkTheme_colorTintedBackground</item>
     </style>
 
-    <style name="AppTheme.Black" parent="Theme.AppCompat">
-        <item name="colorPrimary">@color/blackTheme_colorPrimary</item>
-        <item name="colorPrimaryDark">@color/blackTheme_colorPrimaryDark</item>
-        <item name="colorAccent">@color/blackTheme_colorAccent</item>
+    <style name="AppTheme.Black" parent="AppTheme.Dark">
         <item name="android:colorBackground">@color/blackTheme_colorBackground</item>
         <item name="colorTintedBackground">@color/blackTheme_colorTintedBackground</item>
     </style>
@@ -42,17 +39,11 @@
         <item name="android:textColorPrimary">@android:color/white</item>
     </style>
 
-    <style name="AppTheme.Classic.Black" parent="Theme.AppCompat">
-        <item name="colorPrimary">@color/classic_blackTheme_colorPrimary</item>
-        <item name="colorPrimaryDark">@color/classic_blackTheme_colorPrimaryDark</item>
-        <item name="colorAccent">@color/classic_blackTheme_colorAccent</item>
+    <style name="AppTheme.Classic.Black" parent="AppTheme.Classic.Dark">
         <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>