Updated icons; Fixed weather mapping

smirko-dev · Dec 3, 2021 · 142a3d7 · 142a3d7
1 parent ef8dbd0
commit 142a3d7
Show file tree

Hide file tree

Showing 27 changed files with 77 additions and 66 deletions.
diff --git a/companion/index.js b/companion/index.js
@@ -125,11 +125,12 @@ function findWeatherConditionIcon(condition) {
     case WeatherCondition.MostlyClearNight:
       return 'weather-night.png';
     case WeatherCondition.Cloudy:
+    case WeatherCondition.Overcast:
       return 'weather-cloudy.png';
     case WeatherCondition.Cold:
       return 'weather-snowflake-alert.png';
     case WeatherCondition.Flurries:
-      return '';
+      return 'weather-snowy.png';
     case WeatherCondition.Fog:
       return 'weather-fog.png';
     case WeatherCondition.FreezingRain:
@@ -140,40 +141,50 @@ function findWeatherConditionIcon(condition) {
     case WeatherCondition.Hot:
       return 'weather-sunny-alert.png';
     case WeatherCondition.Ice:
-      return 'weather-snowflake.png';
+      return 'weather-snowflake-alert.png';
     case WeatherCondition.IntermittentCloudsDay:
     case WeatherCondition.MostlyCloudyDay:
       return 'weather-partly-cloudy.png';
     case WeatherCondition.IntermittentCloudsNight:
     case WeatherCondition.MostlyCloudyNight:
       return 'weather-night-partly-cloudy.png';
-    case WeatherCondition.MostlyCloudyWithFlurriesDay:
-    case WeatherCondition.MostlyCloudyWithFlurriesNight:
     case WeatherCondition.MostlyCloudyWithShowersDay:
     case WeatherCondition.MostlyCloudyWithShowersNight:
+    case WeatherCondition.PartlyCloudyWithShowersNight:
+    case WeatherCondition.PartlySunnyWithShowersDay:
+      return 'weather-partly-rainy.png.png';
+    case WeatherCondition.PartlySunnyWithFlurriesDay:
+    case WeatherCondition.MostlyCloudyWithFlurriesDay:
+    case WeatherCondition.MostlyCloudyWithFlurriesNight:
     case WeatherCondition.MostlyCloudyWithSnowDay:
     case WeatherCondition.MostlyCloudyWithSnowNight:
+      return 'weather-partly-snowy.png';
     case WeatherCondition.MostlyCloudyWithThunderstormsDay:
     case WeatherCondition.MostlyCloudyWithThunderstormsNight:
-    case WeatherCondition.MostlySunnyDay:
-    case WeatherCondition.Overcast:
-    case WeatherCondition.PartlyCloudyNight:
-    case WeatherCondition.PartlyCloudyWithShowersNight:
     case WeatherCondition.PartlyCloudyWithThunderstormsNight:
-    case WeatherCondition.PartlySunnyDay:
-    case WeatherCondition.PartlySunnyWithFlurriesDay:
-    case WeatherCondition.PartlySunnyWithShowersDay:
     case WeatherCondition.PartlySunnyWithThunderstormsDay:
+    case WeatherCondition.Thunderstorms:
+      return 'weather-lightning.png';
+    case WeatherCondition.MostlySunnyDay:
+    case WeatherCondition.PartlySunnyDay:
+      return 'weather-partly-cloudy.png';
     case WeatherCondition.Rain:
+      return 'weather-rainy.png';
     case WeatherCondition.RainAndSnow:
-    case WeatherCondition.Showers:
     case WeatherCondition.Sleet:
+      return 'weather-snowy-rainy.png';
+    case WeatherCondition.Showers:
+      return 'weather-pouring.png';
     case WeatherCondition.Snow:
+      return 'weather-snowflake.png';
     case WeatherCondition.SunnyDay:
-    case WeatherCondition.Thunderstorms:
+      return 'weather-sunny.png';
     case WeatherCondition.Windy:
+      return 'weather-windy.png';
+    case WeatherCondition.PartlyCloudyNight:
+      return 'weather-night-partly-cloudy.png';
+    default:
       console.log(`UNUSED WEATHER ICON: ${condition}`);
-      break;
+      return 'thermometer.png';
   }
-  return 'thermometer.png';
 }
diff --git a/resources/thermometer.png b/resources/thermometer.png
diff --git a/resources/weather-cloudy.png b/resources/weather-cloudy.png
diff --git a/resources/weather-fog.png b/resources/weather-fog.png
diff --git a/resources/weather-hail.png b/resources/weather-hail.png
diff --git a/resources/weather-hazy.png b/resources/weather-hazy.png
diff --git a/resources/weather-lightning-rainy.png b/resources/weather-lightning-rainy.png
diff --git a/resources/weather-lightning.png b/resources/weather-lightning.png
diff --git a/resources/weather-night-partly-cloudy.png b/resources/weather-night-partly-cloudy.png
diff --git a/resources/weather-night.png b/resources/weather-night.png
diff --git a/resources/weather-partly-cloudy.png b/resources/weather-partly-cloudy.png
diff --git a/resources/weather-partly-lightning.png b/resources/weather-partly-lightning.png
diff --git a/resources/weather-partly-rainy.png b/resources/weather-partly-rainy.png
diff --git a/resources/weather-partly-snowy-rainy.png b/resources/weather-partly-snowy-rainy.png
diff --git a/resources/weather-partly-snowy.png b/resources/weather-partly-snowy.png
diff --git a/resources/weather-pouring.png b/resources/weather-pouring.png
diff --git a/resources/weather-rainy.png b/resources/weather-rainy.png
diff --git a/resources/weather-snowflake-alert.png b/resources/weather-snowflake-alert.png
diff --git a/resources/weather-snowflake.png b/resources/weather-snowflake.png
diff --git a/resources/weather-snowy-heavy.png b/resources/weather-snowy-heavy.png
diff --git a/resources/weather-snowy-rainy.png b/resources/weather-snowy-rainy.png
diff --git a/resources/weather-snowy.png b/resources/weather-snowy.png
diff --git a/resources/weather-storm.png b/resources/weather-storm.png
diff --git a/resources/weather-sunny-alert.png b/resources/weather-sunny-alert.png
diff --git a/resources/weather-sunny.png b/resources/weather-sunny.png
diff --git a/resources/weather-windy.png b/resources/weather-windy.png
diff --git a/settings/index.jsx b/settings/index.jsx
@@ -12,7 +12,7 @@ function settingsFunc(props) {
                     { name: `${gettext("steps")}`, value: 'steps' },
                     { name: `${gettext("dist")}`, value: 'distance' },
                     { name: `${gettext("floors")}`, value: 'floors' },
-                    { name: `${gettext("calories")}`, value: 'calories' },
+                    { name: `${gettext("cal")}`, value: 'calories' },
                     { name: `${gettext("weather")}`, value: 'weather' }
                 ]}
                 onSelection={(value) => console.log(value)}