Update submodule

maca88 · maca88 · commit 5b222e9a76ea · 2024-02-22T21:22:04.000+01:00
diff --git a/Source/SmartBikeLights b/Source/SmartBikeLights
@@ -1 +1 @@
-Subproject commit 354244ece243453115a8977cfb2f8d135ef56bad
+Subproject commit f28d7a4a152b657ffeb208d92e9315bad39a856d
diff --git a/Source/resources-round-360x360/resources.xml b/Source/resources-round-360x360/resources.xml
@@ -1,5 +1,5 @@
 <resources>
     <font id="lightsFont" scope="glance" filename="../SmartBikeLights/Source/SmartBikeLights/resources/fonts/Lights48.fnt" antialias="true" />
-    <font id="batteryFont" scope="glance" filename="../SmartBikeLights/Source/SmartBikeLights/resources/fonts/Battery24.fnt" antialias="false" />
+    <font id="batteryFont" scope="glance" filename="../SmartBikeLights/Source/SmartBikeLights/resources/fonts/Battery24.fnt" antialias="true" />
     <font id="controlModeFont" filename="../SmartBikeLights/Source/SmartBikeLights/resources/fonts/ControlMode18.fnt" antialias="true" />
 </resources>
diff --git a/Source/resources-round-390x390/resources.xml b/Source/resources-round-390x390/resources.xml
@@ -1,5 +1,5 @@
 <resources>
     <font id="lightsFont" scope="glance" filename="../SmartBikeLights/Source/SmartBikeLights/resources/fonts/Lights48.fnt" antialias="true" />
-    <font id="batteryFont" scope="glance" filename="../SmartBikeLights/Source/SmartBikeLights/resources/fonts/Battery24.fnt" antialias="false" />
+    <font id="batteryFont" scope="glance" filename="../SmartBikeLights/Source/SmartBikeLights/resources/fonts/Battery24.fnt" antialias="true" />
     <font id="controlModeFont" filename="../SmartBikeLights/Source/SmartBikeLights/resources/fonts/ControlMode18.fnt" antialias="true" />
 </resources>
diff --git a/Source/resources-round-416x416/resources.xml b/Source/resources-round-416x416/resources.xml
@@ -1,5 +1,5 @@
 <resources>
     <font id="lightsFont" scope="glance" filename="../SmartBikeLights/Source/SmartBikeLights/resources/fonts/Lights48.fnt" antialias="true" />
-    <font id="batteryFont" scope="glance" filename="../SmartBikeLights/Source/SmartBikeLights/resources/fonts/Battery24.fnt" antialias="false" />
+    <font id="batteryFont" scope="glance" filename="../SmartBikeLights/Source/SmartBikeLights/resources/fonts/Battery24.fnt" antialias="true" />
     <font id="controlModeFont" filename="../SmartBikeLights/Source/SmartBikeLights/resources/fonts/ControlMode18.fnt" antialias="true" />
 </resources>
diff --git a/Source/resources-round-454x454/resources.xml b/Source/resources-round-454x454/resources.xml
@@ -1,5 +1,5 @@
 <resources>
     <font id="lightsFont" scope="glance" filename="../SmartBikeLights/Source/SmartBikeLights/resources/fonts/Lights48.fnt" antialias="true" />
-    <font id="batteryFont" scope="glance" filename="../SmartBikeLights/Source/SmartBikeLights/resources/fonts/Battery24.fnt" antialias="false" />
+    <font id="batteryFont" scope="glance" filename="../SmartBikeLights/Source/SmartBikeLights/resources/fonts/Battery24.fnt" antialias="true" />
     <font id="controlModeFont" filename="../SmartBikeLights/Source/SmartBikeLights/resources/fonts/ControlMode18.fnt" antialias="true" />
 </resources>
diff --git a/Source/resources/resources.xml b/Source/resources/resources.xml
@@ -1,5 +1,5 @@
 <resources>
     <font id="lightsFont" scope="glance" filename="../SmartBikeLights/Source/SmartBikeLights/resources/fonts/Lights32.fnt" antialias="true" />
-    <font id="batteryFont" scope="glance" filename="../SmartBikeLights/Source/SmartBikeLights/resources/fonts/Battery16.fnt" antialias="false" />
+    <font id="batteryFont" scope="glance" filename="../SmartBikeLights/Source/SmartBikeLights/resources/fonts/Battery16.fnt" antialias="true" />
     <font id="controlModeFont" filename="../SmartBikeLights/Source/SmartBikeLights/resources/fonts/ControlMode12.fnt" antialias="true" />
 </resources>
