From d60a935338a2c8a4e24e2ea82c303f927e2a0815 Mon Sep 17 00:00:00 2001
From: HeCodes2Much <wayne6324@gmail.com>
Date: Sat, 13 Jul 2024 13:56:15 +0100
Subject: [PATCH] Fix: Fixed weather icons to show correctly.

Signed-off-by: HeCodes2Much <wayne6324@gmail.com>
---
 .../launcher/ui/widgets/WidgetFragment.kt     |  45 ++++++----
 app/src/main/res/font/weather.ttf             | Bin
 app/src/main/res/values/weathericons.xml      |  81 ++++++++++++++++--
 3 files changed, 103 insertions(+), 23 deletions(-)
 mode change 100644 => 100755 app/src/main/res/font/weather.ttf

diff --git a/app/src/main/java/com/github/droidworksstudio/launcher/ui/widgets/WidgetFragment.kt b/app/src/main/java/com/github/droidworksstudio/launcher/ui/widgets/WidgetFragment.kt
index 6cf74e5..b290027 100644
--- a/app/src/main/java/com/github/droidworksstudio/launcher/ui/widgets/WidgetFragment.kt
+++ b/app/src/main/java/com/github/droidworksstudio/launcher/ui/widgets/WidgetFragment.kt
@@ -231,7 +231,7 @@ class WidgetFragment : Fragment(),
         paint.typeface = weatherFont
         paint.style = Paint.Style.FILL
         paint.color = ContextCompat.getColor(context, R.color.white)
-        paint.textSize = 200f
+        paint.textSize = 170f
         paint.textAlign = Paint.Align.CENTER
         canvas.drawText(text, 128f, 200f, paint)
         return bitmap
@@ -257,26 +257,41 @@ class WidgetFragment : Fragment(),
         val icon: String
         val idDivided = id / 100
         val hourOfDay = Calendar.getInstance().get(Calendar.HOUR_OF_DAY)
