PhotoStyle Watch Face

src/CMakeLists.txt

@@ -422,6 +422,7 @@ list(APPEND SOURCE_FILES
         ## Watch faces
         displayapp/screens/WatchFaceAnalog.cpp
         displayapp/screens/WatchFaceDigital.cpp
+        displayapp/screens/WatchFacePhotoStyle.cpp
         displayapp/screens/WatchFaceInfineat.cpp
         displayapp/screens/WatchFaceTerminal.cpp
         displayapp/screens/WatchFacePineTimeStyle.cpp

src/components/settings/Settings.h

@@ -45,6 +45,16 @@ namespace Pinetime {
         PTSWeather weatherEnable = PTSWeather::Off;
       };
 
+      enum class ContentStyle : uint8_t { Off, Date, Steps, Battery, Heart, Weather };
+
+      struct WatchFacePhoto {
+        Colors ColorTime = Colors::White;
+        bool PhotoBackground = true;
+        Colors ColorBG = Colors::Black;
+        ContentStyle contentStyleTop = ContentStyle::Date;
+        ContentStyle contentStyleBottom = ContentStyle::Steps;
+      };
+
       struct WatchFaceInfineat {
         bool showSideCover = true;
         int colorIndex = 0;
@@ -112,6 +122,57 @@ namespace Pinetime {
         return settings.PTS.ColorBG;
       };
 
+      void SetPhotoFaceColorTime(Colors colorTime) {
+        if (colorTime != settings.watchFacePhoto.ColorTime)
+          settingsChanged = true;
+        settings.watchFacePhoto.ColorTime = colorTime;
+      };
+
+      Colors GetPhotoFaceColorTime() const {
+        return settings.watchFacePhoto.ColorTime;
+      };
+
+      void SetPhotoFaceColorBG(Colors colorBG) {
+        if (colorBG != settings.watchFacePhoto.ColorBG)
+          settingsChanged = true;
+        settings.watchFacePhoto.ColorBG = colorBG;
+      };
+
+      Colors GetPhotoFaceColorBG() const {
+        return settings.watchFacePhoto.ColorBG;
+      };
+
+      void SetPhotoFaceContentTop(ContentStyle contentStyle) {
+        if (contentStyle != settings.watchFacePhoto.contentStyleTop)
+          settingsChanged = true;
+        settings.watchFacePhoto.contentStyleTop = contentStyle;
+      };
+
+      ContentStyle GetPhotoFaceContentTop() const {
+        return settings.watchFacePhoto.contentStyleTop;
+      };
+
+      void SetPhotoFaceContentBottom(ContentStyle contentStyle) {
+        if (contentStyle != settings.watchFacePhoto.contentStyleBottom)
+          settingsChanged = true;
+        settings.watchFacePhoto.contentStyleBottom = contentStyle;
+      };
+
+      ContentStyle GetPhotoFaceContentBottom() const {
+        return settings.watchFacePhoto.contentStyleBottom;
+      };
+
+      void SetPhotoFaceShowPhoto(bool show) {
+        if (show != settings.watchFacePhoto.PhotoBackground) {
+          settings.watchFacePhoto.PhotoBackground = show;
+          settingsChanged = true;
+        }
+      };
+
+      bool GetPhotoFaceShowPhoto() const {
+        return settings.watchFacePhoto.PhotoBackground;
+      };
+
       void SetInfineatShowSideCover(bool show) {
         if (show != settings.watchFaceInfineat.showSideCover) {
           settings.watchFaceInfineat.showSideCover = show;
@@ -286,7 +347,7 @@ namespace Pinetime {
     private:
       Pinetime::Controllers::FS& fs;
 
-      static constexpr uint32_t settingsVersion = 0x0007;
+      static constexpr uint32_t settingsVersion = 0x0008;
 
       struct SettingsData {
         uint32_t version = settingsVersion;
@@ -304,6 +365,8 @@ namespace Pinetime {
 
         WatchFaceInfineat watchFaceInfineat;
 
+        WatchFacePhoto watchFacePhoto;
+
         std::bitset<5> wakeUpMode {0};
         uint16_t shakeWakeThreshold = 150;
 

src/displayapp/UserApps.h

@@ -9,6 +9,7 @@
 #include "displayapp/screens/Tile.h"
 #include "displayapp/screens/ApplicationList.h"
 #include "displayapp/screens/WatchFaceDigital.h"
+#include "displayapp/screens/WatchFacePhotoStyle.h"
 #include "displayapp/screens/WatchFaceAnalog.h"
 #include "displayapp/screens/WatchFaceCasioStyleG7710.h"
 #include "displayapp/screens/WatchFaceInfineat.h"

src/displayapp/apps/Apps.h.in

@@ -50,6 +50,7 @@ namespace Pinetime {
       Analog,
       PineTimeStyle,
       Terminal,
+      PhotoStyle,
       Infineat,
       CasioStyleG7710,
     };

src/displayapp/apps/CMakeLists.txt

@@ -24,6 +24,7 @@ else()
     set(DEFAULT_WATCHFACE_TYPES "WatchFace::Digital")
     set(DEFAULT_WATCHFACE_TYPES "${DEFAULT_WATCHFACE_TYPES}, WatchFace::Analog")
     set(DEFAULT_WATCHFACE_TYPES "${DEFAULT_WATCHFACE_TYPES}, WatchFace::PineTimeStyle")
+    set(DEFAULT_WATCHFACE_TYPES "${DEFAULT_WATCHFACE_TYPES}, WatchFace::PhotoStyle")
     set(DEFAULT_WATCHFACE_TYPES "${DEFAULT_WATCHFACE_TYPES}, WatchFace::Terminal")
     set(DEFAULT_WATCHFACE_TYPES "${DEFAULT_WATCHFACE_TYPES}, WatchFace::Infineat")
     set(DEFAULT_WATCHFACE_TYPES "${DEFAULT_WATCHFACE_TYPES}, WatchFace::CasioStyleG7710")