Version 1.18

gcormier9 · May 23, 2019 · 0670d17 · 0670d17
1 parent 7ccde85
commit 0670d17
Show file tree

Hide file tree

Showing 8 changed files with 131 additions and 1,865 deletions.
diff --git a/README.md b/README.md
@@ -4,6 +4,13 @@ Configurable Garmin Watch datafield
 ![GRun Cover Image](/doc/GRunWatch.png) 
 
 ## Release Notes
+### Version 1.18
+ - Added Training Effect on supported devices (Fenix 5, Fenix 5s, Fenix 5x, Fenix 5x Plus, Fenix Chronos, Forerunnner 645, Forerunnner 645 Music, Forerunnner 935, Edge 1030, Edge 520 Plus)
+ - Add a parameter to correct distance on lap. Distance is rounded to the nearest "Lap Distance".
+ - Add a parameter to set "Header Height" in pixel. This allow to completely hide headers to maximize space.
+ - Code improvement to optimize memory
+ - Code Framework using Jungles to implement features for specific devices (Example: Training Effect)
+
 ### Version 1.17
  - Added options to display Header background or data foreground in color
  - Area 4a/4b and 5 can be shrinked together if one of them is empty

diff --git a/manifest.xml b/manifest.xml
@@ -1,4 +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">
+<!-- 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="GRunApp" id="330ea7d24e114df0bebf05b1dcb74788" launcherIcon="@Drawables.LauncherIcon" minSdkVersion="3.0.0" name="@Strings.AppName" type="datafield" version="1.0.0">
         <iq:products>
             <iq:product id="d2charlie"/>

diff --git a/monkey.jungle b/monkey.jungle
@@ -1 +1,68 @@
 project.manifest = manifest.xml
+
+# Source Files
+#######################################################
+# Default used low memory
+base.sourcePath = source;source-lowmem
+
+# High Memory (124.7 KB)
+d2charlie.sourcePath = source;source-highmem
+d2delta.sourcePath = source;source-highmem
+d2deltapx.sourcePath = source;source-highmem
+d2deltas.sourcePath = source;source-highmem
+edge1030.sourcePath = source;source-highmem
+edge1030bontrager.sourcePath = source;source-highmem
+edge520plus.sourcePath = source;source-highmem
+edgeexplore.sourcePath = source;source-highmem
+fenix5plus.sourcePath = source;source-highmem
+fenix5splus.sourcePath = source;source-highmem
+fenix5x.sourcePath = source;source-highmem
+fenix5xplus.sourcePath = source;source-highmem
+
+# High Memory (60.7 KB)
+fr645m.sourcePath = source;source-highmem
+
+# Low Memory (28.7 KB)
+#edge130.sourcePath = source;source-lowmem
+#fenix5.sourcePath = source;source-lowmem
+fenix5s.sourcePath = source;source-fenix5s
+fenixchronos.sourcePath = source;source-fenixchronos
+#fr645.sourcePath = source;source-lowmem
+#fr935.sourcePath = source;source-lowmem
+#vivoactive3.sourcePath = source;source-lowmem
+#vivoactive3m.sourcePath = source;source-lowmem
+
+# Resource Files
+#######################################################
+base.resourcePath = resources
+
+# High Memory (124.7 KB) without "Training Effect" support
+d2charlie.resourcePath = resources;resources-highmem
+d2delta.resourcePath = resources;resources-highmem
+d2deltapx.resourcePath = resources;resources-highmem
+d2deltas.resourcePath = resources;resources-highmem
+edgeexplore.resourcePath = resources;resources-highmem
+fenix5plus.resourcePath = resources;resources-highmem
+fenix5splus.resourcePath = resources;resources-highmem
+
+# High Memory (124.7 KB) with "Training Effect" support
+edge1030.resourcePath = resources;resources-highmem-te
+edge1030bontrager.resourcePath = resources;resources-highmem-te
+edge520plus.resourcePath = resources;resources-highmem-te
+fenix5x.resourcePath = resources;resources-highmem-te
+fenix5xplus.resourcePath = resources;resources-highmem-te
+
+# High Memory (60.7 KB) with "Training Effect" support
+fr645m.resourcePath = resources;resources-highmem-te
+
+# Low Memory (28.7 KB) without "Training Effect" support
+#edge130.resourcePath = resources;resources-edge130
+#vivoactive3.resourcePath = resources;resources-vivoactive3
+#vivoactive3m.resourcePath = resources;resources-vivoactive3m
+
+# Low Memory (28.7 KB) with "Training Effect" support
+fenix5.resourcePath = resources;resources-lowmem-te
+fenix5s.resourcePath = resources;resources-lowmem-te
+fenixchronos.resourcePath = resources;resources-lowmem-te
+fr645.resourcePath = resources;resources-lowmem-te
+fr935.resourcePath = resources;resources-lowmem-te
diff --git a/resources/drawables/drawables.xml b/resources/drawables/drawables.xml
@@ -1,3 +1,33 @@
 <drawables>
     <bitmap id="LauncherIcon" filename="launcher_icon.png" />