-        if (idDivided * 100 == 800) {
-            icon = if (hourOfDay in 7..19) {
-                context.getString(R.string.weather_sunny)
-            } else {
-                context.getString(R.string.weather_clear_night)
+        val isDayTime = hourOfDay in 7..19
+
+        icon = when {
+            id == 800 -> if (isDayTime) context.getString(R.string.wi_day_sunny) else context.getString(R.string.wi_night_clear)
+            idDivided == 2 -> if (isDayTime) context.getString(R.string.wi_day_thunderstorm) else context.getString(R.string.wi_night_alt_thunderstorm)
+            idDivided == 3 -> if (isDayTime) context.getString(R.string.wi_day_sprinkle) else context.getString(R.string.wi_night_alt_sprinkle)
+            idDivided == 5 -> when (id) {
+                500 -> if (isDayTime) context.getString(R.string.wi_day_showers) else context.getString(R.string.wi_night_showers)
+                501 -> if (isDayTime) context.getString(R.string.wi_day_rain) else context.getString(R.string.wi_night_rain)
+                502 -> if (isDayTime) context.getString(R.string.wi_day_rain_wind) else context.getString(R.string.wi_night_rain_wind)
+                503 -> if (isDayTime) context.getString(R.string.wi_day_rain_mix) else context.getString(R.string.wi_night_rain_mix)
+                504 -> if (isDayTime) context.getString(R.string.wi_day_rain) else context.getString(R.string.wi_night_rain)
+                511 -> if (isDayTime) context.getString(R.string.wi_day_sleet) else context.getString(R.string.wi_night_sleet)
+                520 -> if (isDayTime) context.getString(R.string.wi_day_showers) else context.getString(R.string.wi_night_showers)
+                521 -> if (isDayTime) context.getString(R.string.wi_day_showers) else context.getString(R.string.wi_night_showers)
+                522 -> if (isDayTime) context.getString(R.string.wi_day_storm_showers) else context.getString(R.string.wi_night_storm_showers)
+                else -> if (isDayTime) context.getString(R.string.wi_day_rain) else context.getString(R.string.wi_night_rain)
             }
-        } else {
-            icon = when (idDivided) {
-                2 -> context.getString(R.string.weather_thunder)
-                3 -> context.getString(R.string.weather_drizzle)
-                7 -> context.getString(R.string.weather_foggy)
-                8 -> context.getString(R.string.weather_cloudy)
-                6 -> context.getString(R.string.weather_snowy)
-                5 -> context.getString(R.string.weather_rainy)
-                else -> ""
+
+            idDivided == 6 -> if (isDayTime) context.getString(R.string.wi_day_snow) else context.getString(R.string.wi_night_alt_snow)
+            idDivided == 7 -> if (isDayTime) context.getString(R.string.wi_day_fog) else context.getString(R.string.wi_night_fog)
+            idDivided == 8 -> when (id) {
+                801 -> if (isDayTime) context.getString(R.string.wi_day_cloudy) else context.getString(R.string.wi_night_cloudy)
+                802 -> if (isDayTime) context.getString(R.string.wi_day_cloudy_gusts) else context.getString(R.string.wi_night_alt_cloudy_gusts)
+                803 -> if (isDayTime) context.getString(R.string.wi_day_cloudy_windy) else context.getString(R.string.wi_night_alt_cloudy_windy)
+                804 -> if (isDayTime) context.getString(R.string.wi_day_cloudy) else context.getString(R.string.wi_night_cloudy)
+                else -> if (isDayTime) context.getString(R.string.wi_day_cloudy) else context.getString(R.string.wi_night_cloudy)
             }
+
+            else -> context.getString(R.string.wi_na)
         }
         return icon
     }
 
+
     private fun convertTimestampToReadableDate(timestamp: Long): String {
         // Multiply by 1000 to convert seconds to milliseconds if the timestamp is in seconds
         val date = Date(timestamp * 1000)
diff --git a/app/src/main/res/font/weather.ttf b/app/src/main/res/font/weather.ttf
old mode 100644
new mode 100755
diff --git a/app/src/main/res/values/weathericons.xml b/app/src/main/res/values/weathericons.xml
index 84e5e8a..08788ce 100644
--- a/app/src/main/res/values/weathericons.xml
+++ b/app/src/main/res/values/weathericons.xml
@@ -8,12 +8,77 @@
     <string name="sunrise_icon" translatable="false">&#xf051;</string>
     <string name="sunset_icon" translatable="false">&#xf052;</string>
 
-    <string name="weather_sunny" translatable="false">&#xf00d;</string>
-    <string name="weather_clear_night" translatable="false">&#xf02e;</string>
-    <string name="weather_foggy" translatable="false">&#xf014;</string>
-    <string name="weather_cloudy" translatable="false">&#xf013;</string>
-    <string name="weather_rainy" translatable="false">&#xf019;</string>
-    <string name="weather_snowy" translatable="false">&#xf01b;</string>
-    <string name="weather_thunder" translatable="false">&#xf01e;</string>
-    <string name="weather_drizzle" translatable="false">&#xf01a;</string>
+    <!-- Daytime Icons -->
+    <string name="wi_day_sunny" translatable="false">&#xf00d;</string>
+    <string name="wi_day_cloudy" translatable="false">&#xf002;</string>
+    <string name="wi_day_cloudy_gusts" translatable="false">&#xf000;</string>
+    <string name="wi_day_cloudy_windy" translatable="false">&#xf001;</string>
+    <string name="wi_day_fog" translatable="false">&#xf003;</string>
+    <string name="wi_day_hail" translatable="false">&#xf004;</string>
+    <string name="wi_day_haze" translatable="false">&#xf0b6;</string>
+    <string name="wi_day_lightning" translatable="false">&#xf005;</string>
+    <string name="wi_day_rain" translatable="false">&#xf008;</string>
+    <string name="wi_day_rain_mix" translatable="false">&#xf006;</string>
+    <string name="wi_day_rain_wind" translatable="false">&#xf007;</string>
+    <string name="wi_day_showers" translatable="false">&#xf009;</string>
+    <string name="wi_day_sleet" translatable="false">&#xf0b2;</string>
+    <string name="wi_day_sleet_storm" translatable="false">&#xf068;</string>
+    <string name="wi_day_snow" translatable="false">&#xf00a;</string>
+    <string name="wi_day_snow_thunderstorm" translatable="false">&#xf06b;</string>
+    <string name="wi_day_snow_wind" translatable="false">&#xf065;</string>
+    <string name="wi_day_sprinkle" translatable="false">&#xf00b;</string>
+    <string name="wi_day_storm_showers" translatable="false">&#xf00e;</string>
+    <string name="wi_day_sunny_overcast" translatable="false">&#xf00c;</string>
+    <string name="wi_day_thunderstorm" translatable="false">&#xf010;</string>
+    <string name="wi_day_windy" translatable="false">&#xf085;</string>
+    <string name="wi_solar_eclipse" translatable="false">&#xf06e;</string>
+    <string name="wi_hot" translatable="false">&#xf072;</string>
+    <string name="wi_day_cloudy_high" translatable="false">&#xf07d;</string>
+    <string name="wi_day_light_wind" translatable="false">&#xf0c4;</string>
+
+    <!-- Nighttime Icons -->
+    <string name="wi_night_clear" translatable="false">&#xf02e;</string>
+    <string name="wi_night_alt_cloudy" translatable="false">&#xf086;</string>
+    <string name="wi_night_alt_cloudy_gusts" translatable="false">&#xf022;</string>
+    <string name="wi_night_alt_cloudy_windy" translatable="false">&#xf023;</string>
+    <string name="wi_night_alt_hail" translatable="false">&#xf024;</string>
+    <string name="wi_night_alt_lightning" translatable="false">&#xf025;</string>
+    <string name="wi_night_alt_rain" translatable="false">&#xf028;</string>
+    <string name="wi_night_alt_rain_mix" translatable="false">&#xf026;</string>
+    <string name="wi_night_alt_rain_wind" translatable="false">&#xf027;</string>
+    <string name="wi_night_alt_showers" translatable="false">&#xf029;</string>
+    <string name="wi_night_alt_sleet" translatable="false">&#xf0b4;</string>
+    <string name="wi_night_alt_sleet_storm" translatable="false">&#xf06a;</string>
+    <string name="wi_night_alt_snow" translatable="false">&#xf02a;</string>
+    <string name="wi_night_alt_snow_thunderstorm" translatable="false">&#xf06d;</string>
+    <string name="wi_night_alt_snow_wind" translatable="false">&#xf067;</string>
+    <string name="wi_night_alt_sprinkle" translatable="false">&#xf02b;</string>
+    <string name="wi_night_alt_storm_showers" translatable="false">&#xf02c;</string>
+    <string name="wi_night_alt_thunderstorm" translatable="false">&#xf02d;</string>
+    <string name="wi_night_cloudy" translatable="false">&#xf031;</string>
+    <string name="wi_night_cloudy_gusts" translatable="false">&#xf02f;</string>
+    <string name="wi_night_cloudy_windy" translatable="false">&#xf030;</string>
+    <string name="wi_night_fog" translatable="false">&#xf04a;</string>
+    <string name="wi_night_hail" translatable="false">&#xf032;</string>
+    <string name="wi_night_lightning" translatable="false">&#xf033;</string>
+    <string name="wi_night_partly_cloudy" translatable="false">&#xf083;</string>
+    <string name="wi_night_rain" translatable="false">&#xf036;</string>
+    <string name="wi_night_rain_mix" translatable="false">&#xf034;</string>
+    <string name="wi_night_rain_wind" translatable="false">&#xf035;</string>
+    <string name="wi_night_showers" translatable="false">&#xf037;</string>
+    <string name="wi_night_sleet" translatable="false">&#xf0b3;</string>
+    <string name="wi_night_sleet_storm" translatable="false">&#xf069;</string>
+    <string name="wi_night_snow" translatable="false">&#xf038;</string>
+    <string name="wi_night_snow_thunderstorm" translatable="false">&#xf06c;</string>
+    <string name="wi_night_snow_wind" translatable="false">&#xf066;</string>
+    <string name="wi_night_sprinkle" translatable="false">&#xf039;</string>
+    <string name="wi_night_storm_showers" translatable="false">&#xf03a;</string>
+    <string name="wi_night_thunderstorm" translatable="false">&#xf03b;</string>
+    <string name="wi_lunar_eclipse" translatable="false">&#xf070;</string>
+    <string name="wi_stars" translatable="false">&#xf077;</string>
+
+    <!-- Generic Icons -->
+    <string name="wi_storm_showers" translatable="false">&#xf01d;</string>
+    <string name="wi_thunderstorm" translatable="false">&#xf01e;</string>
+    <string name="wi_na" translatable="false">&#xf07b;</string>
 </resources>
\ No newline at end of file