V1.4.4 - Fix bug

- Bug fix : #7 - Add inactivity circle option : #8
zRenard · Mar 19, 2022 · 436dfe2 · 436dfe2
1 parent 8a98113
commit 436dfe2
Show file tree

Hide file tree

Showing 10 changed files with 193 additions and 180 deletions.
diff --git a/bin/zRenardWatch-settings.json b/bin/zRenardWatch-settings.json
diff --git a/bin/zRenardWatch.prg b/bin/zRenardWatch.prg
diff --git a/bin/zRenardWatch.prg.debug.xml b/bin/zRenardWatch.prg.debug.xml
diff --git a/dist/zRenardWatch.iq b/dist/zRenardWatch.iq
diff --git a/manifest.xml b/manifest.xml
@@ -1,5 +1,5 @@
 <!-- This is a generated file. It is highly recommended that you DO NOT edit this file. --><iq:manifest xmlns:iq="http://www.garmin.com/xml/connectiq" version="3">
-    <iq:application entry="zRenardWatchApp" id="f952f59c9c1e4fc8b807177c63821408" launcherIcon="@Drawables.LauncherIcon" minSdkVersion="3.0.0" name="@Strings.AppName" type="watchface" version="1.4.3">
+    <iq:application entry="zRenardWatchApp" id="f952f59c9c1e4fc8b807177c63821408" launcherIcon="@Drawables.LauncherIcon" minSdkVersion="3.0.0" name="@Strings.AppName" type="watchface" version="1.4.4">
         <iq:products>
             <iq:product id="fenix5"/>
             <iq:product id="fenix5plus"/>

diff --git a/resources-fre/strings/strings.xml b/resources-fre/strings/strings.xml
@@ -24,6 +24,8 @@
     <string id="MoveTopIcons">Sous forme d'icones en haut</string>
     <string id="MoveBottomIcons">Sous forme d'icones en bas à gauche</string>
 	<string id="MoveCircleTitle">Couleur du cercle d'inactivité</string>
+	<string id="MoveCircleWidthTitle">Taille de la ligne de l'indicateur d'inactivité (cercle)</string>
+	<string id="MoveCircleWidthError">Erreur de la taille de la ligne de l'indicateur d'inactivité</string>
 
     <string id="ColorBlack">Noir</string>
     <string id="ColorDarkGray">Gris Sombre</string>

diff --git a/resources/settings/properties.xml b/resources/settings/properties.xml
@@ -13,5 +13,6 @@
     <property id="ShowMove" type="boolean">true</property>
     <property id="MoveDisplayType" type="number">1</property>
     <property id="MoveCircleColor" type="number">0xFFFFFF</property>
+    <property id="MoveCircleWidth" type="number">2</property>
 </properties>
 
diff --git a/resources/settings/settings.xml b/resources/settings/settings.xml
@@ -102,4 +102,7 @@
             <listEntry value="0x00FFFF">@Strings.ColorCyan</listEntry>
         </settingConfig>
     </setting>
+    <setting propertyKey="@Properties.MoveCircleWidth" title="@Strings.MoveCircleWidthTitle">
+        <settingConfig type="numeric" min="1" max="6" errorMessage="@Strings.MoveCircleWidthError"/>
+    </setting>
 </settings>
diff --git a/resources/strings/strings.xml b/resources/strings/strings.xml
@@ -19,10 +19,12 @@
 
 	<string id="ShowMoveTitle">Show inactivity status</string>
     <string id="MoveDisplayTypeTitle">Inactivity status type</string>
-	<string id="MoveCircle">Show as circle</string>
     <string id="MoveTopIcons">Show as icons on top</string>
     <string id="MoveBottomIcons">Show as icons on bottom/left</string>
+	<string id="MoveCircle">Show as circle</string>
 	<string id="MoveCircleTitle">Inactivity circle color</string>
+	<string id="MoveCircleWidthTitle">Size of the line of move indicator (circle)</string>
+	<string id="MoveCircleWidthError">Invalid size of the move indicator line</string>
 
     <string id="ColorBlack">Black</string>
     <string id="ColorDarkGray">Dark Gray</string>

diff --git a/source/zRenardWatchView.mc b/source/zRenardWatchView.mc
@@ -85,6 +85,7 @@ class zRenardWatchView extends WatchUi.WatchFace {
 				dc.drawText( (width / 2)+60, ((height/2)-33)-17-35, font_vlarge, myMinutes, Graphics.TEXT_JUSTIFY_CENTER);
 			} else {
 				dc.drawText( (width / 2)+20, ((height/2)+20)-17-35, Graphics.FONT_SYSTEM_NUMBER_THAI_HOT, myMinutes, Graphics.TEXT_JUSTIFY_CENTER);
+				//dc.drawText( (width / 2)+20, ((height/2)+20)-17-35, Graphics.FONT_SYSTEM_NUMBER_HOT, myMinutes, Graphics.TEXT_JUSTIFY_CENTER);
 			}
 			dc.setColor(hlC ,Graphics.COLOR_TRANSPARENT);
 			if (!sleepMode || (sleepMode && !Application.getApp().getProperty("UseSleepMode"))) {
@@ -105,11 +106,11 @@ class zRenardWatchView extends WatchUi.WatchFace {
 
 				if (showMove && moveLevel>0) {
 					if (moveDisplayType==1) {
-						dc.setPenWidth(2);
+						dc.setPenWidth(Application.getApp().getProperty("MoveCircleWidth"));
 						dc.setColor(Application.getApp().getProperty("MoveCircleColor"), Graphics.COLOR_TRANSPARENT);
-						dc.drawArc(width / 2, height / 2, (width / 2)-2,Graphics.ARC_CLOCKWISE,90,90-72*moveLevel);
+						dc.drawArc(width / 2, height / 2, (width / 2)-1-Math.floor(Application.getApp().getProperty("MoveCircleWidth")/2),Graphics.ARC_CLOCKWISE,90,90-72*moveLevel);
 						dc.setColor(fgC, Graphics.COLOR_TRANSPARENT);
-						dc.setPenWidth(1);
+						dc.setPenWidth(2);
 					}
 					if (moveDisplayType==2) {
 				        if (moveLevel==1||moveLevel==3||moveLevel==5) {