changed colors for PineTimeStyle watchface

SadAlexa · Apr 21, 2024 · 07529e3 · 07529e3
1 parent 3105de0
commit 07529e3
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 30 deletions.
diff --git a/src/components/settings/Settings.h b/src/components/settings/Settings.h
@@ -19,20 +19,20 @@ namespace Pinetime {
         Silver,
         Gray,
         Black,
+        Rosewater,
+        Flamingo,
+        Pink,
+        Mauve,
         Red,
         Maroon,
+        Peach,
         Yellow,
-        Olive,
-        Lime,
         Green,
-        Cyan,
         Teal,
+        Sky,
+        Sapphire,
         Blue,
-        Navy,
-        Magenta,
-        Purple,
-        Orange,
-        Pink
+        Lavander,
       };
       enum class PTSGaugeStyle : uint8_t { Full, Half, Numeric };
       enum class PTSWeather : uint8_t { On, Off };

diff --git a/src/displayapp/Colors.cpp b/src/displayapp/Colors.cpp
@@ -1,4 +1,5 @@
 #include "displayapp/Colors.h"
+#include "displayapp/InfiniTimeTheme.h"
 
 using namespace Pinetime::Applications;
 using namespace Pinetime::Controllers;
@@ -13,34 +14,34 @@ lv_color_t Pinetime::Applications::Convert(Pinetime::Controllers::Settings::Colo
       return LV_COLOR_GRAY;
     case Pinetime::Controllers::Settings::Colors::Black:
       return LV_COLOR_BLACK;
+    case Pinetime::Controllers::Settings::Colors::Rosewater:
+      return Colors::rosewater;
+    case Pinetime::Controllers::Settings::Colors::Flamingo:
+      return Colors::flamingo;
+    case Pinetime::Controllers::Settings::Colors::Pink:
+      return Colors::pink;
+    case Pinetime::Controllers::Settings::Colors::Mauve:
+      return Colors::mauve;
     case Pinetime::Controllers::Settings::Colors::Red:
-      return LV_COLOR_RED;
+      return Colors::red;
     case Pinetime::Controllers::Settings::Colors::Maroon:
-      return LV_COLOR_MAKE(0xb0, 0x0, 0x0);
+      return Colors::maroon;
+    case Pinetime::Controllers::Settings::Colors::Peach:
+      return Colors::peach;
     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;
+      return Colors::yellow;
     case Pinetime::Controllers::Settings::Colors::Green:
-      return LV_COLOR_MAKE(0x0, 0xb0, 0x0);
-    case Pinetime::Controllers::Settings::Colors::Cyan:
-      return LV_COLOR_CYAN;
+      return Colors::green;
     case Pinetime::Controllers::Settings::Colors::Teal:
-      return LV_COLOR_MAKE(0x0, 0xb0, 0xb0);
+      return Colors::teal;
+    case Pinetime::Controllers::Settings::Colors::Sky:
+      return Colors::sky;
+    case Pinetime::Controllers::Settings::Colors::Sapphire:
+      return Colors::sapphire;
     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);
+      return Colors::blue;
+    case Pinetime::Controllers::Settings::Colors::Lavander:
+      return Colors::lavander;
     default:
       return LV_COLOR_WHITE;
   }