Create a Color function in SimpleWeatherService's Temperature class

Move the TemperatureColor function to SimpleWeatherService's Temperature class and rename it to Color for simple reuse across the code base.
InfiniTimeOrg · Dec 30, 2024 · 2a1f143 · 2a1f143
1 parent 1bdf756
commit 2a1f143
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 14 deletions.
diff --git a/src/components/ble/SimpleWeatherService.h b/src/components/ble/SimpleWeatherService.h
@@ -22,6 +22,9 @@
 #include <array>
 #include <memory>
 
+#include <lvgl/lvgl.h>
+#include "displayapp/InfiniTimeTheme.h"
+
 #define min // workaround: nimble's min/max macros conflict with libstdc++
 #define max
 #include <host/ble_gap.h>
@@ -86,6 +89,17 @@ namespace Pinetime {
           return raw == other.raw;
         }
 
+        [[nodiscard]] lv_color_t Color() const {
+          if (Celsius() <= 0) { // freezing
+            return Colors::blue;
+          } else if (Celsius() <= 4) { // ice
+            return LV_COLOR_CYAN;
+          } else if (Celsius() >= 27) { // hot
+            return Colors::deepOrange;
+          }
+          return Colors::orange; // normal
+        }
+
       private:
         int16_t raw;
       };

diff --git a/src/displayapp/screens/WatchFaceTerminal.cpp b/src/displayapp/screens/WatchFaceTerminal.cpp
@@ -15,19 +15,6 @@
 
 using namespace Pinetime::Applications::Screens;
 
-namespace {
-  lv_color_t TemperatureColor(Pinetime::Controllers::SimpleWeatherService::Temperature temp) {
-    if (temp.Celsius() <= 0) { // freezing
-      return Colors::blue;
-    } else if (temp.Celsius() <= 4) { // ice
-      return LV_COLOR_CYAN;
-    } else if (temp.Celsius() >= 27) { // hot
-      return Colors::deepOrange;
-    }
-    return Colors::orange; // normal
-  }
-}
-
 WatchFaceTerminal::WatchFaceTerminal(Controllers::DateTime& dateTimeController,
                                      const Controllers::Battery& batteryController,
                                      const Controllers::Ble& bleController,
@@ -177,7 +164,7 @@ void WatchFaceTerminal::Refresh() {
     if (optCurrentWeather) {
       int16_t temp = optCurrentWeather->temperature.Celsius();
       char tempUnit = 'C';
-      lv_obj_set_style_local_text_color(weather, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, TemperatureColor(optCurrentWeather->temperature));
+      lv_obj_set_style_local_text_color(weather, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, optCurrentWeather->temperature.Color());
       if (settingsController.GetWeatherFormat() == Controllers::Settings::WeatherFormat::Imperial) {
         temp = optCurrentWeather->temperature.Fahrenheit();
         tempUnit = 'F';