From 020a7fd11d1b18fd7ac29ccc00b9c6f6e0cdb17b Mon Sep 17 00:00:00 2001 From: Max Friedrich Date: Sun, 30 Apr 2023 17:03:46 +0200 Subject: Refactor watch face to enum (#1339) change watch face from int to enum --------- Co-authored-by: minacode --- src/displayapp/screens/Clock.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'src/displayapp/screens/Clock.cpp') diff --git a/src/displayapp/screens/Clock.cpp b/src/displayapp/screens/Clock.cpp index a03dc68b..ce70f23f 100644 --- a/src/displayapp/screens/Clock.cpp +++ b/src/displayapp/screens/Clock.cpp @@ -15,6 +15,7 @@ #include "displayapp/screens/WatchFaceCasioStyleG7710.h" using namespace Pinetime::Applications::Screens; +using namespace Pinetime::Applications; Clock::Clock(Controllers::DateTime& dateTimeController, const Controllers::Battery& batteryController, @@ -33,23 +34,23 @@ Clock::Clock(Controllers::DateTime& dateTimeController, motionController {motionController}, filesystem {filesystem}, screen {[this, &settingsController]() { - switch (settingsController.GetClockFace()) { - case 0: + switch (settingsController.GetWatchFace()) { + case WatchFace::Digital: return WatchFaceDigitalScreen(); break; - case 1: + case WatchFace::Analog: return WatchFaceAnalogScreen(); break; - case 2: + case WatchFace::PineTimeStyle: return WatchFacePineTimeStyleScreen(); break; - case 3: + case WatchFace::Terminal: return WatchFaceTerminalScreen(); break; - case 4: + case WatchFace::Infineat: return WatchFaceInfineatScreen(); break; - case 5: + case WatchFace::CasioStyleG7710: return WatchFaceCasioStyleG7710(); break; } -- cgit v1.2.3-70-g09d2