InfiniTime.git

commit 8c35c3c3d4ea0a5dea3be75928d4cacf87ca6cf6

Author: Akseli Lahtinen <akselmo@akselmo.dev>

add pink color

 src/components/settings/Settings.h | 5 +++--
 src/displayapp/Colors.cpp | 4 +++-
 src/displayapp/screens/WatchFacePineTimeStyle.cpp | 6 +++---


diff --git a/src/components/settings/Settings.h b/src/components/settings/Settings.h
index 478408f64754fbe874af0a048d9bf003d73808a5..c5c94e5a43d182cd98eef6a1afcee1dc03451653 100644
--- a/src/components/settings/Settings.h
+++ b/src/components/settings/Settings.h
@@ -34,7 +34,8 @@         Blue,
         Navy,
         Magenta,
         Purple,
-        Orange
+        Orange,
+        Pink
       };
       struct PineTimeStyle {
         Colors ColorTime = Colors::Teal;
@@ -245,4 +246,4 @@       void LoadSettingsFromFile();
       void SaveSettingsToFile();
     };
   }
-}
+}
\ No newline at end of file




diff --git a/src/displayapp/Colors.cpp b/src/displayapp/Colors.cpp
index 106c516396879eb0b67d18b5dadd2d13e2da2fe8..072432ae059b6ab59a5c33cd82f52b9ca923aec5 100644
--- a/src/displayapp/Colors.cpp
+++ b/src/displayapp/Colors.cpp
@@ -39,7 +39,9 @@     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;
   }
-}
+}
\ No newline at end of file




diff --git a/src/displayapp/screens/WatchFacePineTimeStyle.cpp b/src/displayapp/screens/WatchFacePineTimeStyle.cpp
index 0d2e2ab297267348fb19c78baf77f577049de3f7..2df1c0a29f52e97e9f46fb1d48c54ade23264055 100644
--- a/src/displayapp/screens/WatchFacePineTimeStyle.cpp
+++ b/src/displayapp/screens/WatchFacePineTimeStyle.cpp
@@ -579,7 +579,7 @@
 Pinetime::Controllers::Settings::Colors WatchFacePineTimeStyle::GetNext(Pinetime::Controllers::Settings::Colors color) {
   auto colorAsInt = static_cast<uint8_t>(color);
   Pinetime::Controllers::Settings::Colors nextColor;
-  if (colorAsInt < 16) {
+  if (colorAsInt < 17) {
     nextColor = static_cast<Controllers::Settings::Colors>(colorAsInt + 1);
   } else {
     nextColor = static_cast<Controllers::Settings::Colors>(0);
@@ -594,7 +594,7 @@
   if (colorAsInt > 0) {
     prevColor = static_cast<Controllers::Settings::Colors>(colorAsInt - 1);
   } else {
-    prevColor = static_cast<Controllers::Settings::Colors>(16);
+    prevColor = static_cast<Controllers::Settings::Colors>(17);
   }
   return prevColor;
-}
+}
\ No newline at end of file