Merge pull request #21 from Wheellog/#20-bugfix

Fix of #20
Wheellog · Apr 29, 2021 · 5e519c0 · 5e519c0
2 parents c75cd47 + 92fd3df
commit 5e519c0
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/resources/fonts/tall.fnt b/resources/fonts/tall.fnt
@@ -12,3 +12,4 @@ char id=54   x=38    y=0     width=36    height=49    xoffset=1     yoffset=0
 char id=55   x=0     y=50    width=31    height=48    xoffset=3     yoffset=1     xadvance=38    page=0  chnl=15
 char id=56   x=75    y=0     width=36    height=49    xoffset=1     yoffset=0     xadvance=38    page=0  chnl=15
 char id=57   x=112   y=0     width=35    height=49    xoffset=1     yoffset=0     xadvance=38    page=0  chnl=15
+char id=46   x=100   y=50    width=35    height=49    xoffset=5     yoffset=1     xadvance=20    page=0  chnl=15
diff --git a/resources/fonts/tall.png b/resources/fonts/tall.png
diff --git a/source/view/homeView/HomeView.mc b/source/view/homeView/HomeView.mc
@@ -54,15 +54,15 @@ class HomeView extends WatchUi.View {
         cDrawables[:BatteryNumber].setText(Lang.format("$1$%", [WheelData.batteryPercentage]));
         cDrawables[:TemperatureNumber].setText(Lang.format("$1$°", [WheelData.temperature]));
         cDrawables[:BottomSubtitle].setText(WheelData.bottomSubtitle);
-        var currentSpeed = 0;
-        if (WheelData.currentSpeed < 10) {
-            currentSpeed = WheelData.currentSpeed;
+        var speedNumber = 0;
+        if (WheelData.currentSpeed.toNumber() >= 10) {
+            speedNumber = WheelData.currentSpeed.toNumber();
         } else {
-            currentSpeed = WheelData.currentSpeed / 10;
+            speedNumber = WheelData.currentSpeed.toFloat();
         }
-        cDrawables[:SpeedNumber].setText(currentSpeed.toString());
+        cDrawables[:SpeedNumber].setText(speedNumber.toString());
 
-        cDrawables[:SpeedArc].setValues(WheelData.currentSpeed, WheelData.maxDialSpeed);
+        cDrawables[:SpeedArc].setValues(WheelData.currentSpeed.toFloat(), WheelData.maxDialSpeed);
         cDrawables[:BatteryArc].setValues(WheelData.batteryPercentage, 100);
         cDrawables[:TemperatureArc].setValues(WheelData.temperature, 50);