From ed4646511fe58a242ced9381329b84a08d51502c Mon Sep 17 00:00:00 2001 From: Philip Abbey Date: Sun, 19 Jan 2025 18:47:38 +0000 Subject: [PATCH] Added 5 new Instinct devices Small (imperfect) fix for 2 colour device icons. --- compile_sim.cmd | 14 ++++++++------ manifest.xml | 5 +++++ monkey.jungle | 22 ++++++++++++++++------ resources-icons-18-w/drawables.xml | 23 +++++++++++++++++++++++ resources-icons-18-w/error.svg | 1 + resources-icons-18-w/group_type.svg | 7 +++++++ resources-icons-18-w/info_type.svg | 1 + resources-icons-18-w/tap_type.svg | 1 + resources-icons-21-w/drawables.xml | 23 +++++++++++++++++++++++ resources-icons-21-w/error.svg | 1 + resources-icons-21-w/group_type.svg | 7 +++++++ resources-icons-21-w/info_type.svg | 1 + resources-icons-21-w/tap_type.svg | 1 + resources-icons-34/drawables.xml | 23 +++++++++++++++++++++++ resources-icons-34/error.svg | 1 + resources-icons-34/group_type.svg | 7 +++++++ resources-icons-34/info_type.svg | 1 + resources-icons-34/tap_type.svg | 1 + resources-icons-48/group_type.svg | 1 - resources-launcher-52-52/drawables.xml | 17 +++++++++++++++++ resources-launcher-52-52/launcher.svg | 4 ++++ 21 files changed, 149 insertions(+), 13 deletions(-) create mode 100644 resources-icons-18-w/drawables.xml create mode 100644 resources-icons-18-w/error.svg create mode 100644 resources-icons-18-w/group_type.svg create mode 100644 resources-icons-18-w/info_type.svg create mode 100644 resources-icons-18-w/tap_type.svg create mode 100644 resources-icons-21-w/drawables.xml create mode 100644 resources-icons-21-w/error.svg create mode 100644 resources-icons-21-w/group_type.svg create mode 100644 resources-icons-21-w/info_type.svg create mode 100644 resources-icons-21-w/tap_type.svg create mode 100644 resources-icons-34/drawables.xml create mode 100644 resources-icons-34/error.svg create mode 100644 resources-icons-34/group_type.svg create mode 100644 resources-icons-34/info_type.svg create mode 100644 resources-icons-34/tap_type.svg create mode 100644 resources-launcher-52-52/drawables.xml create mode 100644 resources-launcher-52-52/launcher.svg diff --git a/compile_sim.cmd b/compile_sim.cmd index 1005efb..bf3e89c 100644 --- a/compile_sim.cmd +++ b/compile_sim.cmd @@ -26,7 +26,7 @@ rem SDK_PATH should work for all users set /p SDK_PATH=<"%USERPROFILE%\AppData\Roaming\Garmin\ConnectIQ\current-sdk.cfg" set SDK_PATH=%SDK_PATH:~0,-1%\bin rem Assume we can create and use this directory -set DEST=export +set DEST=bin rem Device for simulation set DEVICE=venu2 @@ -72,17 +72,19 @@ rem -x,--excludes Add annotations to the exclude list (deprecated) rem -y,--private-key Private key to sign builds with rem -z,--rez Resource files (deprecated) +title Compiling for %DEVICE% + rem Batch file's directory where the source code is set SRC=%~dp0 rem drop last character '\' set SRC=%SRC:~0,-1% -if not exist %DEST% ( - md %DEST% +if exist %DEST% ( + rmdir /s /q %DEST% ) - -if exist %SRC%\export\HomeAssistant*.iq ( - del /f /q %SRC%\export\HomeAssistant*.iq +rem The above may not successfully delete the directory if there are locked files +if not exist %DEST% ( + mkdir %DEST% ) echo. diff --git a/manifest.xml b/manifest.xml index 14d1424..6974d01 100644 --- a/manifest.xml +++ b/manifest.xml @@ -117,7 +117,12 @@ + + + + + diff --git a/monkey.jungle b/monkey.jungle index f432ed6..8add2a2 100644 --- a/monkey.jungle +++ b/monkey.jungle @@ -31,8 +31,8 @@ project.manifest = manifest.xml # # The icons need to scale as a ratio of screen size 48:416 pixels # -# Icon 55 53 48 46 42 37 32 30 28 26 24 21 18 -# Screen 480 454 416 390 360 320 280 260 240 218 208 176 156 +# Icon 55 53 48 46 42 37 32 30 28 26 24 21 19 18 +# Screen 480 454 416 390 360 320 280 260 240 218 208 176 166 156 # Screen Size 390x390 launcher icon size 70x70 approachs7042mm.resourcePath = $(approachs7042mm.resourcePath);resources-launcher-70-70;resources-icons-46 @@ -166,13 +166,23 @@ fr965.resourcePath = $(fr965.resourcePath);resources-launcher-65-65;resources-ic # Screen Size 240x400 launcher icon size 38x33 gpsmap67.resourcePath = $(gpsmap67.resourcePath);resources-launcher-33-33;resources-icons-28 # Screen Size 176x176 launcher icon size 62x62 -instinct2.resourcePath = $(instinct2.resourcePath);resources-launcher-62-62;resources-icons-21 +instinct2.resourcePath = $(instinct2.resourcePath);resources-launcher-62-62;resources-icons-21-w # Screen Size 163x156 launcher icon size 54x54 -instinct2s.resourcePath = $(instinct2s.resourcePath);resources-launcher-54-54;resources-icons-18 +instinct2s.resourcePath = $(instinct2s.resourcePath);resources-launcher-54-54;resources-icons-18-w # Screen Size 176x176 launcher icon size 62x62 -instinct2x.resourcePath = $(instinct2x.resourcePath);resources-launcher-62-62;resources-icons-21 +instinct2x.resourcePath = $(instinct2x.resourcePath);resources-launcher-62-62;resources-icons-21-w +# Screen Size 390x390 launcher icon size 60x60, but the icon size used here is reduced as the menu items were clipped. +instinct3amoled45mm.resourcePath = $(instinct3amoled45mm.resourcePath);resources-launcher-60-60;resources-icons-32 +# Screen Size 416x416 launcher icon size 60x60, but the icon size used here is reduced as the menu items were clipped. +instinct3amoled50mm.resourcePath = $(instinct3amoled50mm.resourcePath);resources-launcher-60-60;resources-icons-34 +# Screen Size 176x176 launcher icon size 62x62 +instinct3solar45mm.resourcePath = $(instinct3solar45mm.resourcePath);resources-launcher-62-62;resources-icons-18-w # Screen Size 176x176 launcher icon size 26x26 -instinctcrossover.resourcePath = $(instinctcrossover.resourcePath);resources-launcher-26-26;resources-icons-21 +instinctcrossover.resourcePath = $(instinctcrossover.resourcePath);resources-launcher-26-26;resources-icons-21-w +# Screen Size 166x166 launcher icon size 52x52, but the icon size used here is reduced as the menu items were clipped. +instincte40mm.resourcePath = $(instincte40mm.resourcePath);resources-launcher-52-52;resources-icons-18-w +# Screen Size 176x176 launcher icon size 62x62, but the icon size used here is reduced as the menu items were clipped. +instincte45mm.resourcePath = $(instincte45mm.resourcePath);resources-launcher-62-62;resources-icons-18-w # Screen Size 218x218 launcher icon size 30x30 legacyherocaptainmarvel.resourcePath = $(legacyherocaptainmarvel.resourcePath);resources-launcher-30-30;resources-icons-26 # Screen Size 260x260 launcher icon size 35x35 diff --git a/resources-icons-18-w/drawables.xml b/resources-icons-18-w/drawables.xml new file mode 100644 index 0000000..33c0707 --- /dev/null +++ b/resources-icons-18-w/drawables.xml @@ -0,0 +1,23 @@ + + + + + + + + diff --git a/resources-icons-18-w/error.svg b/resources-icons-18-w/error.svg new file mode 100644 index 0000000..a457398 --- /dev/null +++ b/resources-icons-18-w/error.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources-icons-18-w/group_type.svg b/resources-icons-18-w/group_type.svg new file mode 100644 index 0000000..8a67a91 --- /dev/null +++ b/resources-icons-18-w/group_type.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/resources-icons-18-w/info_type.svg b/resources-icons-18-w/info_type.svg new file mode 100644 index 0000000..65a4cc6 --- /dev/null +++ b/resources-icons-18-w/info_type.svg @@ -0,0 +1 @@ + diff --git a/resources-icons-18-w/tap_type.svg b/resources-icons-18-w/tap_type.svg new file mode 100644 index 0000000..6d52a9a --- /dev/null +++ b/resources-icons-18-w/tap_type.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources-icons-21-w/drawables.xml b/resources-icons-21-w/drawables.xml new file mode 100644 index 0000000..33c0707 --- /dev/null +++ b/resources-icons-21-w/drawables.xml @@ -0,0 +1,23 @@ + + + + + + + + diff --git a/resources-icons-21-w/error.svg b/resources-icons-21-w/error.svg new file mode 100644 index 0000000..2b21d69 --- /dev/null +++ b/resources-icons-21-w/error.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources-icons-21-w/group_type.svg b/resources-icons-21-w/group_type.svg new file mode 100644 index 0000000..9996c00 --- /dev/null +++ b/resources-icons-21-w/group_type.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/resources-icons-21-w/info_type.svg b/resources-icons-21-w/info_type.svg new file mode 100644 index 0000000..4dcfba5 --- /dev/null +++ b/resources-icons-21-w/info_type.svg @@ -0,0 +1 @@ + diff --git a/resources-icons-21-w/tap_type.svg b/resources-icons-21-w/tap_type.svg new file mode 100644 index 0000000..2fcd199 --- /dev/null +++ b/resources-icons-21-w/tap_type.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources-icons-34/drawables.xml b/resources-icons-34/drawables.xml new file mode 100644 index 0000000..33c0707 --- /dev/null +++ b/resources-icons-34/drawables.xml @@ -0,0 +1,23 @@ + + + + + + + + diff --git a/resources-icons-34/error.svg b/resources-icons-34/error.svg new file mode 100644 index 0000000..f015c3f --- /dev/null +++ b/resources-icons-34/error.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources-icons-34/group_type.svg b/resources-icons-34/group_type.svg new file mode 100644 index 0000000..9b20a55 --- /dev/null +++ b/resources-icons-34/group_type.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/resources-icons-34/info_type.svg b/resources-icons-34/info_type.svg new file mode 100644 index 0000000..aa79943 --- /dev/null +++ b/resources-icons-34/info_type.svg @@ -0,0 +1 @@ + diff --git a/resources-icons-34/tap_type.svg b/resources-icons-34/tap_type.svg new file mode 100644 index 0000000..cf998ef --- /dev/null +++ b/resources-icons-34/tap_type.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources-icons-48/group_type.svg b/resources-icons-48/group_type.svg index 6ab40e7..322ef7d 100644 --- a/resources-icons-48/group_type.svg +++ b/resources-icons-48/group_type.svg @@ -1,4 +1,3 @@ - diff --git a/resources-launcher-52-52/drawables.xml b/resources-launcher-52-52/drawables.xml new file mode 100644 index 0000000..44c0b71 --- /dev/null +++ b/resources-launcher-52-52/drawables.xml @@ -0,0 +1,17 @@ + + + + + diff --git a/resources-launcher-52-52/launcher.svg b/resources-launcher-52-52/launcher.svg new file mode 100644 index 0000000..85d3316 --- /dev/null +++ b/resources-launcher-52-52/launcher.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file