From 7e58e5416d7f6601c41106ffb33fe69a9ae2b520 Mon Sep 17 00:00:00 2001
From: Philip Abbey <philipabbey@users.noreply.github.com>
Date: Thu, 24 Apr 2025 22:26:18 +0100
Subject: [PATCH 1/3] Support for Vivoactive 6 device

This required an update to the SDK to version 8.1.0. The new SDK found some new code warnings for unreachable code previously known to be reached based on stricter type checking, so fixed in this commit too.
---
 HISTORY.md                            | 1 +
 manifest.xml                          | 3 ++-
 monkey.jungle                         | 6 ++++--
 source/HomeAssistantMenuItem.mc       | 2 +-
 source/HomeAssistantToggleMenuItem.mc | 2 +-
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/HISTORY.md b/HISTORY.md
index 7f25b41..b43d876 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -40,3 +40,4 @@
 |   2.25  | 2 Bug fixes. First time startup issues caused by v2.24 change and a fix for pure numbers in returned templates. |
 |   2.26  | Retry responsive menu fix failed in v2.24. Cosmetic internal class changes. |
 |   2.27  | Trivial bug fix for the glance view to prevent the "Unconfigured" result being erroneously displayed because the settings were not yet pulled from persistent storage. |
+|   2.28  | Added support for Vivoactive 6 device which also required an SDK update to 8.1.0. |
diff --git a/manifest.xml b/manifest.xml
index 6db0131..8dc2d79 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -28,7 +28,7 @@
     Testing in VSCode requires monkey.jungle, so for convenience, swap between
     watch-app and widget by changing which of the next two lines are commented out
   -->
-  <iq:application id="98c36259-498a-4458-9cef-74a273ad2bc3" type="watch-app" name="@Strings.AppName" entry="HomeAssistantApp" launcherIcon="@Drawables.LauncherIcon" minApiLevel="3.1.0">
+  <iq:application id="40131e87-31ff-454b-a8e2-92276ee399d6" type="watch-app" name="@Strings.AppName" entry="HomeAssistantApp" launcherIcon="@Drawables.LauncherIcon" minApiLevel="3.1.0">
     <!--
       Use the following from the Visual Studio Code command palette to edit
       the build targets:
@@ -159,6 +159,7 @@
       <iq:product id="vivoactive4"/>
       <iq:product id="vivoactive4s"/>
       <iq:product id="vivoactive5"/>
+      <iq:product id="vivoactive6"/>
     </iq:products>
     <!--
       Use "Monkey C: Edit Permissions" from the Visual Studio Code command
diff --git a/monkey.jungle b/monkey.jungle
index d10f4ed..69fb9ba 100644
--- a/monkey.jungle
+++ b/monkey.jungle
@@ -241,5 +241,7 @@ vivoactive3mlte.resourcePath = $(vivoactive3mlte.resourcePath);resources-launche
 vivoactive4.resourcePath = $(vivoactive4.resourcePath);resources-launcher-35-35;resources-icons-30
 # Screen Size 218x218 launcher icon size 30x30
 vivoactive4s.resourcePath = $(vivoactive4s.resourcePath);resources-launcher-30-30;resources-icons-26
-# Screen Size 390x390 launcher icon size 70x70
-vivoactive5.resourcePath = $(vivoactive5.resourcePath);resources-launcher-70-70;resources-icons-46
+# Screen Size 390x390 launcher icon size 56x56
+vivoactive5.resourcePath = $(vivoactive5.resourcePath);resources-launcher-56-56;resources-icons-46
+# Screen Size 390x390 launcher icon size 54x54
+vivoactive6.resourcePath = $(vivoactive6.resourcePath);resources-launcher-54-54;resources-icons-46
diff --git a/source/HomeAssistantMenuItem.mc b/source/HomeAssistantMenuItem.mc
index fbb060d..7a185e5 100644
--- a/source/HomeAssistantMenuItem.mc
+++ b/source/HomeAssistantMenuItem.mc
@@ -51,7 +51,7 @@ class HomeAssistantMenuItem extends WatchUi.IconMenuItem {
         return mTemplate;
     }
 
