renamed ClockFace to WatchFace

InfiniTimeOrg · Nov 4, 2022 · 8161387 · 8161387
1 parent c6bc21f
commit 8161387
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/src/components/settings/Settings.h b/src/components/settings/Settings.h
@@ -61,14 +61,14 @@ namespace Pinetime {
       void Init();
       void SaveSettings();
 
-      void SetClockFace(Pinetime::Applications::WatchFace face) {
-        if (face != settings.clockFace) {
+      void SetWatchFace(Pinetime::Applications::WatchFace face) {
+        if (face != settings.watchFace) {
           settingsChanged = true;
         }
-        settings.clockFace = face;
+        settings.watchFace = face;
       };
-      Pinetime::Applications::WatchFace GetClockFace() const {
-        return settings.clockFace;
+      Pinetime::Applications::WatchFace GetWatchFace() const {
+        return settings.watchFace;
       };
 
       void SetChimeOption(ChimesOption chimeOption) {
@@ -264,7 +264,7 @@ namespace Pinetime {
         ClockType clockType = ClockType::H24;
         Notification notificationStatus = Notification::On;
 
-        Pinetime::Applications::WatchFace clockFace = Pinetime::Applications::WatchFace::Digital;
+        Pinetime::Applications::WatchFace watchFace = Pinetime::Applications::WatchFace::Digital;
         ChimesOption chimesOption = ChimesOption::None;
 
         PineTimeStyle PTS;

diff --git a/src/displayapp/screens/Clock.cpp b/src/displayapp/screens/Clock.cpp
@@ -37,7 +37,7 @@ Clock::Clock(DisplayApp* app,
     motionController {motionController},
     filesystem {filesystem},
     screen {[this, &settingsController]() {
-      switch (settingsController.GetClockFace()) {
+      switch (settingsController.GetWatchFace()) {
         case WatchFace::Digital:
           return WatchFaceDigitalScreen();
           break;

diff --git a/src/displayapp/screens/settings/SettingWatchFace.cpp b/src/displayapp/screens/settings/SettingWatchFace.cpp
@@ -1,6 +1,7 @@
 #include "displayapp/screens/settings/SettingWatchFace.h"
 #include <lvgl/lvgl.h>
 #include "displayapp/DisplayApp.h"
+#include "displayapp/WatchFaces.h"
 #include "displayapp/screens/CheckboxList.h"
 #include "displayapp/screens/Screen.h"
 #include "components/settings/Settings.h"