From 45f0d9880c8bbd8fd58dd8b487b11ad3286a1c3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Milants?= <jf@codingfield.com>
Date: Sun, 25 Feb 2024 16:11:30 +0100
Subject: [PATCH] Code cleaning : Split displayapp/apps/Apps.h.in into 2 files
 : Apps.h and WatchFaces.h

---
 src/components/settings/Settings.h            |  1 +
 src/displayapp/apps/Apps.h.in                 | 21 --------------
 src/displayapp/apps/CMakeLists.txt            |  1 +
 src/displayapp/apps/WatchFaces.h.in           | 28 +++++++++++++++++++
 src/displayapp/screens/WatchFaceAnalog.h      |  2 ++
 .../screens/WatchFaceCasioStyleG7710.h        |  2 +-
 src/displayapp/screens/WatchFaceDigital.h     |  3 +-
 src/displayapp/screens/WatchFaceInfineat.h    |  2 +-
 src/displayapp/screens/WatchFaceTerminal.h    |  1 +
 9 files changed, 37 insertions(+), 24 deletions(-)
 create mode 100644 src/displayapp/apps/WatchFaces.h.in

diff --git a/src/components/settings/Settings.h b/src/components/settings/Settings.h
index 06312077..f53cdd74 100644
--- a/src/components/settings/Settings.h
+++ b/src/components/settings/Settings.h
@@ -4,6 +4,7 @@
 #include "components/brightness/BrightnessController.h"
 #include "components/fs/FS.h"
 #include "displayapp/apps/Apps.h"
+#include "displayapp/apps/WatchFaces.h"
 
 namespace Pinetime {
   namespace Controllers {
diff --git a/src/displayapp/apps/Apps.h.in b/src/displayapp/apps/Apps.h.in
index 2104a267..91d498c8 100644
--- a/src/displayapp/apps/Apps.h.in
+++ b/src/displayapp/apps/Apps.h.in
@@ -45,35 +45,14 @@ namespace Pinetime {
       Error
     };
 
-    enum class WatchFace : uint8_t {
-      Digital,
-      Analog,
-      PineTimeStyle,
-      Terminal,
-      Infineat,
-      CasioStyleG7710,
-    };
-
     template <Apps>
     struct AppTraits {};
 
-    template <WatchFace>
-    struct WatchFaceTraits {};
-
     template <Apps... As>
     struct TypeList {
       static constexpr size_t Count = sizeof...(As);
     };
 
     using UserAppTypes = TypeList<@USERAPP_TYPES@>;
-
-    template <WatchFace... Ws>
-    struct WatchFaceTypeList {
-      static constexpr size_t Count = sizeof...(Ws);
-    };
-
-    using UserWatchFaceTypes = WatchFaceTypeList<@WATCHFACE_TYPES@>;
-
-    static_assert(UserWatchFaceTypes::Count >= 1);
   }
 }
