Support refactor watch face to enum

minacode · NeroBurner · commit 4f4f44651702 · 2023-05-01T21:07:55.000+02:00
Support for PR: InfiniTimeOrg/InfiniTime#1339
diff --git a/InfiniTime b/InfiniTime
@@ -1 +1 @@
-Subproject commit 40f7e1c7be6882e01058b5ccf64d5005c6105346
+Subproject commit 020a7fd11d1b18fd7ac29ccc00b9c6f6e0cdb17b
diff --git a/littlefs-do-main.cpp b/littlefs-do-main.cpp
@@ -535,15 +535,15 @@ int command_settings(const std::string &program_name, const std::vector<std::str
   settingsController.Init();
   using namespace Pinetime::Controllers;
   {
-    auto clockface = settingsController.GetClockFace();
+    auto clockface = settingsController.GetWatchFace();
     auto clockface_str = [](auto val) {
-      if (val == 0) return "Digital";
-      if (val == 1) return "Analog";
-      if (val == 2) return "PineTimeStyle";
-      if (val == 3) return "Terminal";
+      if (val == Pinetime::Applications::WatchFace::Digital) return "Digital";
+      if (val == Pinetime::Applications::WatchFace::Analog) return "Analog";
+      if (val == Pinetime::Applications::WatchFace::PineTimeStyle) return "PineTimeStyle";
+      if (val == Pinetime::Applications::WatchFace::Terminal) return "Terminal";
       return "unknown";
     }(clockface);
-    std::cout << "ClockFace: " << static_cast<int>(clockface) << " " << clockface_str << std::endl;
+    std::cout << "ClockFace: " << static_cast<uint32_t>(clockface) << " " << clockface_str << std::endl;
   }
   {
     auto chimes = settingsController.GetChimeOption();
diff --git a/main.cpp b/main.cpp
@@ -755,15 +755,15 @@ class Framework {
     void switch_to_screen(uint8_t screen_idx)
     {
       if (screen_idx == 1) {
-        settingsController.SetClockFace(0);
+        settingsController.SetWatchFace(Pinetime::Applications::WatchFace::Digital);
         displayApp.StartApp(Pinetime::Applications::Apps::Clock, Pinetime::Applications::DisplayApp::FullRefreshDirections::None);
       }
       else if (screen_idx == 2) {
-        settingsController.SetClockFace(1);
+        settingsController.SetWatchFace(Pinetime::Applications::WatchFace::Analog);
         displayApp.StartApp(Pinetime::Applications::Apps::Clock, Pinetime::Applications::DisplayApp::FullRefreshDirections::None);
       }
       else if (screen_idx == 3) {
-        settingsController.SetClockFace(2);
+        settingsController.SetWatchFace(Pinetime::Applications::WatchFace::PineTimeStyle);
         displayApp.StartApp(Pinetime::Applications::Apps::Clock, Pinetime::Applications::DisplayApp::FullRefreshDirections::None);
       }
       else if (screen_idx == 4) {

Original file line number	Diff line number	Diff line change
`@@ -755,15 +755,15 @@ class Framework {`
`755`	`755`	`void switch_to_screen(uint8_t screen_idx)`
`756`	`756`	`{`
`757`	`757`	`if (screen_idx == 1) {`
`758`		`- settingsController.SetClockFace(0);`
	`758`	`+ settingsController.SetWatchFace(Pinetime::Applications::WatchFace::Digital);`
`759`	`759`	`displayApp.StartApp(Pinetime::Applications::Apps::Clock, Pinetime::Applications::DisplayApp::FullRefreshDirections::None);`
`760`	`760`	`}`
`761`	`761`	`else if (screen_idx == 2) {`
`762`		`- settingsController.SetClockFace(1);`
	`762`	`+ settingsController.SetWatchFace(Pinetime::Applications::WatchFace::Analog);`
`763`	`763`	`displayApp.StartApp(Pinetime::Applications::Apps::Clock, Pinetime::Applications::DisplayApp::FullRefreshDirections::None);`
`764`	`764`	`}`
`765`	`765`	`else if (screen_idx == 3) {`
`766`		`- settingsController.SetClockFace(2);`
	`766`	`+ settingsController.SetWatchFace(Pinetime::Applications::WatchFace::PineTimeStyle);`
`767`	`767`	`displayApp.StartApp(Pinetime::Applications::Apps::Clock, Pinetime::Applications::DisplayApp::FullRefreshDirections::None);`
`768`	`768`	`}`
`769`	`769`	`else if (screen_idx == 4) {`