From 62bb6b51634b22410a96f1ca9cbe183d1e9c504c Mon Sep 17 00:00:00 2001
From: Avamander <avamander@gmail.com>
Date: Fri, 3 Dec 2021 16:28:17 +0200
Subject: Better cleanup, bugfixes and improvements in weather parsing. UI
 improvements

---
 src/displayapp/DisplayApp.cpp      | 7 ++++++-
 src/displayapp/screens/Weather.cpp | 8 ++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

(limited to 'src/displayapp')

diff --git a/src/displayapp/DisplayApp.cpp b/src/displayapp/DisplayApp.cpp
index 80155187..d45251b9 100644
--- a/src/displayapp/DisplayApp.cpp
+++ b/src/displayapp/DisplayApp.cpp
@@ -1,5 +1,6 @@
 #include "displayapp/DisplayApp.h"
 #include <libraries/log/nrf_log.h>
+#include <displayapp/screens/Weather.h>
 #include "displayapp/screens/HeartRate.h"
 #include "displayapp/screens/Motion.h"
 #include "displayapp/screens/Timer.h"
@@ -439,7 +440,8 @@ void DisplayApp::LoadApp(Apps app, DisplayApp::FullRefreshDirections direction)
       currentScreen = std::make_unique<Screens::Music>(this, systemTask->nimble().music());
       break;
     case Apps::Navigation:
-      currentScreen = std::make_unique<Screens::Navigation>(this, systemTask->nimble().navigation());
+      currentScreen = std::make_unique<Screens::Weather>(this, systemTask->nimble().weather());
+      // currentScreen = std::make_unique<Screens::Navigation>(this, systemTask->nimble().navigation());
       break;
     case Apps::HeartRate:
       currentScreen = std::make_unique<Screens::HeartRate>(this, heartRateController, *systemTask);
@@ -451,6 +453,9 @@ void DisplayApp::LoadApp(Apps app, DisplayApp::FullRefreshDirections direction)
     case Apps::Motion:
       currentScreen = std::make_unique<Screens::Motion>(this, motionController);
       break;
+    case Apps::Weather:
+      currentScreen = std::make_unique<Screens::Weather>(this, systemTask->nimble().weather());
+      break;
     case Apps::Steps:
       currentScreen = std::make_unique<Screens::Steps>(this, motionController, settingsController);
       break;
diff --git a/src/displayapp/screens/Weather.cpp b/src/displayapp/screens/Weather.cpp
index c9852ee1..d4241194 100644
--- a/src/displayapp/screens/Weather.cpp
+++ b/src/displayapp/screens/Weather.cpp
@@ -76,22 +76,22 @@ std::unique_ptr<Screen> Weather::CreateScreenTemperature() {
     // Do not use the data, it's invalid
     lv_label_set_text_fmt(label,
                           "#FFFF00 Temperature#\n\n"
-                          "#444444 %d#\n\n"
+                          "#444444 %.2f#°C \n\n"
                           "#444444 %d#\n\n"
                           "%d\n"
                           "%d\n",
-                          0,
+                          0.0f,
                           0,
                           0,
                           0);
   } else {
     lv_label_set_text_fmt(label,
                           "#FFFF00 Temperature#\n\n"
-                          "#444444 %hd%%#°C \n\n"
+                          "#444444 %.2f#°C \n\n"
                           "#444444 %hd#\n\n"
                           "%llu\n"
                           "%lu\n",
-                          current->temperature,
+                          current->temperature / 100.0f,
                           current->dewPoint,
                           current->timestamp,
                           current->expires);
-- 
cgit v1.2.3-70-g09d2