From 88bcead7360419541c3e468fee44c2a36038df84 Mon Sep 17 00:00:00 2001
From: Caleb Fontenot <foley2431@gmail.com>
Date: Wed, 24 Apr 2024 08:05:02 -0500
Subject: [PATCH] WARNING, BROKEN: sync changes

---
 src/displayapp/screens/.Weather.cpp.kate-swp | Bin 0 -> 298 bytes
 src/displayapp/screens/Weather.cpp           |  17 ++++++++---------
 2 files changed, 8 insertions(+), 9 deletions(-)
 create mode 100644 src/displayapp/screens/.Weather.cpp.kate-swp

diff --git a/src/displayapp/screens/.Weather.cpp.kate-swp b/src/displayapp/screens/.Weather.cpp.kate-swp
new file mode 100644
index 0000000000000000000000000000000000000000..0a1a26d269ca55538bee6c982d734671ce9daf1a
GIT binary patch
literal 298
zcmZQzU=Z?7EJ;-eE>A2_aLdd|RWQ;sU|?VnnP7JPpqt6`=?8uGOucw$p0M=usiwi6
zK$#jKjs{}Ja921#2E<QA@MA&zL<Bz$#4kbc<3aok1U~`9N7A1N;uj(0lR$h0G`<Id
xpA6L>1f*f^OF?!lZ+L2ANk(dsM`}(%Dw4q&AdOb8!3d)=;UX}@vVbDlt^i4WH5&i`

literal 0
HcmV?d00001

diff --git a/src/displayapp/screens/Weather.cpp b/src/displayapp/screens/Weather.cpp
index 5321b7cc..9036d7c1 100644
--- a/src/displayapp/screens/Weather.cpp
+++ b/src/displayapp/screens/Weather.cpp
@@ -1,4 +1,5 @@
 #include "displayapp/screens/Weather.h"
+#include "displayapp/WeatherHelper.h"
 #include <lvgl/lvgl.h>
 #include "components/ble/SimpleWeatherService.h"
 #include "components/datetime/DateTimeController.h"
@@ -10,6 +11,7 @@
 using namespace Pinetime::Applications::Screens;
 
 namespace {
+  /*
   lv_color_t TemperatureColor(int16_t temperature) {
     if (temperature <= 0) { // freezing
       return Colors::blue;
@@ -20,6 +22,7 @@ namespace {
     }
     return Colors::orange; // normal
   }
+  */
 
   uint8_t TemperatureStyle(int16_t temperature) {
     if (temperature <= 0) { // freezing
@@ -31,10 +34,6 @@ namespace {
     }
     return LV_TABLE_PART_CELL5; // normal
   }
-
-  int16_t RoundTemperature(int16_t temp) {
-    return temp = temp / 100 + (temp % 100 >= 50 ? 1 : 0);
-  }
 }
 
 Weather::Weather(Controllers::Settings& settingsController, Controllers::SimpleWeatherService& weatherService)
@@ -133,9 +132,9 @@ void Weather::Refresh() {
       }
       lv_label_set_text(icon, Symbols::GetSymbol(optCurrentWeather->iconId));
       lv_label_set_text(condition, Symbols::GetCondition(optCurrentWeather->iconId));
-      lv_label_set_text_fmt(temperature, "%d°%c", RoundTemperature(temp), tempUnit);
-      lv_label_set_text_fmt(minTemperature, "%d°", RoundTemperature(minTemp));
-      lv_label_set_text_fmt(maxTemperature, "%d°", RoundTemperature(maxTemp));
+      lv_label_set_text_fmt(temperature, "%d°%c", WeatherHelper::RoundTemperature(temp), tempUnit);
+      lv_label_set_text_fmt(minTemperature, "%d°", WeatherHelper::RoundTemperature(minTemp));
+      lv_label_set_text_fmt(maxTemperature, "%d°", WeatherHelper::RoundTemperature(maxTemp));
     } else {
       lv_label_set_text(icon, "");
       lv_label_set_text(condition, "");
@@ -165,8 +164,8 @@ void Weather::Refresh() {
         if (wday > 7) {
           wday -= 7;
         }
-        maxTemp = RoundTemperature(maxTemp);
-        minTemp = RoundTemperature(minTemp);
+        maxTemp = WeatherHelper::RoundTemperature(maxTemp);
+        minTemp = WeatherHelper::RoundTemperature(minTemp);
         const char* dayOfWeek = Controllers::DateTime::DayOfWeekShortToStringLow(static_cast<Controllers::DateTime::Days>(wday));
         lv_table_set_cell_value(forecast, 0, i, dayOfWeek);
         lv_table_set_cell_value(forecast, 1, i, Symbols::GetSymbol(optCurrentForecast->days[i].iconId));