-    function updateState(data as Lang.String or Lang.Dictionary or Null) as Void {
+    function updateState(data as Lang.String or Lang.Dictionary or Lang.Number or Lang.Float or Null) as Void {
         if (data == null) {
             setSubLabel($.Rez.Strings.Empty);
         } else if(data instanceof Lang.String) {
diff --git a/source/HomeAssistantToggleMenuItem.mc b/source/HomeAssistantToggleMenuItem.mc
index d7a14d0..cff6c90 100644
--- a/source/HomeAssistantToggleMenuItem.mc
+++ b/source/HomeAssistantToggleMenuItem.mc
@@ -75,7 +75,7 @@ class HomeAssistantToggleMenuItem extends WatchUi.ToggleMenuItem {
         return "{{states('" + mData.get("entity_id") + "')}}";
     }
 
-    function updateState(data as Lang.String or Lang.Dictionary or Null) as Void {
+    function updateState(data as Lang.String or Lang.Dictionary or Lang.Number or Lang.Float or Null) as Void {
         if (data == null) {
             setSubLabel(null);
         } else if(data instanceof Lang.String) {

From f74a3168deec00888a9f8272996bbbe4354f486e Mon Sep 17 00:00:00 2001
From: Philip Abbey <philipabbey@users.noreply.github.com>
Date: Thu, 24 Apr 2025 22:30:43 +0100
Subject: [PATCH 2/3] Update manifest.xml

The App ID should not have been changed from the test app.
---
 manifest.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest.xml b/manifest.xml
index 8dc2d79..970f4a8 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -28,7 +28,7 @@
     Testing in VSCode requires monkey.jungle, so for convenience, swap between
     watch-app and widget by changing which of the next two lines are commented out
   -->
-  <iq:application id="40131e87-31ff-454b-a8e2-92276ee399d6" type="watch-app" name="@Strings.AppName" entry="HomeAssistantApp" launcherIcon="@Drawables.LauncherIcon" minApiLevel="3.1.0">
+  <iq:application id="98c36259-498a-4458-9cef-74a273ad2bc3" type="watch-app" name="@Strings.AppName" entry="HomeAssistantApp" launcherIcon="@Drawables.LauncherIcon" minApiLevel="3.1.0">
     <!--
       Use the following from the Visual Studio Code command palette to edit
       the build targets:

From ada18f83230b91723139e315417bd63caa41e9f0 Mon Sep 17 00:00:00 2001
From: Philip Abbey <philipabbey@users.noreply.github.com>
Date: Thu, 24 Apr 2025 22:38:10 +0100
Subject: [PATCH 3/3] Update export.cmd

'--api-level' command line switch removed from SDK 8.1.0
---
 export.cmd | 81 ++++++++++++++++++++++++++++--------------------------
 1 file changed, 42 insertions(+), 39 deletions(-)

diff --git a/export.cmd b/export.cmd
index 0947eab..7dd5369 100644
--- a/export.cmd
+++ b/export.cmd
@@ -29,45 +29,49 @@ rem Assume we can create and use this directory
 set DEST=export
 set IQ=HomeAssistant-app.iq
 
-rem C:\>java -jar %SDK_PATH%\monkeybrains.jar -h
-rem usage: monkeyc [-a <arg>] [-b <arg>] [--build-stats <arg>] [-c <arg>] [-d <arg>]
-rem        [--debug-log-level <arg>] [--debug-log-output <arg>] [-e]
+rem usage: monkeyc [-a <arg>] [-b <arg>] [--build-stats <arg>] [-d <arg>]
+rem        [--debug-log-level <arg>] [--debug-log-output <arg>]
+rem        [--disable-api-has-check-removal] [--disable-v2-opcodes] [-e]
 rem        [--Eno-invalid-symbol] [-f <arg>] [-g] [-h] [-i <arg>] [-k] [-l <arg>]
-rem        [-m <arg>] [--no-gen-styles] [-o <arg>] [-O <arg>] [-p <arg>] [-r] [-s
-rem        <arg>] [-t] [-u <arg>] [-v] [-w] [-x <arg>] [-y <arg>] [-z <arg>]
-rem -a,--apidb <arg>           API import file
-rem -b,--apimir <arg>          API MIR file
-rem    --build-stats <arg>     Print build stats [0=basic]
-rem -c,--api-level <arg>       API Level to target
-rem -d,--device <arg>          Target device
-rem    --debug-log-level <arg> Debug logging verbosity [0=errors, 1=basic,
-rem                            2=intermediate, 3=verbose]
-rem    --debug-log-output <arg>Output log zip file
-rem -e,--package-app           Create an application package.
-rem    --Eno-invalid-symbol    Do not error when a symbol is found to be invalid
-rem -f,--jungles <arg>         Jungle files
-rem -g,--debug                 Print debug output
-rem -h,--help                  Prints help information
-rem -i,--import-dbg <arg>      Import api.debug.xml
-rem -k,--profile               Enable profiling support
-rem -l,--typecheck <arg>       Type check [0=off, 1=gradual, 2=informative,
-rem                            3=strict]
-rem -m,--manifest <arg>        Manifest file (deprecated)
-rem    --no-gen-styles         Do not generate Rez.Styles module
-rem -o,--output <arg>          Output file to create
-rem -O,--optimization <arg>    Optimization level [0=none, 1=basic, 2=fast
-rem                            optimizations, 3=slow optimizations] [p=optimize
-rem                            performance, z=optimize code space]
-rem -p,--project-info <arg>    projectInfo.xml file to use when compiling
-rem -r,--release               Strip debug information
-rem -s,--sdk-version <arg>     SDK version to target (deprecated, use -c
-rem -t,--unit-test             Enables compilation of unit tests
-rem -u,--devices <arg>         devices.xml file to use when compiling (deprecated)
-rem -v,--version               Prints the compiler version
-rem -w,--warn                  Show compiler warnings
-rem -x,--excludes <arg>        Add annotations to the exclude list (deprecated)
-rem -y,--private-key <arg>     Private key to sign builds with
-rem -z,--rez <arg>             Resource files (deprecated)
+rem        [-m <arg>] [--no-gen-styles] [-o <arg>] [-O <arg>] [-p <arg>] [-r] [-t]
+rem        [-u <arg>] [-v] [-w] [-x <arg>] [-y <arg>] [-z <arg>]
+rem -a,--apidb <arg>                  API import file
+rem -b,--apimir <arg>                 API MIR file
+rem    --build-stats <arg>            Print build stats [0=basic]
+rem -d,--device <arg>                 Target device
+rem    --debug-log-level <arg>        Debug logging verbosity [0=errors, 1=basic,
+rem                                   2=intermediate, 3=verbose]
+rem    --debug-log-output <arg>       Output log zip file
+rem    --disable-api-has-check-removalDo not optimize out API has checks
+rem    --disable-v2-opcodes           Do not use the v2 opcodes
+rem -e,--package-app                  Create an application package.
+rem    --Eno-invalid-symbol           Do not error when a symbol is found to be
+rem                                   invalid
+rem -f,--jungles <arg>                Jungle files
+rem -g,--debug                        Print debug output
+rem -h,--help                         Prints help information
+rem -i,--import-dbg <arg>             Import api.debug.xml
+rem -k,--profile                      Enable profiling support
+rem -l,--typecheck <arg>              Type check [0=off, 1=gradual, 2=informative,
+rem                                   3=strict]
+rem -m,--manifest <arg>               Manifest file (deprecated)
+rem    --no-gen-styles                Do not generate Rez.Styles module
+rem -o,--output <arg>                 Output file to create
+rem -O,--optimization <arg>           Optimization level [0=none, 1=basic, 2=fast
+rem                                   optimizations, 3=slow optimizations]
+rem                                   [p=optimize performance, z=optimize code
+rem                                   space]
+rem -p,--project-info <arg>           projectInfo.xml file to use when compiling
+rem -r,--release                      Strip debug information
+rem -t,--unit-test                    Enables compilation of unit tests
+rem -u,--devices <arg>                devices.xml file to use when compiling
+rem                                   (deprecated)
+rem -v,--version                      Prints the compiler version
+rem -w,--warn                         Show compiler warnings
+rem -x,--excludes <arg>               Add annotations to the exclude list
+rem                                   (deprecated)
+rem -y,--private-key <arg>            Private key to sign builds with
+rem -z,--rez <arg>                    Resource files (deprecated)
 
 title Exporting Garmin Home Assistant Application
 
@@ -96,7 +100,6 @@ echo.
   -Dfile.encoding=UTF-8 ^
   -Dapple.awt.UIElement=true ^
   -jar %SDK_PATH%\monkeybrains.jar ^
-  --api-level 3.1.0 ^
   --output %IQ% ^
   --jungles %SRC%\monkey.jungle ^
   --private-key %SRC%\..\developer_key ^