Refactor Colors in unique place

Author: leroivi

src/components/settings/Settings.h

@@ -4,6 +4,7 @@
 #include "components/brightness/BrightnessController.h"
 #include "components/fs/FS.h"
 #include "displayapp/apps/Apps.h"
+#include "displayapp/Colors.h"
 
 namespace Pinetime {
   namespace Controllers {
@@ -14,33 +15,13 @@ namespace Pinetime {
       enum class Notification : uint8_t { On, Off, Sleep };
       enum class ChimesOption : uint8_t { None, Hours, HalfHours };
       enum class WakeUpMode : uint8_t { SingleTap = 0, DoubleTap = 1, RaiseWrist = 2, Shake = 3, LowerWrist = 4 };
-      enum class Colors : uint8_t {
-        White,
-        Silver,
-        Gray,
-        Black,
-        Red,
-        Maroon,
-        Yellow,
-        Olive,
-        Lime,
-        Green,
-        Cyan,
-        Teal,
-        Blue,
-        Navy,
-        Magenta,
-        Purple,
-        Orange,
-        Pink
-      };
       enum class PTSGaugeStyle : uint8_t { Full, Half, Numeric };
       enum class PTSWeather : uint8_t { On, Off };
 
       struct PineTimeStyle {
-        Colors ColorTime = Colors::Teal;
-        Colors ColorBar = Colors::Teal;
-        Colors ColorBG = Colors::Black;
+        Colors::Color ColorTime = Colors::Teal;
+        Colors::Color ColorBar = Colors::Teal;
+        Colors::Color ColorBG = Colors::Black;
         PTSGaugeStyle gaugeStyle = PTSGaugeStyle::Full;
         PTSWeather weatherEnable = PTSWeather::Off;
       };
@@ -82,33 +63,33 @@ namespace Pinetime {
         return settings.chimesOption;
       };
 
-      void SetPTSColorTime(Colors colorTime) {
+      void SetPTSColorTime(Colors::Color colorTime) {
         if (colorTime != settings.PTS.ColorTime)
           settingsChanged = true;
         settings.PTS.ColorTime = colorTime;
       };
 
-      Colors GetPTSColorTime() const {
+      Colors::Color GetPTSColorTime() const {
         return settings.PTS.ColorTime;
       };
 
-      void SetPTSColorBar(Colors colorBar) {
+      void SetPTSColorBar(Colors::Color colorBar) {
         if (colorBar != settings.PTS.ColorBar)
           settingsChanged = true;
         settings.PTS.ColorBar = colorBar;
       };
 
-      Colors GetPTSColorBar() const {
+      Colors::Color GetPTSColorBar() const {
         return settings.PTS.ColorBar;
       };
 
-      void SetPTSColorBG(Colors colorBG) {
+      void SetPTSColorBG(Colors::Color colorBG) {
         if (colorBG != settings.PTS.ColorBG)
           settingsChanged = true;
         settings.PTS.ColorBG = colorBG;
       };
 
-      Colors GetPTSColorBG() const {
+      Colors::Color GetPTSColorBG() const {
         return settings.PTS.ColorBG;
       };
 

src/displayapp/Colors.cpp

@@ -1,47 +1,10 @@
 #include "displayapp/Colors.h"
 
-using namespace Pinetime::Applications;
-using namespace Pinetime::Controllers;
+#include <limits>
 
-lv_color_t Pinetime::Applications::Convert(Pinetime::Controllers::Settings::Colors color) {
-  switch (color) {
-    case Pinetime::Controllers::Settings::Colors::White:
-      return LV_COLOR_WHITE;
-    case Pinetime::Controllers::Settings::Colors::Silver:
-      return LV_COLOR_SILVER;
-    case Pinetime::Controllers::Settings::Colors::Gray:
-      return LV_COLOR_GRAY;
-    case Pinetime::Controllers::Settings::Colors::Black:
-      return LV_COLOR_BLACK;
-    case Pinetime::Controllers::Settings::Colors::Red:
-      return LV_COLOR_RED;
-    case Pinetime::Controllers::Settings::Colors::Maroon:
-      return LV_COLOR_MAKE(0xb0, 0x0, 0x0);
-    case Pinetime::Controllers::Settings::Colors::Yellow:
-      return LV_COLOR_YELLOW;
-    case Pinetime::Controllers::Settings::Colors::Olive:
-      return LV_COLOR_MAKE(0xb0, 0xb0, 0x0);
-    case Pinetime::Controllers::Settings::Colors::Lime:
-      return LV_COLOR_LIME;
-    case Pinetime::Controllers::Settings::Colors::Green:
-      return LV_COLOR_MAKE(0x0, 0xb0, 0x0);
-    case Pinetime::Controllers::Settings::Colors::Cyan:
-      return LV_COLOR_CYAN;
-    case Pinetime::Controllers::Settings::Colors::Teal:
-      return LV_COLOR_MAKE(0x0, 0xb0, 0xb0);
-    case Pinetime::Controllers::Settings::Colors::Blue:
-      return LV_COLOR_BLUE;
-    case Pinetime::Controllers::Settings::Colors::Navy:
-      return LV_COLOR_MAKE(0x0, 0x0, 0xb0);
-    case Pinetime::Controllers::Settings::Colors::Magenta:
-      return LV_COLOR_MAGENTA;
-    case Pinetime::Controllers::Settings::Colors::Purple:
-      return LV_COLOR_MAKE(0xb0, 0x0, 0xb0);
-    case Pinetime::Controllers::Settings::Colors::Orange:
-      return LV_COLOR_ORANGE;
-    case Pinetime::Controllers::Settings::Colors::Pink:
-      return LV_COLOR_MAKE(0xFF, 0xAE, 0xC9);
-    default:
-      return LV_COLOR_WHITE;
-  }
+Colors::Color Colors::linear_gradient(Colors::Color startingColor, Colors::Color endingColor, uint8_t progress) {
+  constexpr decltype(progress) maxProgress = std::numeric_limits<decltype(progress)>::max();
+  return Colors::Color(((maxProgress - progress) * startingColor.red() + progress * endingColor.red()) / maxProgress,
+                       ((maxProgress - progress) * startingColor.green() + progress * endingColor.green()) / maxProgress,
+                       ((maxProgress - progress) * startingColor.blue() + progress * endingColor.blue()) / maxProgress);
 }

src/displayapp/Colors.h

@@ -1,10 +1,82 @@
 #pragma once
 
 #include <lvgl/src/lv_misc/lv_color.h>
-#include "components/settings/Settings.h"
 
-namespace Pinetime {
-  namespace Applications {
-    lv_color_t Convert(Controllers::Settings::Colors color);
-  }
-}
+namespace Colors {
+
+  enum Named : uint32_t {
+    White = 0xFFFFFF,
+    Silver = 0xC0C0C0,
+    LightGray = 0xB0B0B0,
+    Gray = 0x808080,
+    DarkGray = 0x1B1B1B,
+    Black = 0x000000,
+    Red = 0xFF0000,
+    Maroon = 0xB00000,
+    Yellow = 0xFFFF00,
+    Olive = 0xB0B000,
+    Lime = 0x00FF00,
+    Green = 0x00B000,
+    Cyan = 0x00FFFF,
+    Teal = 0x00B0B0,
+    Blue = 0x0000FF,
+    Navy = 0x0000B0,
+    Magenta = 0xFF00FF,
+    Purple = 0xB000B0,
+    Orange = 0xFFA500,
+    DeepOrange = 0xFF4000,
+    Pink = 0xFFAEC9,
+    Platinum = 0xE5E5E2,
+    Gold = 0xFFD700,
+    Copper = 0xB87333,
+    Violet = 0x6000FF,
+    Aqua = 0x00FFFF
+  };
+
+  class Color {
+  public:
+    constexpr Color(uint32_t color) {
+      data.hexcode = color;
+    }
+
+    operator uint32_t() const {
+      return data.hexcode;
+    }
+
+    constexpr Color(uint8_t r, uint8_t g, uint8_t b) {
+      data.argb.red = r;
+      data.argb.green = g;
+      data.argb.blue = b;
+    }
+
+    operator lv_color_t() const {
+      return lv_color_hex(data.hexcode);
+    }
+
+    uint8_t red() const {
+      return data.argb.red;
+    }
+
+    uint8_t green() const {
+      return data.argb.green;
+    }
+
+    uint8_t blue() const {
+      return data.argb.blue;
+    }
+
+  private:
+    union {
+      uint32_t hexcode = 0;
+
+      struct {
+        uint8_t blue = 0;
+        uint8_t green = 0;
+        uint8_t red = 0;
+        uint8_t alpha = 0;
+      } argb;
+    } data;
+  };
+
+  Color linear_gradient(Color startingColor, Color endingColor, uint8_t progress);
+}