Merge branch 'feat-weather' of https://github.com/jpirnay/crosspoint-reader into mybuild

src/components/icons/weather24.h

@@ -0,0 +1,10 @@
+#pragma once
+#include <cstdint>
+// 24x24 weather icon generated from assets/weather-icons/svg/wi-day-sunny.svg
+static const uint8_t Weather24Icon[] = {
+    0xFF, 0xE7, 0xFF, 0xFF, 0xE7, 0xFF, 0xFF, 0xE7, 0xFF, 0xFF, 0xE7, 0xFF, 0xE3, 0xFF, 0xC7, 0xF1, 0xFF, 0x8F,
+    0xF9, 0xE7, 0x9F, 0xFF, 0x01, 0xFF, 0xFE, 0x3C, 0x7F, 0xFE, 0x7E, 0x7F, 0xFC, 0xFF, 0x3F, 0x0C, 0xFF, 0x30,
+    0x0C, 0xFF, 0x30, 0xFC, 0xFF, 0x3F, 0xFE, 0x7E, 0x7F, 0xFE, 0x3C, 0x7F, 0xFF, 0x00, 0xFF, 0xFB, 0xC3, 0xDF,
+    0xF1, 0xFF, 0x8F, 0xE3, 0xFF, 0xC7, 0xF7, 0xE7, 0xEF, 0xFF, 0xE7, 0xFF, 0xFF, 0xE7, 0xFF, 0xFF, 0xE7, 0xFF,
+};
+/* bytes: 72 */

src/components/icons/weather32.h

@@ -0,0 +1,14 @@
+#pragma once
+#include <cstdint>
+
+// size: 32x32
+// Generated from assets/weather-icons/svg/wi-day-sunny.svg
+static const uint8_t Weather32Icon[] = {
+    0xFF, 0xFE, 0x7F, 0xFF, 0xFF, 0xFE, 0x7F, 0xFF, 0xFF, 0xFE, 0x7F, 0xFF, 0xFF, 0xFE, 0x7F, 0xFF, 0xFB, 0xFE, 0x7F,
+    0xDF, 0xF1, 0xFF, 0xFF, 0x9F, 0xF8, 0xFF, 0xFF, 0x1F, 0xFC, 0x7F, 0xFE, 0x3F, 0xFE, 0x7C, 0x3E, 0x7F, 0xFF, 0xF0,
+    0x0F, 0xFF, 0xFF, 0xC0, 0x07, 0xFF, 0xFF, 0xC7, 0xE3, 0xFF, 0xFF, 0x8F, 0xF1, 0xFF, 0xFF, 0x9F, 0xF9, 0xFF, 0xFF,
+    0x1F, 0xF8, 0xFF, 0x03, 0x1F, 0xF8, 0xC0, 0x03, 0x1F, 0xF8, 0xC0, 0xFF, 0x1F, 0xF8, 0xFF, 0xFF, 0x9F, 0xF9, 0xFF,
+    0xFF, 0x8F, 0xF1, 0xFF, 0xFF, 0xC7, 0xE3, 0xFF, 0xFF, 0xE0, 0x07, 0xFF, 0xFF, 0xF0, 0x0F, 0xFF, 0xFE, 0x7C, 0x3E,
+    0x7F, 0xFC, 0x7F, 0xFE, 0x3F, 0xF8, 0xFF, 0xFF, 0x1F, 0xF9, 0xFF, 0xFF, 0x9F, 0xFB, 0xFE, 0x7F, 0xDF, 0xFF, 0xFE,
+    0x7F, 0xFF, 0xFF, 0xFE, 0x7F, 0xFF, 0xFF, 0xFE, 0x7F, 0xFF, 0xFF, 0xFE, 0x7F, 0xFF,
+};

src/components/themes/BaseTheme.h

@@ -64,7 +64,7 @@ struct ThemeMetrics {
   bool keyboardCenteredText;
 };
 
-enum UIIcon { Folder, Text, Image, Book, File, Recent, Settings, Transfer, Library, Wifi, Hotspot };
+enum UIIcon { Folder, Text, Image, Book, File, Recent, Settings, Transfer, Library, Wifi, Hotspot, Weather };
 
 // Default theme implementation (Classic Theme)
 // Additional themes can inherit from this and override methods as needed

src/components/themes/lyra/LyraTheme.cpp

@@ -26,6 +26,8 @@
 #include "components/icons/settings2.h"
 #include "components/icons/text24.h"
 #include "components/icons/transfer.h"
+#include "components/icons/weather24.h"
+#include "components/icons/weather32.h"
 #include "components/icons/wifi.h"
 #include "fontIds.h"
 
@@ -80,6 +82,8 @@ const uint8_t* iconForName(UIIcon icon, int size) {
         return Book24Icon;
       case UIIcon::File:
         return File24Icon;
+      case UIIcon::Weather:
+        return Weather24Icon;
       default:
         return nullptr;
     }
@@ -101,6 +105,8 @@ const uint8_t* iconForName(UIIcon icon, int size) {
         return WifiIcon;
       case UIIcon::Hotspot:
         return HotspotIcon;
+      case UIIcon::Weather:
+        return Weather32Icon;
       default:
         return nullptr;
     }
@@ -535,10 +541,16 @@ void LyraTheme::drawButtonMenu(GfxRenderer& renderer, Rect rect, int buttonCount
 
     if (rowIcon != nullptr) {
       UIIcon icon = rowIcon(i);
-      const uint8_t* iconBitmap = iconForName(icon, mainMenuIconSize);
+      int iconSize = mainMenuIconSize;
+      const uint8_t* iconBitmap = iconForName(icon, iconSize);
+      if (iconBitmap == nullptr) {
+        // Some icons only have 24px variants; fall back so they still render.
+        iconSize = listIconSize;
+        iconBitmap = iconForName(icon, iconSize);
+      }
       if (iconBitmap != nullptr) {
-        renderer.drawIcon(iconBitmap, textX, textY + 3, mainMenuIconSize, mainMenuIconSize);
-        textX += mainMenuIconSize + hPaddingInSelection + 2;
+        renderer.drawIcon(iconBitmap, textX, textY + 3, iconSize, iconSize);
+        textX += iconSize + hPaddingInSelection + 2;
       }
     }