+    <bitmap id="GPS0" filename="gps0.png" dithering="none">
+        <palette disableTransparency="false">
+            <color>555555</color>
+            <color>FF0000</color>
+        </palette>
+    </bitmap>
+    <bitmap id="GPS1" filename="gps1.png" dithering="none">
+        <palette disableTransparency="false">
+            <color>555555</color>
+            <color>FF0000</color>
+        </palette>
+    </bitmap>
+    <bitmap id="GPS2" filename="gps2.png" dithering="none">
+        <palette disableTransparency="false">
+            <color>555555</color>
+            <color>FF5500</color>
+        </palette>
+    </bitmap>
+    <bitmap id="GPS3" filename="gps3.png" dithering="none">
+        <palette disableTransparency="false">
+            <color>555555</color>
+            <color>FFAA00</color>
+        </palette>
+    </bitmap>
+    <bitmap id="GPS4" filename="gps4.png" dithering="none">
+        <palette disableTransparency="false">
+            <color>555555</color>
+            <color>00AA00</color>
+        </palette>
+    </bitmap>
 </drawables>
diff --git a/resources/settings/properties.xml b/resources/settings/properties.xml
@@ -1,11 +1,13 @@
 <properties>
-	<property id="AppVersion" type="string">1.17</property>
-	<property id="HeaderPosition" type="number">1</property>
-	<property id="MinPace" type="number">315</property>
-	<property id="MaxPace" type="number">345</property>
-	<property id="MiddleColumnPercentageSize" type="number">75</property>
-	<property id="HeaderBackgroundColor" type="boolean">true</property>
-	<property id="DataForegroundColor" type="boolean">false</property>
+  <property id="AppVersion" type="string">1.18.10</property>
+  <property id="HeaderPosition" type="number">1</property>
+  <property id="HeaderHeight" type="number">22</property>
+  <property id="LapDistance" type="number">1000</property>
+  <property id="MinPace" type="number">315</property>
+  <property id="MaxPace" type="number">345</property>
+  <property id="MiddleColumnPercentageSize" type="number">75</property>
+  <property id="HeaderBackgroundColor" type="boolean">true</property>
+  <property id="DataForegroundColor" type="boolean">false</property>
   <property id="Area1" type="number">6</property>
   <property id="Area2" type="number">4</property>
   <property id="Area3" type="number">14</property>

diff --git a/resources/settings/settings.xml b/resources/settings/settings.xml
@@ -11,6 +11,14 @@
     </settingConfig>
   </setting>
 
+  <setting propertyKey="@Properties.HeaderHeight" title="@Strings.PARAM_HEADER_HEIGHT">
+    <settingConfig type="numeric" min="0" max="30" />
+  </setting>
+
+  <setting propertyKey="@Properties.LapDistance" title="@Strings.PARAM_LAP_DISTANCE">
+    <settingConfig type="numeric" min="0" />
+  </setting>
+
   <setting propertyKey="@Properties.MinPace" title="@Strings.PARAM_MIN_PACE">
     <settingConfig type="numeric" min="0" />
   </setting>

diff --git a/resources/strings/strings.xml b/resources/strings/strings.xml
@@ -1,17 +1,18 @@
 <strings>
   <string id="AppName">GRun</string>
   <string id="PARAM_APP_VERSION">GRun Version</string>
-  <string id="DeviceModel">Unknown</string>
 
   <string id="PARAM_HEADER_POSITION">Header Position</string>
-  <string id="PARAM_HEADER_POSITION_PROMPT">Header Position TEST</string>
   <string id="PARAM_HEADER_POSITION_1">Top / Top</string>
   <string id="PARAM_HEADER_POSITION_2">Top / Bottom</string>
   <string id="PARAM_HEADER_POSITION_3">Bottom / Top</string>
 
-  <string id="PARAM_MIN_PACE">Minimum Pace (in seconds)</string>
-  <string id="PARAM_MAX_PACE">Maximum Pace (in seconds)</string>
-  <string id="PARAM_MIDDLE_COLUMN_PERCENTAGE_SIZE">Middle Column Percentage Size</string>
+  <string id="PARAM_HEADER_HEIGHT">Header Height in pixels [0 to hide headers, Min Value=0, Max Value=30]</string>
+  <string id="PARAM_LAP_DISTANCE">Lap Distance [Auto correct distance when lap button is pressed (0=disable, 1000=1km, 1609=1mile)]</string>
+
+  <string id="PARAM_MIN_PACE">Minimum Pace (Fastest) (in seconds)</string>
+  <string id="PARAM_MAX_PACE">Maximum Pace (Slowest) (in seconds)</string>
+  <string id="PARAM_MIDDLE_COLUMN_PERCENTAGE_SIZE">Middle Column Percentage Size [Make middle column larger (&gt; 100) or smaller (&lt; 100) than left/right columns]</string>
 
   <string id="PARAM_HEADER_BACKGROUND_COLOR">Header Background Color</string>
   <string id="PARAM_DATA_FOREGROUND_COLOR">Data Foreground Color</string>
@@ -39,11 +40,12 @@
   <string id="Field20">GPS Icon and Battery Icon</string>
   <string id="Field21">ETA 5K</string>
   <string id="Field22">ETA 10K</string>
-  <string id="Field23">ETA Half Marathon (21.075.5 km)</string>
+  <string id="Field23">ETA Half Marathon (21.0975 km)</string>
   <string id="Field24">ETA Marathon (42.195 km)</string>
   <string id="Field25">Lap Time</string>
   <string id="Field26">Lap Distance</string>
   <string id="Field27">Lap Pace</string>
+  <string id="Field28">Training Effect</string>
 
   <string id="PARAM_AREA1">Field 1</string>
   <string id="PARAM_AREA2">Field 2A</string>