Fix Issues2

Incorrect second display on fenix 5 (#2)
zRenard · Mar 31, 2020 · 451d41b · 451d41b
1 parent 46e3bf1
commit 451d41b
Show file tree

Hide file tree

Showing 7 changed files with 246 additions and 195 deletions.
diff --git a/bin/zRenardWatch2-settings.json b/bin/zRenardWatch2-settings.json
diff --git a/bin/zRenardWatch2.prg b/bin/zRenardWatch2.prg
diff --git a/bin/zRenardWatch2.prg.debug.xml b/bin/zRenardWatch2.prg.debug.xml
diff --git a/dist/zRenardWatch2.iq b/dist/zRenardWatch2.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="zRenardWatch2App" id="397b4d3ca6a44ceb9ba33ed90adb9ef4" launcherIcon="@Drawables.LauncherIcon" minSdkVersion="3.0.0" name="@Strings.AppName" type="watchface" version="1.3.0">
+    <iq:application entry="zRenardWatch2App" id="397b4d3ca6a44ceb9ba33ed90adb9ef4" launcherIcon="@Drawables.LauncherIcon" minSdkVersion="3.0.0" name="@Strings.AppName" type="watchface" version="1.3.1">
         <iq:products>
             <iq:product id="fenix5"/>
             <iq:product id="fenix5plus"/>

diff --git a/resources-fre/strings/strings.xml b/resources-fre/strings/strings.xml
@@ -5,8 +5,10 @@
     <string id="ForegroundColorTitle">Couleur du texte</string>
     <string id="ForegroundColorHoursTitle">Couleur du texte des heures</string>
     <string id="ForegroundColorMinutesTitle">Couleur du texte des minutes</string>
+    <string id="ForegroundColorSecondsTitle">Couleur du texte des secondes</string>
     <string id="HighLightColorTitle">Couleur de la date</string>
 
+    <string id="ShowSecondsTitle">Affiche les secondes</string>
     <string id="LeadingZeroTitle">Placer un zéro non significatif devant les heures, minutes et la date</string>
     <string id="UseSleepModeTitle">Masque la date et les notifications en mode repos</string>
     <string id="UltraSleepModeTitle">Si le niveau de batterie est critique, l'écran devient entièrement noir, et la montre est affiché uniquement en dehors du mode repos.</string>

diff --git a/source/zRenardWatch2View.mc b/source/zRenardWatch2View.mc
@@ -182,11 +182,13 @@ class zRenardWatch2View extends WatchUi.WatchFace {
 	    	var width = dc.getWidth();
 			var height = dc.getHeight();
 	    	var fgSC = Application.getApp().getProperty("ForegroundColorSeconds");
-
-			dc.setClip((width / 2)+45,(height/2)+7,45,Graphics.getFontHeight(Graphics.FONT_NUMBER_MILD ));
 			var bgC = Application.getApp().getProperty("BackgroundColor");
-			dc.setColor(fgSC,bgC);
+
+			dc.setClip((width / 2)+45,(height/2)+15,45,Graphics.getFontHeight(Graphics.FONT_NUMBER_MILD )+5);
 			dc.clear();
+//			dc.setColor(Graphics.COLOR_PINK,bgC);
+//			dc.drawRectangle((width / 2)+45,(height/2)+15,45,Graphics.getFontHeight(Graphics.FONT_NUMBER_MILD )+5);
+			dc.setColor(fgSC,bgC);
 			dc.drawText( (width / 2)+40+30, (height/2)+28-Graphics.getFontHeight(Graphics.FONT_NUMBER_MILD )/2, Graphics.FONT_NUMBER_MILD , mySecondes, Graphics.TEXT_JUSTIFY_CENTER);
 		}
 	}