Fix some layout differences for FR935

breber · Nov 5, 2018 · 8fdf69e · 8fdf69e
1 parent 3de0925
commit 8fdf69e
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 10 deletions.
diff --git a/.settings/IQ_IDE.prefs b/.settings/IQ_IDE.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+project_manifest=manifest.xml
diff --git a/manifest.xml b/manifest.xml
@@ -1,11 +1,12 @@
 <!-- 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="0">
     <iq:application entry="InlineSkatingApp" id="b43288c8b28f47f8b8847b0a2b0ca0cb" launcherIcon="@Drawables.LauncherIcon" minSdkVersion="1.2.0" name="@Strings.AppName" type="watch-app">
         <iq:products>
+            <iq:product id="fr935"/>
             <iq:product id="vivoactive3"/>
         </iq:products>
         <iq:permissions>
-            <iq:uses-permission id="Positioning"/>
             <iq:uses-permission id="Fit"/>
+            <iq:uses-permission id="Positioning"/>
         </iq:permissions>
         <iq:languages>
             <iq:language>eng</iq:language>

diff --git a/monkey.jungle b/monkey.jungle
@@ -0,0 +1,2 @@
+project.manifest = manifest.xml
+
diff --git a/source/InlineSkatingView.mc b/source/InlineSkatingView.mc
@@ -169,31 +169,31 @@ class InlineSkatingView extends Ui.View {
             }
         }
 
-        var TOP_BOTTOM_FONT = Gfx.FONT_SYSTEM_NUMBER_MEDIUM;
+        var TOP_BOTTOM_FONT = Gfx.FONT_SYSTEM_MEDIUM;
         var TOP_BOTTOM_FONT_SIZE = dc.getFontHeight(TOP_BOTTOM_FONT);
 
         var LABEL_FONT = Gfx.FONT_SYSTEM_XTINY;
         var LABEL_FONT_SIZE = dc.getFontHeight(LABEL_FONT);
 
-        var VALUE_FONT = Gfx.FONT_SYSTEM_NUMBER_HOT;
+        var VALUE_FONT = Gfx.FONT_SYSTEM_NUMBER_MEDIUM;
 
         // timer
         dc.setColor(Gfx.COLOR_BLACK, Gfx.COLOR_BLACK);
-        dc.fillRectangle(0, 0, dc.getWidth(), TOP_BOTTOM_FONT_SIZE);
+        dc.fillRectangle(0, 0, dc.getWidth(), TOP_BOTTOM_FONT_SIZE * 1.2);
         dc.setColor(Gfx.COLOR_LT_GRAY, Gfx.COLOR_TRANSPARENT);
 
         if (isPaused) {
             dc.drawText(dc.getWidth() / 2, TOP_BOTTOM_FONT_SIZE * .2, Gfx.FONT_SYSTEM_MEDIUM, "Paused", Gfx.TEXT_JUSTIFY_CENTER);
         } else {
-            dc.drawText(dc.getWidth() / 2, 0, TOP_BOTTOM_FONT, timer, Gfx.TEXT_JUSTIFY_CENTER);
+            dc.drawText(dc.getWidth() / 2, TOP_BOTTOM_FONT_SIZE * .2, TOP_BOTTOM_FONT, timer, Gfx.TEXT_JUSTIFY_CENTER);
         }
 
         // distance
         dc.setColor(Gfx.COLOR_BLACK, Gfx.COLOR_TRANSPARENT);
-        dc.drawText(dc.getWidth() / 2, TOP_BOTTOM_FONT_SIZE, LABEL_FONT, "Distance", Gfx.TEXT_JUSTIFY_CENTER);
+        dc.drawText(dc.getWidth() / 2, TOP_BOTTOM_FONT_SIZE * 1.2, LABEL_FONT, "Distance", Gfx.TEXT_JUSTIFY_CENTER);
 
         dc.setColor(Gfx.COLOR_BLACK, Gfx.COLOR_TRANSPARENT);
-        dc.drawText(dc.getWidth() / 2, TOP_BOTTOM_FONT_SIZE, VALUE_FONT, distance, Gfx.TEXT_JUSTIFY_CENTER);
+        dc.drawText(dc.getWidth() / 2, TOP_BOTTOM_FONT_SIZE * 1.2 + LABEL_FONT_SIZE, VALUE_FONT, distance, Gfx.TEXT_JUSTIFY_CENTER);
 
         dc.setColor(Gfx.COLOR_BLACK, Gfx.COLOR_BLACK);
         dc.drawLine(0, dc.getHeight() / 2, dc.getWidth(), dc.getHeight() / 2);
@@ -202,15 +202,15 @@ class InlineSkatingView extends Ui.View {
         if (!isPaused) {
             // pace
             dc.drawText(dc.getWidth() / 2, dc.getHeight() / 2, LABEL_FONT, "Pace", Gfx.TEXT_JUSTIFY_CENTER);
-            dc.drawText(dc.getWidth() / 2, dc.getHeight() / 2, VALUE_FONT, pace, Gfx.TEXT_JUSTIFY_CENTER);
+            dc.drawText(dc.getWidth() / 2, dc.getHeight() / 2 + LABEL_FONT_SIZE, VALUE_FONT, pace, Gfx.TEXT_JUSTIFY_CENTER);
         } else {
             dc.drawText(dc.getWidth() / 2, dc.getHeight() / 2, LABEL_FONT, "Time", Gfx.TEXT_JUSTIFY_CENTER);
-            dc.drawText(dc.getWidth() / 2, dc.getHeight() / 2, VALUE_FONT, timer, Gfx.TEXT_JUSTIFY_CENTER);
+            dc.drawText(dc.getWidth() / 2, dc.getHeight() / 2 + LABEL_FONT_SIZE, VALUE_FONT, timer, Gfx.TEXT_JUSTIFY_CENTER);
         }
 
         // hr
         dc.setColor(Gfx.COLOR_BLACK, Gfx.COLOR_BLACK);
-        dc.fillRectangle(0, dc.getHeight() - TOP_BOTTOM_FONT_SIZE, dc.getWidth(), dc.getHeight());
+        dc.fillRectangle(0, dc.getHeight() - TOP_BOTTOM_FONT_SIZE * 1.2, dc.getWidth(), dc.getHeight());
         dc.setColor(Gfx.COLOR_LT_GRAY, Gfx.COLOR_TRANSPARENT);
         dc.drawText(dc.getWidth() / 2, dc.getHeight() - 1.15 * TOP_BOTTOM_FONT_SIZE, TOP_BOTTOM_FONT, heartRate, Gfx.TEXT_JUSTIFY_CENTER);