Merge pull request #4 from sennescheepers/v1.2.0

V1.2.0

Author: sennescheepers

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="Forerunner55WatchFaceApp" id="eab8f76959b347b8896d87dca50d9498" launcherIcon="@Drawables.LauncherIcon" minApiLevel="1.2.1" name="@Strings.AppName" type="watchface" version="1.1.1">
+    <iq:application entry="Forerunner55WatchFaceApp" id="eab8f76959b347b8896d87dca50d9498" launcherIcon="@Drawables.LauncherIcon" minApiLevel="1.2.1" name="@Strings.AppName" type="watchface" version="1.2.0">
         <iq:products>
             <iq:product id="approachs60"/>
             <iq:product id="approachs62"/>

monkey.jungle

@@ -2,4 +2,9 @@ project.manifest = manifest.xml
 
 base.sourcePath = source
 
-round-208x208.resourcePath = $(base.resourcePath);resources-round-208x208
+# Smaller devices use smaller time font and no data fields
+round-208x208.resourcePath = $(round-208x208.resourcePath);resources-small-time;resources-no-datafields
+round-218x218.resourcePath = $(round-218x218.resourcePath);resources-small-time;resources-no-datafields
+
+round-208x208.excludeAnnotations = $(round-208x208.excludeAnnotations);buffered
+round-218x218.excludeAnnotations = $(round-218x218.excludeAnnotations);buffered

resources-no-datafields/settings/properties.xml

@@ -0,0 +1,7 @@
+<properties>
+
+	<!-- Screen too small, default to 0 -->
+	<property id="LeftDataField" type="number">0</property>
+	<property id="RightDataField" type="number">0</property>
+
+</properties>

resources-no-datafields/settings/settings.xml

@@ -0,0 +1,25 @@
+<settings>
+
+	<setting propertyKey="@Properties.LeftDataField" title="@Strings.LeftDataFieldTitle">
+        <settingConfig type="list">
+            <listEntry value="0">@Strings.EmptyTitle</listEntry>
+            <!-- <listEntry value="1">@Strings.HRTitle</listEntry> -->
+            <!-- <listEntry value="2">@Strings.StepsTitle</listEntry> -->
+            <!-- <listEntry value="3">@Strings.FloorsTitle</listEntry> -->
+            <!-- <listEntry value="4">@Strings.CaloriesTitle</listEntry> -->
+            <!-- <listEntry value="5">@Strings.DistanceTitle</listEntry> -->
+        </settingConfig>
+    </setting>
+    
+    <setting propertyKey="@Properties.RightDataField" title="@Strings.RightDataFieldTitle" >
+        <settingConfig type="list">
+            <listEntry value="0">@Strings.EmptyTitle</listEntry>
+            <!-- <listEntry value="1">@Strings.HRTitle</listEntry> -->
+            <!-- <listEntry value="2">@Strings.StepsTitle</listEntry> -->
+            <!-- <listEntry value="3">@Strings.FloorsTitle</listEntry> -->
+            <!-- <listEntry value="4">@Strings.CaloriesTitle</listEntry> -->
+            <!-- <listEntry value="5">@Strings.DistanceTitle</listEntry> -->
+        </settingConfig>
+	</setting>
+
+</settings>

…urces-round-208x208/fonts/big_filled.fnt resources-small-time/fonts/big_filled.fntresources-round-208x208/fonts/big_filled.fnt renamed to resources-small-time/fonts/big_filled.fnt resources-round-208x208/fonts/big_filled.fnt renamed to resources-small-time/fonts/big_filled.fnt

@@ -4,4 +4,8 @@
     <bitmap id="NotificationIcon" filename="notification_icon.png" />
     <bitmap id="DoNotDisturbIcon" filename="dnd_icon.png" />
     <bitmap id="AlarmIcon" filename="alarm_icon.png" />
+    <bitmap id="StepsIcon" filename="steps_icon.png" />
+    <bitmap id="HeartIcon" filename="heart_icon.png" />
+    <bitmap id="StairsIcon" filename="stairs_icon.png" />
+    <bitmap id="FireIcon" filename="fire_icon.png" />
 </drawables>