diff --git a/Source/source-generated/BikeLightsGlanceView.HighResolution.mc b/Source/source-generated/BikeLightsGlanceView.HighResolution.mc
@@ -229,12 +229,13 @@ class BikeLightsGlanceView extends WatchUi.GlanceView {
 
         // Do not draw the indicator in case the light is not connected anymore or an invalid status is given
         // The only way to detect whether the light is still connected is to check whether the its battery status is not null
-        if (batteryStatus > 5) {
+        if (batteryStatus > 6) {
             return;
         }
 
         // Draw the battery indicator
-        var color = batteryStatus == 5 /* BATT_STATUS_CRITICAL */ ? 0xFF0000 /* COLOR_RED */
+        var color = batteryStatus == 6 /* BATT_STATUS_CHARGE */ ? fgColor
+            : batteryStatus == 5 /* BATT_STATUS_CRITICAL */ ? 0xFF0000 /* COLOR_RED */
             : batteryStatus > 2 /* BATT_STATUS_GOOD */ ? 0xFF5500 /* COLOR_ORANGE */
             : 0x00AA00; /* COLOR_DK_GREEN */
         dc.setColor(color, -1 /* COLOR_TRANSPARENT */);
diff --git a/Source/source-generated/BikeLightsGlanceView.MediumResolution.mc b/Source/source-generated/BikeLightsGlanceView.MediumResolution.mc
@@ -229,12 +229,13 @@ class BikeLightsGlanceView extends WatchUi.GlanceView {
 
         // Do not draw the indicator in case the light is not connected anymore or an invalid status is given
         // The only way to detect whether the light is still connected is to check whether the its battery status is not null
-        if (batteryStatus > 5) {
+        if (batteryStatus > 6) {
             return;
         }
 
         // Draw the battery indicator
-        var color = batteryStatus == 5 /* BATT_STATUS_CRITICAL */ ? 0xFF0000 /* COLOR_RED */
+        var color = batteryStatus == 6 /* BATT_STATUS_CHARGE */ ? fgColor
+            : batteryStatus == 5 /* BATT_STATUS_CRITICAL */ ? 0xFF0000 /* COLOR_RED */
             : batteryStatus > 2 /* BATT_STATUS_GOOD */ ? 0xFF5500 /* COLOR_ORANGE */
             : 0x00AA00; /* COLOR_DK_GREEN */
         dc.setColor(color, -1 /* COLOR_TRANSPARENT */);
diff --git a/Source/source-generated/BikeLightsView.Rectangle.mc b/Source/source-generated/BikeLightsView.Rectangle.mc
@@ -86,7 +86,6 @@ class BikeLightsView extends  WatchUi.View  {
     protected var _lightY;
     protected var _titleY;
     protected var _offsetX;
-
     // Parsed filters
     protected var _globalFilters;
 
@@ -599,12 +598,13 @@ class BikeLightsView extends  WatchUi.View  {
 
         // Do not draw the indicator in case the light is not connected anymore or an invalid status is given
         // The only way to detect whether the light is still connected is to check whether the its battery status is not null
-        if (batteryStatus > 5) {
+        if (batteryStatus > 6) {
             return;
         }
 
         // Draw the battery indicator
-        var color = batteryStatus == 5 /* BATT_STATUS_CRITICAL */ ? 0xFF0000 /* COLOR_RED */
+        var color = batteryStatus == 6 /* BATT_STATUS_CHARGE */ ? fgColor
+            : batteryStatus == 5 /* BATT_STATUS_CRITICAL */ ? 0xFF0000 /* COLOR_RED */
             : batteryStatus > 2 /* BATT_STATUS_GOOD */ ? 0xFF5500 /* COLOR_ORANGE */
             : 0x00AA00; /* COLOR_DK_GREEN */
         setTextColor(dc, color);
diff --git a/Source/source-generated/BikeLightsView.Round.mc b/Source/source-generated/BikeLightsView.Round.mc
@@ -86,7 +86,6 @@ class BikeLightsView extends  WatchUi.View  {
     protected var _lightY;
     protected var _titleY;
     protected var _offsetX;
-
     // Parsed filters
     protected var _globalFilters;
 
@@ -599,12 +598,13 @@ class BikeLightsView extends  WatchUi.View  {
 
         // Do not draw the indicator in case the light is not connected anymore or an invalid status is given
         // The only way to detect whether the light is still connected is to check whether the its battery status is not null
-        if (batteryStatus > 5) {
+        if (batteryStatus > 6) {
             return;
         }
 
         // Draw the battery indicator
-        var color = batteryStatus == 5 /* BATT_STATUS_CRITICAL */ ? 0xFF0000 /* COLOR_RED */
+        var color = batteryStatus == 6 /* BATT_STATUS_CHARGE */ ? fgColor
+            : batteryStatus == 5 /* BATT_STATUS_CRITICAL */ ? 0xFF0000 /* COLOR_RED */
             : batteryStatus > 2 /* BATT_STATUS_GOOD */ ? 0xFF5500 /* COLOR_ORANGE */
             : 0x00AA00; /* COLOR_DK_GREEN */
         setTextColor(dc, color);
diff --git a/Source/source-generated/BikeLightsView.RoundHighResolution.mc b/Source/source-generated/BikeLightsView.RoundHighResolution.mc
@@ -86,7 +86,6 @@ class BikeLightsView extends  WatchUi.View  {
     protected var _lightY;
     protected var _titleY;
     protected var _offsetX;
-
     // Parsed filters
     protected var _globalFilters;
 
@@ -599,12 +598,13 @@ class BikeLightsView extends  WatchUi.View  {
 
         // Do not draw the indicator in case the light is not connected anymore or an invalid status is given
         // The only way to detect whether the light is still connected is to check whether the its battery status is not null
-        if (batteryStatus > 5) {
+        if (batteryStatus > 6) {
             return;
         }
 
         // Draw the battery indicator
-        var color = batteryStatus == 5 /* BATT_STATUS_CRITICAL */ ? 0xFF0000 /* COLOR_RED */
+        var color = batteryStatus == 6 /* BATT_STATUS_CHARGE */ ? fgColor
+            : batteryStatus == 5 /* BATT_STATUS_CRITICAL */ ? 0xFF0000 /* COLOR_RED */
             : batteryStatus > 2 /* BATT_STATUS_GOOD */ ? 0xFF5500 /* COLOR_ORANGE */
             : 0x00AA00; /* COLOR_DK_GREEN */
         setTextColor(dc, color);
diff --git a/Source/source-generated/BikeLightsView.TouchRectangle.mc b/Source/source-generated/BikeLightsView.TouchRectangle.mc
@@ -92,15 +92,14 @@ class BikeLightsView extends  WatchUi.View  {
     private var _taillightPanel;
     private var _panelInitialized = false;
 
-    // Pre-calculated positions
+    // Pre-calculated fields
     protected var _isFullScreen;
     protected var _fieldWidth;
     protected var _batteryWidth = 49;
     protected var _batteryY;
     protected var _lightY;
     protected var _titleY;
     protected var _offsetX;
-
     // Parsed filters
     protected var _globalFilters;
 
@@ -700,12 +699,13 @@ class BikeLightsView extends  WatchUi.View  {
 
         // Do not draw the indicator in case the light is not connected anymore or an invalid status is given
         // The only way to detect whether the light is still connected is to check whether the its battery status is not null
-        if (batteryStatus > 5) {
+        if (batteryStatus > 6) {
             return;
         }
 
         // Draw the battery indicator
-        var color = batteryStatus == 5 /* BATT_STATUS_CRITICAL */ ? 0xFF0000 /* COLOR_RED */
+        var color = batteryStatus == 6 /* BATT_STATUS_CHARGE */ ? fgColor
+            : batteryStatus == 5 /* BATT_STATUS_CRITICAL */ ? 0xFF0000 /* COLOR_RED */
             : batteryStatus > 2 /* BATT_STATUS_GOOD */ ? 0xFF5500 /* COLOR_ORANGE */
             : 0x00AA00; /* COLOR_DK_GREEN */
         setTextColor(dc, color);
diff --git a/Source/source-preprocess/BikeLightsGlanceView.mc b/Source/source-preprocess/BikeLightsGlanceView.mc
@@ -229,12 +229,13 @@ class BikeLightsGlanceView extends WatchUi.GlanceView {
 
         // Do not draw the indicator in case the light is not connected anymore or an invalid status is given
         // The only way to detect whether the light is still connected is to check whether the its battery status is not null
-        if (batteryStatus > 5) {
+        if (batteryStatus > 6) {
             return;
         }
 
         // Draw the battery indicator
-        var color = batteryStatus == 5 /* BATT_STATUS_CRITICAL */ ? 0xFF0000 /* COLOR_RED */
+        var color = batteryStatus == 6 /* BATT_STATUS_CHARGE */ ? fgColor
+            : batteryStatus == 5 /* BATT_STATUS_CRITICAL */ ? 0xFF0000 /* COLOR_RED */
             : batteryStatus > 2 /* BATT_STATUS_GOOD */ ? 0xFF5500 /* COLOR_ORANGE */
             : 0x00AA00; /* COLOR_DK_GREEN */
         dc.setColor(color, -1 /* COLOR_TRANSPARENT */);
