From 277f213693ad18bf4041fe1096ec21451f2407cf Mon Sep 17 00:00:00 2001
From: Mark van Renswoude <mark@x2software.net>
Date: Fri, 15 Nov 2024 14:29:03 +0100
Subject: [PATCH] Fixed FR165 support

Removed value text shadow for readability
---
 .gitignore                                   |  3 +-
 KittieCats/manifest.xml                      |  1 +
 KittieCats/resources/drawables/drawables.xml | 10 +++---
 KittieCats/source/KittieCatsView.mc          | 35 +++++++++++++-------
 4 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8af8434..de70021 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,4 +6,5 @@ KittieCats/resources/drawables/background_xmas.jpg
 *.kra
 
 # Build artifacts
-bin
\ No newline at end of file
+bin
+build
\ No newline at end of file
diff --git a/KittieCats/manifest.xml b/KittieCats/manifest.xml
index d0e1780..91c347a 100644
--- a/KittieCats/manifest.xml
+++ b/KittieCats/manifest.xml
@@ -14,6 +14,7 @@
             "Monkey C: Edit Products" - Lets you add or remove any product
         -->
         <iq:products>
+            <iq:product id="fr165"/>
             <iq:product id="vivoactive5"/>
         </iq:products>
         <!--
diff --git a/KittieCats/resources/drawables/drawables.xml b/KittieCats/resources/drawables/drawables.xml
index 9cf24cf..655ddd4 100755
--- a/KittieCats/resources/drawables/drawables.xml
+++ b/KittieCats/resources/drawables/drawables.xml
@@ -4,11 +4,11 @@
     <bitmap id="Background" filename="background.jpg" />
     <bitmap id="BackgroundXmas" filename="background_xmas.jpg" />
 
-    <bitmap id="Ticks" filename="ticks.svg" packingFormat="png" />
+    <bitmap id="Ticks" filename="ticks.svg" automaticPalette="false" />
 
-    <bitmap id="ArmHour" filename="arm_hour.svg" packingFormat="png" />
-    <bitmap id="ArmMinute" filename="arm_minute.svg" packingFormat="png" />
-    <bitmap id="ArmSecond" filename="arm_second.svg" packingFormat="png" />
+    <bitmap id="ArmHour" filename="arm_hour.svg" automaticPalette="false" />
+    <bitmap id="ArmMinute" filename="arm_minute.svg" automaticPalette="false" />
+    <bitmap id="ArmSecond" filename="arm_second.svg" automaticPalette="false" />
 
-    <bitmap id="Icons" filename="icons.png" packingFormat="png" automaticPalette="true" />
+    <bitmap id="Icons" filename="icons.png" automaticPalette="false" />
 </drawables>
diff --git a/KittieCats/source/KittieCatsView.mc b/KittieCats/source/KittieCatsView.mc
index 3ebcb3f..633f19d 100644
--- a/KittieCats/source/KittieCatsView.mc
+++ b/KittieCats/source/KittieCatsView.mc
@@ -110,17 +110,19 @@ class KittieCatsView extends WatchUi.WatchFace
 
 
             // --- Complications ---
-            self.drawShadowedText(dc, 116, 186, Graphics.FONT_XTINY, complications.HeartRate, Graphics.TEXT_JUSTIFY_CENTER | Graphics.TEXT_JUSTIFY_VCENTER,
-                Graphics.COLOR_BLACK, Graphics.COLOR_WHITE, 2);
+            dc.setColor(Graphics.COLOR_BLACK, Graphics.COLOR_TRANSPARENT);
 
-            self.drawShadowedText(dc, 195, 313, Graphics.FONT_XTINY, complications.Steps, Graphics.TEXT_JUSTIFY_LEFT | Graphics.TEXT_JUSTIFY_VCENTER,
-                Graphics.COLOR_BLACK, Graphics.COLOR_WHITE, 2);
+            self.drawValue(dc, 116, 186, Graphics.FONT_XTINY, complications.HeartRate, "-",
+                Graphics.TEXT_JUSTIFY_CENTER | Graphics.TEXT_JUSTIFY_VCENTER);
 
-            self.drawShadowedText(dc, 195, 346, Graphics.FONT_XTINY, complications.BodyBattery, Graphics.TEXT_JUSTIFY_LEFT | Graphics.TEXT_JUSTIFY_VCENTER,
-                Graphics.COLOR_BLACK, Graphics.COLOR_WHITE, 2);
+            self.drawValue(dc, 195, 313, Graphics.FONT_XTINY, complications.Steps, "-",
+                Graphics.TEXT_JUSTIFY_LEFT | Graphics.TEXT_JUSTIFY_VCENTER);
 
-            self.drawShadowedText(dc, 261, 346, Graphics.FONT_XTINY, complications.Stress, Graphics.TEXT_JUSTIFY_LEFT | Graphics.TEXT_JUSTIFY_VCENTER,
-                Graphics.COLOR_BLACK, Graphics.COLOR_WHITE, 2);
+            self.drawValue(dc, 195, 346, Graphics.FONT_XTINY, complications.BodyBattery, "-",
+                Graphics.TEXT_JUSTIFY_LEFT | Graphics.TEXT_JUSTIFY_VCENTER);
+
+            self.drawValue(dc, 261, 346, Graphics.FONT_XTINY, complications.Stress, "-",
+                Graphics.TEXT_JUSTIFY_LEFT | Graphics.TEXT_JUSTIFY_VCENTER);
         }
     }
 
@@ -180,16 +182,25 @@ class KittieCatsView extends WatchUi.WatchFace
     }
 
 
-    private function drawShadowedText(dc as Dc, x as Lang.Numeric, y as Lang.Numeric, font as Graphics.FontType, 
-        text as Lang.Object or Null, justification as Graphics.TextJustification or Lang.Number, 
+    private function drawValue(dc as Dc, x as Lang.Numeric, y as Lang.Numeric, font as Graphics.FontType, 
+        text as Lang.Object or Null, nullText as Lang.Object, justification as Graphics.TextJustification or Lang.Number) as Void
+    {
+        dc.drawText(x, y, font, text == null ? nullText : text, justification);
+    }
+
+
+    /*
+    private function drawShadowedValue(dc as Dc, x as Lang.Numeric, y as Lang.Numeric, font as Graphics.FontType, 
+        text as Lang.Object or Null, nullText as Lang.Object, justification as Graphics.TextJustification or Lang.Number, 
         textColor as Graphics.ColorType, shadowColor as Graphics.ColorType, shadowOffset as Lang.Numeric) as Void
     {
         dc.setColor(shadowColor, Graphics.COLOR_TRANSPARENT);
-        dc.drawText(x + shadowOffset, y + shadowOffset, font, text, justification);
+        dc.drawText(x + shadowOffset, y + shadowOffset, font, text == null ? nullText : text, justification);
 
         dc.setColor(textColor, Graphics.COLOR_TRANSPARENT);
-        dc.drawText(x, y, font, text, justification);
+        dc.drawText(x, y, font, text == null ? nullText : text, justification);
     }
+    */
 
 
     private function drawIcon(dc as Dc, iconIndex as Lang.Numeric, x as Lang.Numeric, y as Lang.Numeric)