Update the weather icons

app/src/main/java/com/tommasoberlose/anotherwidget/components/IconPackSelector.kt

@@ -32,10 +32,10 @@ class IconPackSelector(context: Context, private val header: String? = null) : B
             itemView.label.text = context.getString(R.string.settings_weather_icon_pack_default).format(item.value + 1)
             itemView.isSelected = item.value == Preferences.weatherIconPack
 
-            itemView.icon_1.setImageDrawable(ContextCompat.getDrawable(context, WeatherHelper.getWeatherIconResource("01d", item.value)))
-            itemView.icon_2.setImageDrawable(ContextCompat.getDrawable(context, WeatherHelper.getWeatherIconResource("01n", item.value)))
-            itemView.icon_3.setImageDrawable(ContextCompat.getDrawable(context, WeatherHelper.getWeatherIconResource("10d", item.value)))
-            itemView.icon_4.setImageDrawable(ContextCompat.getDrawable(context, WeatherHelper.getWeatherIconResource("09n", item.value)))
+            itemView.icon_1.setImageDrawable(ContextCompat.getDrawable(context, WeatherHelper.getWeatherIconResource(context, "01d", item.value)))
+            itemView.icon_2.setImageDrawable(ContextCompat.getDrawable(context, WeatherHelper.getWeatherIconResource(context, "01n", item.value)))
+            itemView.icon_3.setImageDrawable(ContextCompat.getDrawable(context, WeatherHelper.getWeatherIconResource(context, "10d", item.value)))
+            itemView.icon_4.setImageDrawable(ContextCompat.getDrawable(context, WeatherHelper.getWeatherIconResource(context, "09n", item.value)))
 
             listOf<ImageView>(itemView.icon_1, itemView.icon_2, itemView.icon_3, itemView.icon_4).forEach {
                 if (item == Constants.WeatherIconPack.MINIMAL) {

app/src/main/java/com/tommasoberlose/anotherwidget/helpers/WeatherHelper.kt

@@ -11,6 +11,7 @@ import com.tommasoberlose.anotherwidget.network.WeatherNetworkApi
 import com.tommasoberlose.anotherwidget.ui.fragments.MainFragment
 import com.tommasoberlose.anotherwidget.ui.widgets.MainWidget
 import com.tommasoberlose.anotherwidget.utils.checkGrantedPermission
+import com.tommasoberlose.anotherwidget.utils.isDarkTheme
 import org.greenrobot.eventbus.EventBus
 
 
@@ -46,14 +47,14 @@ object WeatherHelper {
         MainWidget.updateWidget(context)
     }
 
-    fun getWeatherIconResource(icon: String, style: Int = Preferences.weatherIconPack): Int {
+    fun getWeatherIconResource(context: Context, icon: String, style: Int = Preferences.weatherIconPack): Int {
         return when (icon) {
             "01d" -> {
                 when (style) {
                     Constants.WeatherIconPack.COOL.value -> R.drawable.clear_day_3
                     Constants.WeatherIconPack.MINIMAL.value -> R.drawable.clear_day_2
                     Constants.WeatherIconPack.GOOGLE_NEWS.value -> R.drawable.clear_day_4
-                    else -> R.drawable.clear_day
+                    else -> if (context.isDarkTheme()) R.drawable.clear_day_5 else R.drawable.clear_day_5_light
                 }
             }
             "02d" -> {
@@ -61,7 +62,7 @@ object WeatherHelper {
                     Constants.WeatherIconPack.COOL.value -> R.drawable.partly_cloudy_3
                     Constants.WeatherIconPack.MINIMAL.value -> R.drawable.partly_cloudy_2
                     Constants.WeatherIconPack.GOOGLE_NEWS.value -> R.drawable.partly_cloudy_4
-                    else -> R.drawable.partly_cloudy
+                    else -> if (context.isDarkTheme()) R.drawable.partly_cloudy_5 else R.drawable.partly_cloudy_5_light
                 }
             }
             "03d" -> {
@@ -69,7 +70,7 @@ object WeatherHelper {
                     Constants.WeatherIconPack.COOL.value -> R.drawable.mostly_cloudy_3
                     Constants.WeatherIconPack.MINIMAL.value -> R.drawable.mostly_cloudy_2
                     Constants.WeatherIconPack.GOOGLE_NEWS.value -> R.drawable.mostly_cloudy_4
-                    else -> R.drawable.mostly_cloudy
+                    else -> if (context.isDarkTheme()) R.drawable.mostly_cloudy_5 else R.drawable.mostly_cloudy_5_light
                 }
             }
             "04d" -> {
@@ -77,7 +78,7 @@ object WeatherHelper {
                     Constants.WeatherIconPack.COOL.value -> R.drawable.cloudy_weather_3
                     Constants.WeatherIconPack.MINIMAL.value -> R.drawable.cloudy_weather_2
                     Constants.WeatherIconPack.GOOGLE_NEWS.value -> R.drawable.cloudy_weather_4
-                    else -> R.drawable.cloudy_weather
+                    else -> if (context.isDarkTheme()) R.drawable.cloudy_weather_5 else R.drawable.cloudy_weather_5_light
                 }
             }
             "09d" -> {
@@ -85,7 +86,7 @@ object WeatherHelper {
                     Constants.WeatherIconPack.COOL.value -> R.drawable.storm_weather_day_3
                     Constants.WeatherIconPack.MINIMAL.value -> R.drawable.storm_weather_day_2
                     Constants.WeatherIconPack.GOOGLE_NEWS.value -> R.drawable.storm_weather_day_4
-                    else -> R.drawable.storm_weather_day
+                    else -> if (context.isDarkTheme()) R.drawable.storm_weather_day_5 else R.drawable.storm_weather_day_5_light
                 }
             }
             "10d" -> {
@@ -93,7 +94,7 @@ object WeatherHelper {
                     Constants.WeatherIconPack.COOL.value -> R.drawable.rainy_day_3
                     Constants.WeatherIconPack.MINIMAL.value -> R.drawable.rainy_day_2
                     Constants.WeatherIconPack.GOOGLE_NEWS.value -> R.drawable.rainy_day_4
-                    else -> R.drawable.rainy_day
+                    else -> if (context.isDarkTheme()) R.drawable.rainy_day_5 else R.drawable.rainy_day_5_light
                 }
             }
             "11d" -> {
@@ -101,7 +102,7 @@ object WeatherHelper {
                     Constants.WeatherIconPack.COOL.value -> R.drawable.thunder_day_3
                     Constants.WeatherIconPack.MINIMAL.value -> R.drawable.thunder_day_2
                     Constants.WeatherIconPack.GOOGLE_NEWS.value -> R.drawable.thunder_day_4
-                    else -> R.drawable.thunder_day
+                    else -> if (context.isDarkTheme()) R.drawable.thunder_day_5 else R.drawable.thunder_day_5_light
                 }
             }
             "13d" -> {
@@ -109,7 +110,7 @@ object WeatherHelper {
                     Constants.WeatherIconPack.COOL.value -> R.drawable.snow_day_3
                     Constants.WeatherIconPack.MINIMAL.value -> R.drawable.snow_day_2
                     Constants.WeatherIconPack.GOOGLE_NEWS.value -> R.drawable.snow_day_4
-                    else -> R.drawable.snow_day
+                    else -> if (context.isDarkTheme()) R.drawable.snow_day_5 else R.drawable.snow_day_5_light
                 }
             }
             "50d" -> {
@@ -117,7 +118,7 @@ object WeatherHelper {
                     Constants.WeatherIconPack.COOL.value -> R.drawable.haze_day_3
                     Constants.WeatherIconPack.MINIMAL.value -> R.drawable.haze_day_2
                     Constants.WeatherIconPack.GOOGLE_NEWS.value -> R.drawable.haze_day_4
-                    else -> R.drawable.haze_day
+                    else -> if (context.isDarkTheme()) R.drawable.haze_day_5 else R.drawable.haze_day_5_light
                 }
             }
             "80d" -> {
@@ -125,7 +126,7 @@ object WeatherHelper {
                     Constants.WeatherIconPack.COOL.value -> R.drawable.windy_day_3
                     Constants.WeatherIconPack.MINIMAL.value -> R.drawable.windy_day_2
                     Constants.WeatherIconPack.GOOGLE_NEWS.value -> R.drawable.windy_day_4
-                    else -> R.drawable.windy_day
+                    else -> if (context.isDarkTheme()) R.drawable.windy_day_5 else R.drawable.windy_day_5_light
                 }
             }
             "81d" -> {
@@ -133,7 +134,7 @@ object WeatherHelper {
                     Constants.WeatherIconPack.COOL.value -> R.drawable.rain_snow_day_3
                     Constants.WeatherIconPack.MINIMAL.value -> R.drawable.rain_snow_day_2
                     Constants.WeatherIconPack.GOOGLE_NEWS.value -> R.drawable.rain_snow_day_4
-                    else -> R.drawable.rain_snow_day
+                    else -> if (context.isDarkTheme()) R.drawable.rain_snow_day_5 else R.drawable.rain_snow_day_5_light
                 }
             }
             "82d" -> {
@@ -141,7 +142,7 @@ object WeatherHelper {
                     Constants.WeatherIconPack.COOL.value -> R.drawable.haze_weather_3
                     Constants.WeatherIconPack.MINIMAL.value -> R.drawable.haze_weather_2
                     Constants.WeatherIconPack.GOOGLE_NEWS.value -> R.drawable.haze_weather_4
-                    else -> R.drawable.haze_weather
+                    else -> if (context.isDarkTheme()) R.drawable.haze_weather_5 else R.drawable.haze_weather_5_light
                 }
             }
 
@@ -152,7 +153,7 @@ object WeatherHelper {
                     Constants.WeatherIconPack.COOL.value -> R.drawable.clear_night_3
                     Constants.WeatherIconPack.MINIMAL.value -> R.drawable.clear_night_2
                     Constants.WeatherIconPack.GOOGLE_NEWS.value -> R.drawable.clear_night_4
-                    else -> R.drawable.clear_night
+                    else -> if (context.isDarkTheme()) R.drawable.clear_night_5 else R.drawable.clear_night_5_light
                 }
             }
             "02n" -> {
@@ -160,7 +161,7 @@ object WeatherHelper {
                     Constants.WeatherIconPack.COOL.value -> R.drawable.partly_cloudy_night_3
                     Constants.WeatherIconPack.MINIMAL.value -> R.drawable.partly_cloudy_night_2
                     Constants.WeatherIconPack.GOOGLE_NEWS.value -> R.drawable.partly_cloudy_night_4
-                    else -> R.drawable.partly_cloudy_night
+                    else -> if (context.isDarkTheme()) R.drawable.partly_cloudy_night_5 else R.drawable.partly_cloudy_night_5_light
                 }
             }
             "03n" -> {
@@ -168,7 +169,7 @@ object WeatherHelper {
                     Constants.WeatherIconPack.COOL.value -> R.drawable.mostly_cloudy_night_3
                     Constants.WeatherIconPack.MINIMAL.value -> R.drawable.mostly_cloudy_night_2
                     Constants.WeatherIconPack.GOOGLE_NEWS.value -> R.drawable.mostly_cloudy_night_4
-                    else -> R.drawable.mostly_cloudy_night
+                    else -> if (context.isDarkTheme()) R.drawable.mostly_cloudy_night_5 else R.drawable.mostly_cloudy_night_5_light
                 }
             }
             "04n" -> {
@@ -176,7 +177,7 @@ object WeatherHelper {
                     Constants.WeatherIconPack.COOL.value -> R.drawable.cloudy_weather_3
                     Constants.WeatherIconPack.MINIMAL.value -> R.drawable.cloudy_weather_2
                     Constants.WeatherIconPack.GOOGLE_NEWS.value -> R.drawable.cloudy_weather_4
-                    else -> R.drawable.cloudy_weather
+                    else -> if (context.isDarkTheme()) R.drawable.cloudy_weather_5 else R.drawable.cloudy_weather_5_light
                 }
             }
             "09n" -> {
@@ -184,7 +185,7 @@ object WeatherHelper {
                     Constants.WeatherIconPack.COOL.value -> R.drawable.storm_weather_night_3
                     Constants.WeatherIconPack.MINIMAL.value -> R.drawable.storm_weather_night_2
                     Constants.WeatherIconPack.GOOGLE_NEWS.value -> R.drawable.storm_weather_night_4
-                    else -> R.drawable.storm_weather_night
+                    else -> if (context.isDarkTheme()) R.drawable.storm_weather_night_5 else R.drawable.storm_weather_night_5_light
                 }
             }
             "10n" -> {
@@ -192,7 +193,7 @@ object WeatherHelper {
                     Constants.WeatherIconPack.COOL.value -> R.drawable.rainy_night_3
                     Constants.WeatherIconPack.MINIMAL.value -> R.drawable.rainy_night_2
                     Constants.WeatherIconPack.GOOGLE_NEWS.value -> R.drawable.rainy_night_4
-                    else -> R.drawable.rainy_night
+                    else -> if (context.isDarkTheme()) R.drawable.rainy_night_5 else R.drawable.rainy_night_5_light
                 }
             }
             "11n" -> {
@@ -200,7 +201,7 @@ object WeatherHelper {
                     Constants.WeatherIconPack.COOL.value -> R.drawable.thunder_night_3
                     Constants.WeatherIconPack.MINIMAL.value -> R.drawable.thunder_night_2
                     Constants.WeatherIconPack.GOOGLE_NEWS.value -> R.drawable.thunder_night_4
-                    else -> R.drawable.thunder_night
+                    else -> if (context.isDarkTheme()) R.drawable.thunder_night_5 else R.drawable.thunder_night_5_light
                 }
             }
             "13n" -> {
@@ -208,7 +209,7 @@ object WeatherHelper {
                     Constants.WeatherIconPack.COOL.value -> R.drawable.snow_night_3
                     Constants.WeatherIconPack.MINIMAL.value -> R.drawable.snow_night_2
                     Constants.WeatherIconPack.GOOGLE_NEWS.value -> R.drawable.snow_night_4
-                    else -> R.drawable.snow_night
+                    else -> if (context.isDarkTheme()) R.drawable.snow_night_5 else R.drawable.snow_night_5_light
                 }
             }
             "50n" -> {
@@ -216,7 +217,7 @@ object WeatherHelper {
                     Constants.WeatherIconPack.COOL.value -> R.drawable.haze_night_3
                     Constants.WeatherIconPack.MINIMAL.value -> R.drawable.haze_night_2
                     Constants.WeatherIconPack.GOOGLE_NEWS.value -> R.drawable.haze_night_4
-                    else -> R.drawable.haze_night
+                    else -> if (context.isDarkTheme()) R.drawable.haze_night_5 else R.drawable.haze_night_5_light
                 }
             }
             "80n" -> {
@@ -224,7 +225,7 @@ object WeatherHelper {
                     Constants.WeatherIconPack.COOL.value -> R.drawable.windy_night_3
                     Constants.WeatherIconPack.MINIMAL.value -> R.drawable.windy_night_2
                     Constants.WeatherIconPack.GOOGLE_NEWS.value -> R.drawable.windy_night_4
-                    else -> R.drawable.windy_night
+                    else -> if (context.isDarkTheme()) R.drawable.windy_night_5 else R.drawable.windy_night_5_light
                 }
             }
             "81n" -> {
@@ -232,7 +233,7 @@ object WeatherHelper {
                     Constants.WeatherIconPack.COOL.value -> R.drawable.rain_snow_night_3
                     Constants.WeatherIconPack.MINIMAL.value -> R.drawable.rain_snow_night_2
                     Constants.WeatherIconPack.GOOGLE_NEWS.value -> R.drawable.rain_snow_night_4
-                    else -> R.drawable.rain_snow_night
+                    else -> if (context.isDarkTheme()) R.drawable.rain_snow_night_5 else R.drawable.rain_snow_night_5_light
                 }
             }
             "82n" -> {
@@ -240,11 +241,11 @@ object WeatherHelper {
                     Constants.WeatherIconPack.COOL.value -> R.drawable.haze_weather_3
                     Constants.WeatherIconPack.MINIMAL.value -> R.drawable.haze_weather_2
                     Constants.WeatherIconPack.GOOGLE_NEWS.value -> R.drawable.haze_weather_4
-                    else -> R.drawable.haze_weather
+                    else -> if (context.isDarkTheme()) R.drawable.haze_weather_5 else R.drawable.haze_weather_5_light
                 }
             }
             else -> {
-                return R.drawable.unknown
+                return if (context.isDarkTheme()) R.drawable.unknown_dark else R.drawable.unknown_light
             }
         }
     }

app/src/main/java/com/tommasoberlose/anotherwidget/ui/widgets/MainWidget.kt

@@ -771,9 +771,9 @@ class MainWidget : AppWidgetProvider() {
                     v.empty_weather_icon.visibility = View.GONE
                     v.special_weather_icon.visibility = View.GONE
                 } else {
-                    v.weather_icon.setImageResource(WeatherHelper.getWeatherIconResource(icon))
-                    v.empty_weather_icon.setImageResource(WeatherHelper.getWeatherIconResource(icon))
-                    v.special_weather_icon.setImageResource(WeatherHelper.getWeatherIconResource(icon))
+                    v.weather_icon.setImageResource(WeatherHelper.getWeatherIconResource(context, icon))
+                    v.empty_weather_icon.setImageResource(WeatherHelper.getWeatherIconResource(context, icon))
+                    v.special_weather_icon.setImageResource(WeatherHelper.getWeatherIconResource(context, icon))
                     v.weather_icon.visibility = View.VISIBLE
                     v.empty_weather_icon.visibility = View.VISIBLE
                     v.special_weather_icon.visibility = View.VISIBLE