fevieira27
diff --git a/‎resources-approachs7042mm/bitmaps.xml
Lines changed: 4 additions & 0 deletions b/‎resources-approachs7042mm/bitmaps.xml
Lines changed: 4 additions & 0 deletions
diff --git a/‎resources-approachs7042mm/images/MoveToBeActive.png
6.16 KB b/‎resources-approachs7042mm/images/MoveToBeActive.png
6.16 KB
diff --git a/‎resources-approachs7042mm/images/garmin5.png
4.11 KB b/‎resources-approachs7042mm/images/garmin5.png
4.11 KB
diff --git a/‎resources-epix2pro47mm/bitmaps.xml
Lines changed: 4 additions & 0 deletions b/‎resources-epix2pro47mm/bitmaps.xml
Lines changed: 4 additions & 0 deletions
diff --git a/‎resources-epix2pro47mm/images/MoveToBeActive.png
5.77 KB b/‎resources-epix2pro47mm/images/MoveToBeActive.png
5.77 KB
diff --git a/‎settings/AnalogSettingsView.mc
Lines changed: 3 additions & 3 deletions b/‎settings/AnalogSettingsView.mc
Lines changed: 3 additions & 3 deletions
diff --git a/‎source/AnalogView.mc
Lines changed: 1 addition & 1 deletion b/‎source/AnalogView.mc
Lines changed: 1 addition & 1 deletion
diff --git a/‎source/MtbA_functions.mc
Lines changed: 7 additions & 1 deletion b/‎source/MtbA_functions.mc
Lines changed: 7 additions & 1 deletion
@@ -0,0 +1,4 @@
+<resources>
+    <bitmap id="LauncherIcon" filename="images/MoveToBeActive.png"
+    	dithering="none" />
+</resources>
@@ -0,0 +1,4 @@
+<resources>
+    <bitmap id="LauncherIcon" filename="images/MoveToBeActive.png"
+    	dithering="none" />
+</resources>
@@ -18,7 +18,7 @@ class AnalogSettingsViewTest extends WatchUi.Menu2 {
     function initialize() {
         Menu2.initialize(null);
 
-        var currentVersion=425;
+        var currentVersion=430;
         if (Storage.getValue(23)==null or Storage.getValue(23)<currentVersion){
             Storage.setValue(23,currentVersion);
 
@@ -101,8 +101,8 @@ class Menu2TestMenu2Delegate extends WatchUi.Menu2InputDelegate { // Sub-menu De
             } else if (item.getIcon() instanceof CustomThickness){ // Custom Thickness
                 item.setSubLabel((item.getIcon() as CustomThickness).nextState(item.getId()));
             }
-        } else if (item instanceof WatchUi.ToggleMenuItem) {
-            Storage.setValue(item.getId(), item.isEnabled());
+        } else if (item instanceof WatchUi.ToggleMenuItem and item.getId() instanceof Number) {
+            Storage.setValue(item.getId() as Number, item.isEnabled());
         }
 
         WatchUi.requestUpdate(); // really needed?
 
@@ -43,7 +43,7 @@ class AnalogView extends WatchUi.WatchFace
             }
         }
 
-        var currentVersion=425;
+        var currentVersion=430;
 
         if (Storage.getValue(23)==null or Storage.getValue(23)<currentVersion){
             //Storage.setValue(23,currentVersion);
 
@@ -1695,7 +1695,12 @@ class MtbA_functions {
 					clockTime.hour = 12;
 				}
 			}
-			seconds = clockTime.hour.format("%02d") + ":" + clockTime.min.format("%02d");
+			seconds = clockTime.hour.format("%2d") + ":" + clockTime.min.format("%02d");
+			if (clockTime.hour < 10 and clockTime.hour > 0 and width>=240){
+				xText=xText-(dc.getTextDimensions(clockTime.hour.format("%2d"),fontSize)[0])/2;
+			} else {
+				xText=xText-(dc.getTextDimensions("1",fontSize)[0])/2;
+			}
 		}
 
 		// placeholder for implementation of Partial Update
@@ -1731,6 +1736,7 @@ class MtbA_functions {
 		dc.drawText(xText, yText,	fontSize, seconds, Graphics.TEXT_JUSTIFY_LEFT);
 
 		if (type==2){ //digital clock
+			//dc.drawText(xText + dc.getTextWidthInPixels(seconds,fontSize), yText + fontSize*((dc.getFontHeight(Graphics.FONT_TINY)-dc.getFontHeight(Graphics.FONT_XTINY))*0.9 - (width>=360 ? 1 : 0)),	0, am_pm, Graphics.TEXT_JUSTIFY_LEFT);
 			dc.drawText(xText + dc.getTextWidthInPixels(seconds,fontSize), yText + fontSize*((dc.getFontHeight(Graphics.FONT_TINY)-dc.getFontHeight(Graphics.FONT_XTINY))*0.9 - (width>=360 ? 1 : 0)),	0, am_pm, Graphics.TEXT_JUSTIFY_LEFT);
 		}
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ class AnalogView extends WatchUi.WatchFace`
`43`	`43`	`}`
`44`	`44`	`}`
`45`	`45`
`46`		`- var currentVersion=425;`
	`46`	`+ var currentVersion=430;`
`47`	`47`
`48`	`48`	`if (Storage.getValue(23)==null or Storage.getValue(23)<currentVersion){`
`49`	`49`	`//Storage.setValue(23,currentVersion);`
Original file line number	Diff line number	Diff line change
`@@ -1695,7 +1695,12 @@ class MtbA_functions {`
`1695`	`1695`	`clockTime.hour = 12;`
`1696`	`1696`	`}`
`1697`	`1697`	`}`
`1698`		`- seconds = clockTime.hour.format("%02d") + ":" + clockTime.min.format("%02d");`
	`1698`	`+ seconds = clockTime.hour.format("%2d") + ":" + clockTime.min.format("%02d");`
	`1699`	`+ if (clockTime.hour < 10 and clockTime.hour > 0 and width>=240){`
	`1700`	`+ xText=xText-(dc.getTextDimensions(clockTime.hour.format("%2d"),fontSize)[0])/2;`
	`1701`	`+ } else {`
	`1702`	`+ xText=xText-(dc.getTextDimensions("1",fontSize)[0])/2;`
	`1703`	`+ }`
`1699`	`1704`	`}`
`1700`	`1705`
`1701`	`1706`	`// placeholder for implementation of Partial Update`
`@@ -1731,6 +1736,7 @@ class MtbA_functions {`
`1731`	`1736`	`dc.drawText(xText, yText, fontSize, seconds, Graphics.TEXT_JUSTIFY_LEFT);`
`1732`	`1737`
`1733`	`1738`	`if (type==2){ //digital clock`
	`1739`	`+ //dc.drawText(xText + dc.getTextWidthInPixels(seconds,fontSize), yText + fontSize((dc.getFontHeight(Graphics.FONT_TINY)-dc.getFontHeight(Graphics.FONT_XTINY))0.9 - (width>=360 ? 1 : 0)), 0, am_pm, Graphics.TEXT_JUSTIFY_LEFT);`
`1734`	`1740`	`dc.drawText(xText + dc.getTextWidthInPixels(seconds,fontSize), yText + fontSize((dc.getFontHeight(Graphics.FONT_TINY)-dc.getFontHeight(Graphics.FONT_XTINY))0.9 - (width>=360 ? 1 : 0)), 0, am_pm, Graphics.TEXT_JUSTIFY_LEFT);`
`1735`	`1741`	`}`
`1736`	`1742`