diff --git a/src/displayapp/apps/CMakeLists.txt b/src/displayapp/apps/CMakeLists.txt
index d7858760..ec5f3696 100644
--- a/src/displayapp/apps/CMakeLists.txt
+++ b/src/displayapp/apps/CMakeLists.txt
@@ -36,3 +36,4 @@ target_include_directories(infinitime_apps INTERFACE "${CMAKE_CURRENT_BINARY_DIR
 
 # Generate the list of user apps to be compiled into the firmware
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Apps.h.in ${CMAKE_CURRENT_BINARY_DIR}/Apps.h)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/WatchFaces.h.in ${CMAKE_CURRENT_BINARY_DIR}/WatchFaces.h)
diff --git a/src/displayapp/apps/WatchFaces.h.in b/src/displayapp/apps/WatchFaces.h.in
new file mode 100644
index 00000000..60cc61c2
--- /dev/null
+++ b/src/displayapp/apps/WatchFaces.h.in
@@ -0,0 +1,28 @@
+#pragma once
+#include <cstddef>
+#include <cstdint>
+
+namespace Pinetime {
+  namespace Applications {
+    enum class WatchFace : uint8_t {
+      Digital,
+      Analog,
+      PineTimeStyle,
+      Terminal,
+      Infineat,
+      CasioStyleG7710,
+    };
+
+    template <WatchFace T>
+    struct WatchFaceTraits {};
+
+    template <WatchFace... Ws>
+    struct WatchFaceTypeList {
+      static constexpr size_t Count = sizeof...(Ws);
+    };
+
+    using UserWatchFaceTypes = WatchFaceTypeList<@WATCHFACE_TYPES@>;
+
+    static_assert(UserWatchFaceTypes::Count >= 1);
+  }
+}
diff --git a/src/displayapp/screens/WatchFaceAnalog.h b/src/displayapp/screens/WatchFaceAnalog.h
index 89ad4e13..75f45109 100644
--- a/src/displayapp/screens/WatchFaceAnalog.h
+++ b/src/displayapp/screens/WatchFaceAnalog.h
@@ -11,6 +11,8 @@
 #include "components/ble/NotificationManager.h"
 #include "displayapp/screens/BatteryIcon.h"
 #include "utility/DirtyValue.h"
+#include "displayapp/apps/WatchFaces.h"
+
 
 namespace Pinetime {
   namespace Controllers {
diff --git a/src/displayapp/screens/WatchFaceCasioStyleG7710.h b/src/displayapp/screens/WatchFaceCasioStyleG7710.h
index f10e931c..ff8e6715 100644
--- a/src/displayapp/screens/WatchFaceCasioStyleG7710.h
+++ b/src/displayapp/screens/WatchFaceCasioStyleG7710.h
@@ -10,7 +10,7 @@
 #include "components/datetime/DateTimeController.h"
 #include "components/ble/BleController.h"
 #include "utility/DirtyValue.h"
-#include "displayapp/apps/Apps.h"
+#include "displayapp/apps/WatchFaces.h"
 
 namespace Pinetime {
   namespace Controllers {
diff --git a/src/displayapp/screens/WatchFaceDigital.h b/src/displayapp/screens/WatchFaceDigital.h
index 3ff78c8a..6b80df6e 100644
--- a/src/displayapp/screens/WatchFaceDigital.h
+++ b/src/displayapp/screens/WatchFaceDigital.h
@@ -10,7 +10,8 @@
 #include "components/ble/BleController.h"
 #include "displayapp/widgets/StatusIcons.h"
 #include "utility/DirtyValue.h"
-#include "displayapp/apps/Apps.h"
+#include "displayapp/apps/WatchFaces.h"
+
 
 namespace Pinetime {
   namespace Controllers {
diff --git a/src/displayapp/screens/WatchFaceInfineat.h b/src/displayapp/screens/WatchFaceInfineat.h
index 32c08f18..096489e7 100644
--- a/src/displayapp/screens/WatchFaceInfineat.h
+++ b/src/displayapp/screens/WatchFaceInfineat.h
@@ -8,7 +8,7 @@
 #include "displayapp/screens/Screen.h"
 #include "components/datetime/DateTimeController.h"
 #include "utility/DirtyValue.h"
-#include "displayapp/apps/Apps.h"
+#include "displayapp/apps/WatchFaces.h"
 
 namespace Pinetime {
   namespace Controllers {
diff --git a/src/displayapp/screens/WatchFaceTerminal.h b/src/displayapp/screens/WatchFaceTerminal.h
index ce22005f..c9686168 100644
--- a/src/displayapp/screens/WatchFaceTerminal.h
+++ b/src/displayapp/screens/WatchFaceTerminal.h
@@ -8,6 +8,7 @@
 #include "displayapp/screens/Screen.h"
 #include "components/datetime/DateTimeController.h"
 #include "utility/DirtyValue.h"
+#include "displayapp/apps/WatchFaces.h"
 
 namespace Pinetime {
   namespace Controllers {