From 0addb543f045434fe34eafcf4ad072d3ddac5bab Mon Sep 17 00:00:00 2001 From: Thomas Farstrike Date: Thu, 1 May 2025 18:38:06 +0200 Subject: [PATCH] appstore: show app version --- .../apps/com.example.app1/META-INF/MANIFEST.MF | 1 + .../apps/com.example.app2/META-INF/MANIFEST.MF | 1 + .../apps/com.example.camtest/META-INF/MANIFEST.MF | 1 + .../apps/com.example.cputest/META-INF/MANIFEST.MF | 1 + .../apps/com.example.imutest/META-INF/MANIFEST.MF | 1 + .../apps/com.example.lvgltest/META-INF/MANIFEST.MF | 1 + .../apps/com.example.memtest/META-INF/MANIFEST.MF | 1 + .../apps/com.example.wstest/META-INF/MANIFEST.MF | 1 + .../builtin/apps/com.example.appstore/META-INF/MANIFEST.MF | 1 + .../builtin/apps/com.example.appstore/assets/appstore.py | 7 ++++++- .../builtin/apps/com.example.launcher/META-INF/MANIFEST.MF | 1 + .../builtin/apps/com.example.osupdate/META-INF/MANIFEST.MF | 1 + .../builtin/apps/com.example.wificonf/META-INF/MANIFEST.MF | 1 + 13 files changed, 18 insertions(+), 1 deletion(-) diff --git a/internal_filesystem/apps/com.example.app1/META-INF/MANIFEST.MF b/internal_filesystem/apps/com.example.app1/META-INF/MANIFEST.MF index b120a48d..5f249cfc 100644 --- a/internal_filesystem/apps/com.example.app1/META-INF/MANIFEST.MF +++ b/internal_filesystem/apps/com.example.app1/META-INF/MANIFEST.MF @@ -1,3 +1,4 @@ Manifest-Version: 1.0 Name: App1 Start-Script: assets/app1.py +Version: 0.0.1 diff --git a/internal_filesystem/apps/com.example.app2/META-INF/MANIFEST.MF b/internal_filesystem/apps/com.example.app2/META-INF/MANIFEST.MF index 8f08e27e..783cae7b 100644 --- a/internal_filesystem/apps/com.example.app2/META-INF/MANIFEST.MF +++ b/internal_filesystem/apps/com.example.app2/META-INF/MANIFEST.MF @@ -1,3 +1,4 @@ Manifest-Version: 1.0 Name: App2 Start-Script: assets/app2.py +Version: 0.0.1 diff --git a/internal_filesystem/apps/com.example.camtest/META-INF/MANIFEST.MF b/internal_filesystem/apps/com.example.camtest/META-INF/MANIFEST.MF index 909ad55a..8bafa116 100644 --- a/internal_filesystem/apps/com.example.camtest/META-INF/MANIFEST.MF +++ b/internal_filesystem/apps/com.example.camtest/META-INF/MANIFEST.MF @@ -1,3 +1,4 @@ Manifest-Version: 1.0 Name: CamTest Start-Script: assets/camtest.py +Version: 0.0.1 diff --git a/internal_filesystem/apps/com.example.cputest/META-INF/MANIFEST.MF b/internal_filesystem/apps/com.example.cputest/META-INF/MANIFEST.MF index bf1e1f4e..eee429e9 100644 --- a/internal_filesystem/apps/com.example.cputest/META-INF/MANIFEST.MF +++ b/internal_filesystem/apps/com.example.cputest/META-INF/MANIFEST.MF @@ -1,3 +1,4 @@ Manifest-Version: 1.0 Name: CPUTest Start-Script: assets/cputest.py +Version: 0.0.1 diff --git a/internal_filesystem/apps/com.example.imutest/META-INF/MANIFEST.MF b/internal_filesystem/apps/com.example.imutest/META-INF/MANIFEST.MF index 22b19cd3..ad061307 100644 --- a/internal_filesystem/apps/com.example.imutest/META-INF/MANIFEST.MF +++ b/internal_filesystem/apps/com.example.imutest/META-INF/MANIFEST.MF @@ -1,3 +1,4 @@ Manifest-Version: 1.0 Name: IMUTest Start-Script: assets/imutest.py +Version: 0.0.1 diff --git a/internal_filesystem/apps/com.example.lvgltest/META-INF/MANIFEST.MF b/internal_filesystem/apps/com.example.lvgltest/META-INF/MANIFEST.MF index 414f3ed5..e5d72f50 100644 --- a/internal_filesystem/apps/com.example.lvgltest/META-INF/MANIFEST.MF +++ b/internal_filesystem/apps/com.example.lvgltest/META-INF/MANIFEST.MF @@ -1,3 +1,4 @@ Manifest-Version: 1.0 Name: LVGLTest Start-Script: assets/lvgltest.py +Version: 0.0.1 diff --git a/internal_filesystem/apps/com.example.memtest/META-INF/MANIFEST.MF b/internal_filesystem/apps/com.example.memtest/META-INF/MANIFEST.MF index cdb969be..d79f107e 100644 --- a/internal_filesystem/apps/com.example.memtest/META-INF/MANIFEST.MF +++ b/internal_filesystem/apps/com.example.memtest/META-INF/MANIFEST.MF @@ -1,3 +1,4 @@ Manifest-Version: 1.0 Name: MemTest Start-Script: assets/memtest.py +Version: 0.0.1 diff --git a/internal_filesystem/apps/com.example.wstest/META-INF/MANIFEST.MF b/internal_filesystem/apps/com.example.wstest/META-INF/MANIFEST.MF index 86e7443a..ef3ef48c 100644 --- a/internal_filesystem/apps/com.example.wstest/META-INF/MANIFEST.MF +++ b/internal_filesystem/apps/com.example.wstest/META-INF/MANIFEST.MF @@ -1,3 +1,4 @@ Manifest-Version: 1.0 Name: WSTest Start-Script: assets/bitcoin_price.py +Version: 0.0.1 diff --git a/internal_filesystem/builtin/apps/com.example.appstore/META-INF/MANIFEST.MF b/internal_filesystem/builtin/apps/com.example.appstore/META-INF/MANIFEST.MF index 2f0a306e..7f12b35a 100644 --- a/internal_filesystem/builtin/apps/com.example.appstore/META-INF/MANIFEST.MF +++ b/internal_filesystem/builtin/apps/com.example.appstore/META-INF/MANIFEST.MF @@ -1,3 +1,4 @@ Manifest-Version: 1.0 Name: AppStore Start-Script: assets/appstore.py +Version: 0.0.1 diff --git a/internal_filesystem/builtin/apps/com.example.appstore/assets/appstore.py b/internal_filesystem/builtin/apps/com.example.appstore/assets/appstore.py index 9df5ab93..fe7525d8 100644 --- a/internal_filesystem/builtin/apps/com.example.appstore/assets/appstore.py +++ b/internal_filesystem/builtin/apps/com.example.appstore/assets/appstore.py @@ -187,8 +187,13 @@ def show_app_detail(app): install_label = lv.label(install_button) install_label.set_text("(Re)Install Latest Version") # TODO: check if already installed and if yes, change to "Uninstall" and "Open" install_label.center() + version_label = lv.label(cont) + version_label.set_width(lv.pct(100)) + version_label.set_text(f"Version: {app.version}") + version_label.set_style_text_font(lv.font_montserrat_12, 0) + version_label.align_to(install_button, lv.ALIGN.OUT_BOTTOM_MID, 0, lv.pct(5)) long_desc_label = lv.label(cont) - long_desc_label.align_to(install_button, lv.ALIGN.OUT_BOTTOM_MID, 0, lv.pct(5)) + long_desc_label.align_to(version_label, lv.ALIGN.OUT_BOTTOM_MID, 0, lv.pct(5)) long_desc_label.set_text(app.long_description) long_desc_label.set_style_text_font(lv.font_montserrat_12, 0) long_desc_label.set_width(lv.pct(100)) diff --git a/internal_filesystem/builtin/apps/com.example.launcher/META-INF/MANIFEST.MF b/internal_filesystem/builtin/apps/com.example.launcher/META-INF/MANIFEST.MF index c08c5829..2bc1680d 100644 --- a/internal_filesystem/builtin/apps/com.example.launcher/META-INF/MANIFEST.MF +++ b/internal_filesystem/builtin/apps/com.example.launcher/META-INF/MANIFEST.MF @@ -1,3 +1,4 @@ Manifest-Version: 1.0 Name: Launcher Start-Script: assets/launcher.py +Version: 0.0.1 diff --git a/internal_filesystem/builtin/apps/com.example.osupdate/META-INF/MANIFEST.MF b/internal_filesystem/builtin/apps/com.example.osupdate/META-INF/MANIFEST.MF index e2c48647..861c1852 100644 --- a/internal_filesystem/builtin/apps/com.example.osupdate/META-INF/MANIFEST.MF +++ b/internal_filesystem/builtin/apps/com.example.osupdate/META-INF/MANIFEST.MF @@ -1,3 +1,4 @@ Manifest-Version: 1.0 Name: OSUpdate Start-Script: assets/osupdate.py +Version: 0.0.1 diff --git a/internal_filesystem/builtin/apps/com.example.wificonf/META-INF/MANIFEST.MF b/internal_filesystem/builtin/apps/com.example.wificonf/META-INF/MANIFEST.MF index 27d2d7d3..209ad7fa 100644 --- a/internal_filesystem/builtin/apps/com.example.wificonf/META-INF/MANIFEST.MF +++ b/internal_filesystem/builtin/apps/com.example.wificonf/META-INF/MANIFEST.MF @@ -3,3 +3,4 @@ Name: WiFiConf Start-Script: assets/wificonf.py WiFi-Connect-Script: assets/auto_connect.py WiFi-Configure-Script: assets/wificonf.py +Version: 0.0.1