Version 0.1.18

markdotai · markdotai · commit a827d7f3671d · 2020-04-04T14:58:24.000+01:00
Added Approach S62
SDK 3.1.8
diff --git a/.settings/IQ_IDE.prefs b/.settings/IQ_IDE.prefs
@@ -1,4 +1,4 @@
 eclipse.preferences.version=1
 project_compiler_options=
-project_jungle=monkey-face.jungle
-project_manifest=manifest-face.xml
+project_jungle=monkey-app.jungle
+project_manifest=manifest-app.xml
diff --git a/manifest-app.xml b/manifest-app.xml
@@ -1,6 +1,7 @@
 <!-- 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="myApp" id="6f732e4b486b4213b80366a105c44219" launcherIcon="@Drawables.LauncherIcon" minSdkVersion="3.0.0" name="@Strings.AppName" type="watch-app" version="0.1.17">
+    <iq:application entry="myApp" id="6f732e4b486b4213b80366a105c44219" launcherIcon="@Drawables.LauncherIcon" minSdkVersion="3.0.0" name="@Strings.AppName" type="watch-app" version="0.1.18">
         <iq:products>
+            <iq:product id="approachs62"/>
             <iq:product id="d2charlie"/>
             <iq:product id="d2delta"/>
             <iq:product id="d2deltapx"/>
@@ -40,6 +41,7 @@
             <iq:product id="vivoactive3m"/>
             <iq:product id="vivoactive3mlte"/>
             <iq:product id="vivoactive4"/>
+            <iq:product id="vivoactive4s"/>
         </iq:products>
         <iq:permissions>
             <iq:uses-permission id="Positioning"/>
diff --git a/manifest-face.xml b/manifest-face.xml
@@ -1,6 +1,7 @@
 <!-- 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="myApp" id="8d536c7547234aac8316482a57451748" launcherIcon="@Drawables.LauncherIcon" minSdkVersion="3.0.0" name="@Strings.AppName" type="watchface" version="0.1.17">
+    <iq:application entry="myApp" id="8d536c7547234aac8316482a57451748" launcherIcon="@Drawables.LauncherIcon" minSdkVersion="3.0.0" name="@Strings.AppName" type="watchface" version="0.1.18">
         <iq:products>
+            <iq:product id="approachs62"/>
             <iq:product id="d2charlie"/>
             <iq:product id="d2delta"/>
             <iq:product id="d2deltapx"/>
diff --git a/manifest-face2.xml b/manifest-face2.xml
@@ -1,6 +1,7 @@
 <!-- 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="myApp" id="31f3bd33f262492c8af669ee5c1a0294" launcherIcon="@Drawables.LauncherIcon" minSdkVersion="3.0.0" name="@Strings.AppName" type="watchface" version="0.1.17">
+    <iq:application entry="myApp" id="31f3bd33f262492c8af669ee5c1a0294" launcherIcon="@Drawables.LauncherIcon" minSdkVersion="3.0.0" name="@Strings.AppName" type="watchface" version="0.1.18">
         <iq:products>
+            <iq:product id="approachs62"/>
             <iq:product id="d2charlie"/>
             <iq:product id="d2delta"/>
             <iq:product id="d2deltapx"/>
diff --git a/monkey-app.jungle b/monkey-app.jungle
@@ -15,6 +15,16 @@ project.manifest = manifest-app.xml
 
 
 
+
+
+
+
+
+
+
+
+
+
 
 
 
diff --git a/monkey-face.jungle b/monkey-face.jungle
@@ -23,6 +23,14 @@ project.manifest = manifest-face.xml
 
 
 
+
+
+
+
+
+
+
+
 
 
 
diff --git a/monkey-face2.jungle b/monkey-face2.jungle
@@ -13,6 +13,12 @@ project.manifest = manifest-face2.xml
 
 
 
+
+
+
+
+
+
 
 
 
diff --git a/resources-approachs62/jsonData/jsonResources.xml b/resources-approachs62/jsonData/jsonResources.xml
@@ -0,0 +1,10 @@
+<jsonDataResources>
+
+	<jsonData id="id_editorSpecial">
+		[
+			true,		<!-- touch screen -->
+			false		<!-- smaller menu font -->
+		]
+	</jsonData>
+
+</jsonDataResources>
diff --git a/source/myView.mc b/source/myView.mc
@@ -4876,7 +4876,7 @@ class myView
 	        	col = secondColorIndex;		// second color
 	        }
 	        
-	        propSecondColorIndexArray[(i+ringAdjustIndex)%60] = col;
+	        propSecondColorIndexArray[(i+ringAdjustIndex)%60] = (col&0xFF);
 	    }
 
 		//this test code now works out exactly the same size as the original above!

-Original file line number
+Diff line change
++
++
++
++
++
++
++
++
++
++
Original file line number	Diff line number	Diff line change
`@@ -4876,7 +4876,7 @@ class myView`
`4876`	`4876`	`col = secondColorIndex; // second color`
`4877`	`4877`	`}`
`4878`	`4878`
`4879`		`- propSecondColorIndexArray[(i+ringAdjustIndex)%60] = col;`
	`4879`	`+ propSecondColorIndexArray[(i+ringAdjustIndex)%60] = (col&0xFF);`
`4880`	`4880`	`}`
`4881`	`4881`
`4882`	`4882`	`//this test code now works out exactly the same size as the original above!`