From 958626f576f124b8c094887a840b010dcd25eaae Mon Sep 17 00:00:00 2001
From: Thomas Farstrike <thomasverstreken@protonmail.com>
Date: Mon, 28 Apr 2025 15:15:25 +0200
Subject: [PATCH] Improve icon handling

---
 .../res/mipmap-mdpi/icon_64x64.bin            | Bin 8204 -> 12300 bytes
 .../com.example.launcher/assets/launcher.py   |  43 ++++++++++--------
 internal_filesystem/main.py                   |   5 +-
 pngtobin.sh                                   |   3 +-
 4 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/internal_filesystem/apps/com.example.imutest/res/mipmap-mdpi/icon_64x64.bin b/internal_filesystem/apps/com.example.imutest/res/mipmap-mdpi/icon_64x64.bin
index ddf9eb8d5157acfa9c1384c3fcada235ba9cbe32..1b4560712a1b3c3fbb59c9249eacdbdb847940db 100644
GIT binary patch
literal 12300
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

literal 8204
zcmb0XVqkD!aA0U)U|{&1J_<)eU^E0qLtr!naD_m=pO(pUr4H?LuA2v-v|Me&00*g3
z{(iVzNgHuKKe**k#tQ9^VYIOeo2k!~pw^;Lr)`Sjv8krE*yeN;Ymqq3oa<aK(>ygy
zibt{%gLzD90*zw=zx^Nwaq1Y-FeV7w&%m&dLC1D7jod(t{h&}_5#slwMQXrjzY^y`
zkkxSPu6%*&sR6hBoI0D+C&lyFD!}arF|tg8s2UTv?LX%V$?F@!o(O_$hG8YnTq>5*
zgzf*FZWP}p1+yJOQ?HaJ#(t0sP{RP^3hI>7#M%Ejy&w!^Cn{E8puChO*8b1wS|+Hr
zLwJih&rwuL6L0@VEFl1K!!srFOKCjz`-0N{<@9&Hlb|{7r8dMqY$TTnd8ITV`;Fom
z7}}(az%KB|Xel7O<RHU2u!}*iCLZIq{~g#gko^n{sZyX)CkSs{335vT$>k$)_A@Z3
zD{oFGY`?oQ@ji#BB-VZghGkOdr4Y!+=$O>@EAjTD+k~A@YCTO|`=2R6LX~)uy7udn
z+;*p?{W{PZlX%~MPDiyrnN!DhLzrQ_V7$MdU^vJeNdChf*T|yewoQ=je<Fxkh7n^w
zix3~#Z8K#1vGu$R36wdMwoMWCFBZhszTAMb)&Ye+<!y6>{l}z0@r{nxxq|G$hN;sx
zLD=uWfUU>pu8hrY>h;YK_A@Z7wn6v(1gxP?d8-Fu53>CX48ABiI4Is#2;KM8Y4zc<
zpMinX<YE{o9Zrtt_hUh`oqDZa-1dX~`;cL=AZo9Jfq{vUnyr5P_JiDjimBb}A;o@m
z<qagaY7piVVxgu#R9`bNJP~~73rY=yOd($$_xQ^~1|FLA`jOq+iq^M-gaPFxE3zH<
z*q9~kF)7m9vG{DjFLybeQwQQ_5J|m~6~C>>vX|4(`LZiJFt`fw*kY>#kkyW|M?+vV
N1V%$(Gz5qZ0RW(c;P3zd

diff --git a/internal_filesystem/apps/com.example.launcher/assets/launcher.py b/internal_filesystem/apps/com.example.launcher/assets/launcher.py
index f919f9de..db372140 100644
--- a/internal_filesystem/apps/com.example.launcher/assets/launcher.py
+++ b/internal_filesystem/apps/com.example.launcher/assets/launcher.py
@@ -29,6 +29,23 @@ iconcont_height = icon_size + label_height
 import time
 start = time.ticks_ms()
 
+def load_icon(icon_path):
+    with open(icon_path, 'rb') as f:
+        f.seek(12) # first 12 bytes are headers
+        image_data = f.read()
+        image_dsc = lv.image_dsc_t({
+            "header": {
+                "magic": lv.IMAGE_HEADER_MAGIC,
+                "w": 64,
+                "h": 64,
+                "stride": 64 * 2,
+                "cf": lv.COLOR_FORMAT.RGB565A8
+                },
+            'data_size': len(image_data),
+            'data': image_data
+        })
+    return image_dsc
+
 # Get list of app directories
 # Should we skip 'Launcher' apps from the list here?
 apps_dir = "/apps"
@@ -43,27 +60,17 @@ for app_dir in [d for d in uos.listdir(apps_dir) if uos.stat(f"{apps_dir}/{d}")[
     app_cont.set_style_pad_all(0, 0)
     # Load and display icon
     icon_path = f"{app_dir_fullpath}/res/mipmap-mdpi/icon_64x64.bin"
-    #icon_path = "/resources/default_icon_64x64.bin"
     image = lv.image(app_cont)
     try:
-        with open(icon_path, 'rb') as f:
-            f.seek(12) # first 12 bytes are headers
-            image_data = f.read()
-            image_dsc = lv.image_dsc_t({
-                "header": {
-                    "magic": lv.IMAGE_HEADER_MAGIC,
-                    "w": 64,
-                    "h": 64,
-                    "stride": 64 * 2,
-                    "cf": lv.COLOR_FORMAT.RGB565A8
-                 },
-                'data_size': len(image_data),
-                'data': image_data
-            })
-            image.set_src(image_dsc)
+        image.set_src(load_icon(icon_path))
     except Exception as e:
-        print(f"Error loading icon {icon_path}: {e}")
-        image.set_src(lv.SYMBOL.STOP)  # square block
+        print(f"Error loading icon {icon_path}: {e} - loading default icon")
+        icon_path = "/resources/default_icon_64x64.bin"
+        try:
+            image.set_src(load_icon(icon_path))
+        except Exception as e:
+            print(f"Error loading default icon {icon_path}: {e} - using symbol")
+            image.set_src(lv.SYMBOL.STOP)  # square block
     image.align(lv.ALIGN.TOP_MID, 0, 0)
     image.set_size(icon_size, icon_size)
     # Create label
diff --git a/internal_filesystem/main.py b/internal_filesystem/main.py
index fcdb9111..b956e30f 100644
--- a/internal_filesystem/main.py
+++ b/internal_filesystem/main.py
@@ -349,11 +349,8 @@ def start_app(app_dir, is_launcher=False):
     start_script_fullpath = f"{app_dir}/{start_script}"
     execute_script_new_thread(start_script_fullpath, True, is_launcher, True)
 
-def run_launcher():
-    start_app("/apps/com.example.launcher", True)
-
 execute_script_new_thread("/autorun.py", True, False, False)
-run_launcher()
+start_app("/apps/com.example.launcher", True)
 
 # If we got this far without crashing, then no need to rollback the update
 import ota.rollback
diff --git a/pngtobin.sh b/pngtobin.sh
index fe588746..7a361848 100755
--- a/pngtobin.sh
+++ b/pngtobin.sh
@@ -1,2 +1,3 @@
 #~/sources/lvgl_micropython/lib/lvgl/scripts/LVGLImage.py --ofmt BIN --cf RGB565 -o icon_64x64.bin icon_64x64.png 
-~/sources/lvgl_micropython/lib/lvgl/scripts/LVGLImage.py --ofmt BIN --cf RGB565 icon_64x64.png 
+#~/sources/lvgl_micropython/lib/lvgl/scripts/LVGLImage.py --ofmt BIN --cf RGB565 icon_64x64.png 
+~/sources/lvgl_micropython/lib/lvgl/scripts/LVGLImage.py --ofmt BIN --cf RGB565A8 "$1"