From fad61bdca79d34904d8cf8afe82ed79e6f699a23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Milants?= Date: Sat, 17 Aug 2024 22:25:33 +0200 Subject: [PATCH] Watchface : remove the Watchface enum Move all watch faces in their own folder, along with a CMake file that specify the name of the watch face, its namespace, the include file and sources files. --- src/CMakeLists.txt | 10 ++----- src/components/settings/Settings.h | 4 +-- src/displayapp/{apps => }/Apps.h.in | 0 src/displayapp/{apps => }/CMakeLists.txt | 29 ++++++++++--------- src/displayapp/DisplayApp.h | 2 +- src/displayapp/UserApps.h.in | 2 +- src/displayapp/{apps => }/WatchFaces.h.in | 0 src/displayapp/screens/Alarm.h | 2 +- src/displayapp/screens/Dice.h | 2 +- src/displayapp/screens/InfiniPaint.h | 2 +- src/displayapp/screens/Motion.h | 2 +- src/displayapp/screens/Music.h | 2 +- src/displayapp/screens/Navigation.h | 2 +- src/displayapp/screens/Paddle.h | 2 +- src/displayapp/screens/Steps.h | 2 +- src/displayapp/screens/StopWatch.h | 2 +- src/displayapp/screens/Twos.h | 2 +- src/displayapp/screens/Weather.h | 2 +- .../screens/settings/SettingWatchFace.h | 4 +-- src/displayapp/screens/settings/Settings.cpp | 2 +- .../watchfaces/analog/CMakeLists.txt | 4 +++ .../analog}/WatchFaceAnalog.cpp | 2 +- .../analog}/WatchFaceAnalog.h | 2 +- .../watchfaces/casioStyleG7710/CMakeLists.txt | 4 +++ .../WatchFaceCasioStyleG7710.cpp | 2 +- .../WatchFaceCasioStyleG7710.h | 2 +- .../watchfaces/digital/CMakeLists.txt | 4 +++ .../digital}/WatchFaceDigital.cpp | 2 +- .../digital}/WatchFaceDigital.h | 2 +- .../watchfaces/infineat/CMakeLists.txt | 4 +++ .../infineat}/WatchFaceInfineat.cpp | 2 +- .../infineat}/WatchFaceInfineat.h | 2 +- .../watchfaces/pinetimestyle/CMakeLists.txt | 4 +++ .../pinetimestyle}/WatchFacePineTimeStyle.cpp | 2 +- .../pinetimestyle}/WatchFacePineTimeStyle.h | 2 +- .../watchfaces/terminal/CMakeLists.txt | 4 +++ .../terminal}/WatchFaceTerminal.cpp | 2 +- .../terminal}/WatchFaceTerminal.h | 2 +- 38 files changed, 70 insertions(+), 53 deletions(-) rename src/displayapp/{apps => }/Apps.h.in (100%) rename src/displayapp/{apps => }/CMakeLists.txt (74%) rename src/displayapp/{apps => }/WatchFaces.h.in (100%) create mode 100644 src/displayapp/watchfaces/analog/CMakeLists.txt rename src/displayapp/{screens => watchfaces/analog}/WatchFaceAnalog.cpp (99%) rename src/displayapp/{screens => watchfaces/analog}/WatchFaceAnalog.h (98%) create mode 100644 src/displayapp/watchfaces/casioStyleG7710/CMakeLists.txt rename src/displayapp/{screens => watchfaces/casioStyleG7710}/WatchFaceCasioStyleG7710.cpp (99%) rename src/displayapp/{screens => watchfaces/casioStyleG7710}/WatchFaceCasioStyleG7710.h (99%) create mode 100644 src/displayapp/watchfaces/digital/CMakeLists.txt rename src/displayapp/{screens => watchfaces/digital}/WatchFaceDigital.cpp (99%) rename src/displayapp/{screens => watchfaces/digital}/WatchFaceDigital.h (99%) create mode 100644 src/displayapp/watchfaces/infineat/CMakeLists.txt rename src/displayapp/{screens => watchfaces/infineat}/WatchFaceInfineat.cpp (99%) rename src/displayapp/{screens => watchfaces/infineat}/WatchFaceInfineat.h (99%) create mode 100644 src/displayapp/watchfaces/pinetimestyle/CMakeLists.txt rename src/displayapp/{screens => watchfaces/pinetimestyle}/WatchFacePineTimeStyle.cpp (99%) rename src/displayapp/{screens => watchfaces/pinetimestyle}/WatchFacePineTimeStyle.h (99%) create mode 100644 src/displayapp/watchfaces/terminal/CMakeLists.txt rename src/displayapp/{screens => watchfaces/terminal}/WatchFaceTerminal.cpp (99%) rename src/displayapp/{screens => watchfaces/terminal}/WatchFaceTerminal.h (98%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index fd8ece62..00f56d10 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -28,6 +28,7 @@ endif () set(CMAKE_OSX_SYSROOT "/") set(CMAKE_OSX_DEPLOYMENT_TARGET "") +add_subdirectory(displayapp) set(SDK_SOURCE_FILES # Startup @@ -420,12 +421,7 @@ list(APPEND SOURCE_FILES displayapp/screens/settings/SettingBluetooth.cpp ## Watch faces - displayapp/screens/WatchFaceAnalog.cpp - displayapp/screens/WatchFaceDigital.cpp - displayapp/screens/WatchFaceInfineat.cpp - displayapp/screens/WatchFaceTerminal.cpp - displayapp/screens/WatchFacePineTimeStyle.cpp - displayapp/screens/WatchFaceCasioStyleG7710.cpp + ${WATCHFACE_SOURCES} ## @@ -848,8 +844,6 @@ target_compile_options(infinitime_fonts PUBLIC $<$: ${ASM_FLAGS}> ) -add_subdirectory(displayapp/apps) - # NRF SDK add_library(nrf-sdk STATIC ${SDK_SOURCE_FILES}) target_include_directories(nrf-sdk SYSTEM PUBLIC . ../) diff --git a/src/components/settings/Settings.h b/src/components/settings/Settings.h index 534a691c..a3a7a358 100644 --- a/src/components/settings/Settings.h +++ b/src/components/settings/Settings.h @@ -5,8 +5,8 @@ #include #include "components/brightness/BrightnessController.h" #include "components/fs/FS.h" -#include "displayapp/apps/Apps.h" -#include "displayapp/apps/WatchFaces.h" +#include "displayapp/Apps.h" +#include "displayapp/WatchFaces.h" namespace Pinetime { namespace Controllers { diff --git a/src/displayapp/apps/Apps.h.in b/src/displayapp/Apps.h.in similarity index 100% rename from src/displayapp/apps/Apps.h.in rename to src/displayapp/Apps.h.in diff --git a/src/displayapp/apps/CMakeLists.txt b/src/displayapp/CMakeLists.txt similarity index 74% rename from src/displayapp/apps/CMakeLists.txt rename to src/displayapp/CMakeLists.txt index c28cabdb..5f9b737b 100644 --- a/src/displayapp/apps/CMakeLists.txt +++ b/src/displayapp/CMakeLists.txt @@ -18,16 +18,20 @@ else () set(USERAPP_TYPES "${DEFAULT_USER_APP_TYPES}" CACHE STRING "List of user apps to build into the firmware") endif () -if(DEFINED ENABLE_WATCHFACES) - set(DEFAULT_WATCHFACE_TYPES ${ENABLE_WATCHFACES}) -else () - list(APPEND DEFAULT_WATCHFACE_TYPES "Pinetime::Applications::Screens::WatchFaceDigital") - list(APPEND DEFAULT_WATCHFACE_TYPES "Pinetime::Applications::Screens::WatchFaceAnalog") - list(APPEND DEFAULT_WATCHFACE_TYPES "Pinetime::Applications::Screens::WatchFacePineTimeStyle") - list(APPEND DEFAULT_WATCHFACE_TYPES "Pinetime::Applications::Screens::WatchFaceTerminal") - list(APPEND DEFAULT_WATCHFACE_TYPES "Pinetime::Applications::Screens::WatchFaceInfineat") - list(APPEND DEFAULT_WATCHFACE_TYPES "Pinetime::Applications::Screens::WatchFaceCasioStyleG7710") -endif () +if(NOT DEFINED DEFAULT_WATCHFACE_NAMES ) + set(DEFAULT_WATCHFACE_NAMES "digital;analog;pinetimestyle;terminal;infineat;casioStyleG7710") +endif() +message("WATCH FACES\n-----------") +foreach(item ${DEFAULT_WATCHFACE_NAMES}) + if(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/watchfaces/${item}) + add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/watchfaces/${item}) + message(" * Watch face ${INFINITIME_WATCHFACE_NAME} enabled!") + list(APPEND DEFAULT_WATCHFACE_TYPES "${INFINITIME_WATCHFACE_NAMESPACE}") + list(APPEND WATCHFACE_SOURCES_LIST "${INFINITIME_WATCHFACE_SOURCES}") + string(APPEND WATCHFACE_INCLUDE "#include \"${INFINITIME_WATCHFACE_INCLUDES}\"\n") + endif() +endforeach() +set(WATCHFACE_SOURCES ${WATCHFACE_SOURCES_LIST} PARENT_SCOPE) # Generate the list of watchface types necessary to instantiate WatchFaceTypeList<> needed in WatchFace.h set(FIRST_ITERATION TRUE) @@ -49,9 +53,6 @@ foreach (w IN LISTS DEFAULT_WATCHFACE_TYPES) string(SUBSTRING ${w} ${beginIndex} ${watchfaceLength} className) string(SUBSTRING ${w} 0 ${classIndex} namespaceName) string(APPEND WATCHFACE_NAMESPACE "namespace ${namespaceName} { class ${className}; }\n") - - # TODO the include path should be specified by the CMake file of the watchface - string(APPEND WATCHFACE_INCLUDE "#include \"displayapp/screens/${className}.h\"\n") endforeach () add_library(infinitime_apps INTERFACE) @@ -62,4 +63,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) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../UserApps.h.in ${CMAKE_CURRENT_BINARY_DIR}/../UserApps.h) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/UserApps.h.in ${CMAKE_CURRENT_BINARY_DIR}/UserApps.h) diff --git a/src/displayapp/DisplayApp.h b/src/displayapp/DisplayApp.h index 96bce4dd..349ca014 100644 --- a/src/displayapp/DisplayApp.h +++ b/src/displayapp/DisplayApp.h @@ -4,7 +4,7 @@ #include #include #include -#include "displayapp/apps/Apps.h" +#include "displayapp/Apps.h" #include "displayapp/LittleVgl.h" #include "displayapp/TouchEvents.h" #include "components/brightness/BrightnessController.h" diff --git a/src/displayapp/UserApps.h.in b/src/displayapp/UserApps.h.in index a2461090..3e20dd20 100644 --- a/src/displayapp/UserApps.h.in +++ b/src/displayapp/UserApps.h.in @@ -1,5 +1,5 @@ #pragma once -#include "displayapp/apps/Apps.h" +#include "displayapp/Apps.h" #include "displayapp/Controllers.h" #include "displayapp/screens/Alarm.h" diff --git a/src/displayapp/apps/WatchFaces.h.in b/src/displayapp/WatchFaces.h.in similarity index 100% rename from src/displayapp/apps/WatchFaces.h.in rename to src/displayapp/WatchFaces.h.in diff --git a/src/displayapp/screens/Alarm.h b/src/displayapp/screens/Alarm.h index 444102cb..0244df23 100644 --- a/src/displayapp/screens/Alarm.h +++ b/src/displayapp/screens/Alarm.h @@ -17,7 +17,7 @@ */ #pragma once -#include "displayapp/apps/Apps.h" +#include "displayapp/Apps.h" #include "components/settings/Settings.h" #include "displayapp/screens/Screen.h" #include "displayapp/widgets/Counter.h" diff --git a/src/displayapp/screens/Dice.h b/src/displayapp/screens/Dice.h index da91657d..ab0955a6 100644 --- a/src/displayapp/screens/Dice.h +++ b/src/displayapp/screens/Dice.h @@ -1,6 +1,6 @@ #pragma once -#include "displayapp/apps/Apps.h" +#include "displayapp/Apps.h" #include "displayapp/screens/Screen.h" #include "displayapp/widgets/Counter.h" #include "displayapp/Controllers.h" diff --git a/src/displayapp/screens/InfiniPaint.h b/src/displayapp/screens/InfiniPaint.h index b1f9741a..3de0066f 100644 --- a/src/displayapp/screens/InfiniPaint.h +++ b/src/displayapp/screens/InfiniPaint.h @@ -6,7 +6,7 @@ #include "displayapp/screens/Screen.h" #include "components/motor/MotorController.h" #include "Symbols.h" -#include "displayapp/apps/Apps.h" +#include "displayapp/Apps.h" #include namespace Pinetime { diff --git a/src/displayapp/screens/Motion.h b/src/displayapp/screens/Motion.h index e13e068c..9cd126f4 100644 --- a/src/displayapp/screens/Motion.h +++ b/src/displayapp/screens/Motion.h @@ -7,7 +7,7 @@ #include #include #include "displayapp/Controllers.h" -#include "displayapp/apps/Apps.h" +#include "displayapp/Apps.h" namespace Pinetime { namespace Applications { diff --git a/src/displayapp/screens/Music.h b/src/displayapp/screens/Music.h index 52253321..062bd968 100644 --- a/src/displayapp/screens/Music.h +++ b/src/displayapp/screens/Music.h @@ -21,7 +21,7 @@ #include #include #include "displayapp/screens/Screen.h" -#include "displayapp/apps/Apps.h" +#include "displayapp/Apps.h" #include "displayapp/Controllers.h" #include "Symbols.h" diff --git a/src/displayapp/screens/Navigation.h b/src/displayapp/screens/Navigation.h index 5c7a0429..e62745b2 100644 --- a/src/displayapp/screens/Navigation.h +++ b/src/displayapp/screens/Navigation.h @@ -22,7 +22,7 @@ #include #include "displayapp/screens/Screen.h" #include -#include "displayapp/apps/Apps.h" +#include "displayapp/Apps.h" #include "displayapp/Controllers.h" #include "Symbols.h" diff --git a/src/displayapp/screens/Paddle.h b/src/displayapp/screens/Paddle.h index 586cccf4..1ea25158 100644 --- a/src/displayapp/screens/Paddle.h +++ b/src/displayapp/screens/Paddle.h @@ -3,7 +3,7 @@ #include #include #include "displayapp/screens/Screen.h" -#include "displayapp/apps/Apps.h" +#include "displayapp/Apps.h" #include "displayapp/Controllers.h" #include "Symbols.h" diff --git a/src/displayapp/screens/Steps.h b/src/displayapp/screens/Steps.h index 6443582f..428e4b29 100644 --- a/src/displayapp/screens/Steps.h +++ b/src/displayapp/screens/Steps.h @@ -4,7 +4,7 @@ #include #include "displayapp/screens/Screen.h" #include -#include "displayapp/apps/Apps.h" +#include "displayapp/Apps.h" #include "displayapp/Controllers.h" #include "Symbols.h" diff --git a/src/displayapp/screens/StopWatch.h b/src/displayapp/screens/StopWatch.h index 3386d042..b3bbba87 100644 --- a/src/displayapp/screens/StopWatch.h +++ b/src/displayapp/screens/StopWatch.h @@ -7,7 +7,7 @@ #include "portmacro_cmsis.h" #include "systemtask/SystemTask.h" -#include "displayapp/apps/Apps.h" +#include "displayapp/Apps.h" #include "displayapp/Controllers.h" #include "Symbols.h" diff --git a/src/displayapp/screens/Twos.h b/src/displayapp/screens/Twos.h index 52449fd3..d983d136 100644 --- a/src/displayapp/screens/Twos.h +++ b/src/displayapp/screens/Twos.h @@ -1,6 +1,6 @@ #pragma once -#include "displayapp/apps/Apps.h" +#include "displayapp/Apps.h" #include "displayapp/screens/Screen.h" #include "displayapp/Controllers.h" diff --git a/src/displayapp/screens/Weather.h b/src/displayapp/screens/Weather.h index 6975311e..dd294d24 100644 --- a/src/displayapp/screens/Weather.h +++ b/src/displayapp/screens/Weather.h @@ -4,7 +4,7 @@ #include #include "displayapp/screens/Screen.h" #include "components/ble/SimpleWeatherService.h" -#include "displayapp/apps/Apps.h" +#include "displayapp/Apps.h" #include "displayapp/Controllers.h" #include "Symbols.h" #include "utility/DirtyValue.h" diff --git a/src/displayapp/screens/settings/SettingWatchFace.h b/src/displayapp/screens/settings/SettingWatchFace.h index 760d6543..47069076 100644 --- a/src/displayapp/screens/settings/SettingWatchFace.h +++ b/src/displayapp/screens/settings/SettingWatchFace.h @@ -9,9 +9,7 @@ #include "displayapp/screens/Screen.h" #include "displayapp/screens/Symbols.h" #include "displayapp/screens/CheckboxList.h" -#include "displayapp/screens/WatchFaceInfineat.h" -#include "displayapp/screens/WatchFaceCasioStyleG7710.h" -#include "displayapp/apps/WatchFaces.h" +#include "displayapp/WatchFaces.h" namespace Pinetime { diff --git a/src/displayapp/screens/settings/Settings.cpp b/src/displayapp/screens/settings/Settings.cpp index cb5ba413..065417fa 100644 --- a/src/displayapp/screens/settings/Settings.cpp +++ b/src/displayapp/screens/settings/Settings.cpp @@ -1,7 +1,7 @@ #include "displayapp/screens/settings/Settings.h" #include #include -#include "displayapp/apps/Apps.h" +#include "displayapp/Apps.h" #include "displayapp/DisplayApp.h" using namespace Pinetime::Applications::Screens; diff --git a/src/displayapp/watchfaces/analog/CMakeLists.txt b/src/displayapp/watchfaces/analog/CMakeLists.txt new file mode 100644 index 00000000..879a2e56 --- /dev/null +++ b/src/displayapp/watchfaces/analog/CMakeLists.txt @@ -0,0 +1,4 @@ +set(INFINITIME_WATCHFACE_NAME "Analog" PARENT_SCOPE) +set(INFINITIME_WATCHFACE_NAMESPACE "Pinetime::Applications::Screens::WatchFaceAnalog" PARENT_SCOPE) +set(INFINITIME_WATCHFACE_INCLUDES "displayapp/watchfaces/analog/WatchFaceAnalog.h" PARENT_SCOPE) +set(INFINITIME_WATCHFACE_SOURCES "displayapp/watchfaces/analog/WatchFaceAnalog.cpp" PARENT_SCOPE) \ No newline at end of file diff --git a/src/displayapp/screens/WatchFaceAnalog.cpp b/src/displayapp/watchfaces/analog/WatchFaceAnalog.cpp similarity index 99% rename from src/displayapp/screens/WatchFaceAnalog.cpp rename to src/displayapp/watchfaces/analog/WatchFaceAnalog.cpp index 2b27ad64..93048b0b 100644 --- a/src/displayapp/screens/WatchFaceAnalog.cpp +++ b/src/displayapp/watchfaces/analog/WatchFaceAnalog.cpp @@ -1,4 +1,4 @@ -#include "displayapp/screens/WatchFaceAnalog.h" +#include "displayapp/watchfaces/analog/WatchFaceAnalog.h" #include #include #include "displayapp/screens/BatteryIcon.h" diff --git a/src/displayapp/screens/WatchFaceAnalog.h b/src/displayapp/watchfaces/analog/WatchFaceAnalog.h similarity index 98% rename from src/displayapp/screens/WatchFaceAnalog.h rename to src/displayapp/watchfaces/analog/WatchFaceAnalog.h index 1cfed3f7..fd43d054 100644 --- a/src/displayapp/screens/WatchFaceAnalog.h +++ b/src/displayapp/watchfaces/analog/WatchFaceAnalog.h @@ -11,7 +11,7 @@ #include "components/ble/NotificationManager.h" #include "displayapp/screens/BatteryIcon.h" #include "utility/DirtyValue.h" -#include "displayapp/apps/WatchFaces.h" +#include "displayapp/WatchFaces.h" namespace Pinetime { namespace Controllers { diff --git a/src/displayapp/watchfaces/casioStyleG7710/CMakeLists.txt b/src/displayapp/watchfaces/casioStyleG7710/CMakeLists.txt new file mode 100644 index 00000000..4fe217b2 --- /dev/null +++ b/src/displayapp/watchfaces/casioStyleG7710/CMakeLists.txt @@ -0,0 +1,4 @@ +set(INFINITIME_WATCHFACE_NAME "CasioStyleG7710" PARENT_SCOPE) +set(INFINITIME_WATCHFACE_NAMESPACE "Pinetime::Applications::Screens::WatchFaceCasioStyleG7710" PARENT_SCOPE) +set(INFINITIME_WATCHFACE_INCLUDES "displayapp/watchfaces/casioStyleG7710/WatchFaceCasioStyleG7710.h" PARENT_SCOPE) +set(INFINITIME_WATCHFACE_SOURCES "displayapp/watchfaces/casioStyleG7710/WatchFaceCasioStyleG7710.cpp" PARENT_SCOPE) \ No newline at end of file diff --git a/src/displayapp/screens/WatchFaceCasioStyleG7710.cpp b/src/displayapp/watchfaces/casioStyleG7710/WatchFaceCasioStyleG7710.cpp similarity index 99% rename from src/displayapp/screens/WatchFaceCasioStyleG7710.cpp rename to src/displayapp/watchfaces/casioStyleG7710/WatchFaceCasioStyleG7710.cpp index 72bfaaa3..89b0f028 100644 --- a/src/displayapp/screens/WatchFaceCasioStyleG7710.cpp +++ b/src/displayapp/watchfaces/casioStyleG7710/WatchFaceCasioStyleG7710.cpp @@ -1,4 +1,4 @@ -#include "displayapp/screens/WatchFaceCasioStyleG7710.h" +#include "displayapp/watchfaces/casioStyleG7710/WatchFaceCasioStyleG7710.h" #include #include diff --git a/src/displayapp/screens/WatchFaceCasioStyleG7710.h b/src/displayapp/watchfaces/casioStyleG7710/WatchFaceCasioStyleG7710.h similarity index 99% rename from src/displayapp/screens/WatchFaceCasioStyleG7710.h rename to src/displayapp/watchfaces/casioStyleG7710/WatchFaceCasioStyleG7710.h index 3e7901dc..66da0cb6 100644 --- a/src/displayapp/screens/WatchFaceCasioStyleG7710.h +++ b/src/displayapp/watchfaces/casioStyleG7710/WatchFaceCasioStyleG7710.h @@ -10,7 +10,7 @@ #include "components/datetime/DateTimeController.h" #include "components/ble/BleController.h" #include "utility/DirtyValue.h" -#include "displayapp/apps/WatchFaces.h" +#include "displayapp/WatchFaces.h" namespace Pinetime { namespace Controllers { diff --git a/src/displayapp/watchfaces/digital/CMakeLists.txt b/src/displayapp/watchfaces/digital/CMakeLists.txt new file mode 100644 index 00000000..83b581df --- /dev/null +++ b/src/displayapp/watchfaces/digital/CMakeLists.txt @@ -0,0 +1,4 @@ +set(INFINITIME_WATCHFACE_NAME "Digital" PARENT_SCOPE) +set(INFINITIME_WATCHFACE_NAMESPACE "Pinetime::Applications::Screens::WatchFaceDigital" PARENT_SCOPE) +set(INFINITIME_WATCHFACE_INCLUDES "displayapp/watchfaces/digital/WatchFaceDigital.h" PARENT_SCOPE) +set(INFINITIME_WATCHFACE_SOURCES "displayapp/watchfaces/digital/WatchFaceDigital.cpp" PARENT_SCOPE) \ No newline at end of file diff --git a/src/displayapp/screens/WatchFaceDigital.cpp b/src/displayapp/watchfaces/digital/WatchFaceDigital.cpp similarity index 99% rename from src/displayapp/screens/WatchFaceDigital.cpp rename to src/displayapp/watchfaces/digital/WatchFaceDigital.cpp index afe00fa5..04bd7b4f 100644 --- a/src/displayapp/screens/WatchFaceDigital.cpp +++ b/src/displayapp/watchfaces/digital/WatchFaceDigital.cpp @@ -1,4 +1,4 @@ -#include "displayapp/screens/WatchFaceDigital.h" +#include "displayapp/watchfaces/digital/WatchFaceDigital.h" #include #include diff --git a/src/displayapp/screens/WatchFaceDigital.h b/src/displayapp/watchfaces/digital/WatchFaceDigital.h similarity index 99% rename from src/displayapp/screens/WatchFaceDigital.h rename to src/displayapp/watchfaces/digital/WatchFaceDigital.h index eb5123c6..f9fdd407 100644 --- a/src/displayapp/screens/WatchFaceDigital.h +++ b/src/displayapp/watchfaces/digital/WatchFaceDigital.h @@ -10,7 +10,7 @@ #include "components/ble/BleController.h" #include "displayapp/widgets/StatusIcons.h" #include "utility/DirtyValue.h" -#include "displayapp/apps/WatchFaces.h" +#include "displayapp/WatchFaces.h" namespace Pinetime { namespace Controllers { diff --git a/src/displayapp/watchfaces/infineat/CMakeLists.txt b/src/displayapp/watchfaces/infineat/CMakeLists.txt new file mode 100644 index 00000000..ad741c56 --- /dev/null +++ b/src/displayapp/watchfaces/infineat/CMakeLists.txt @@ -0,0 +1,4 @@ +set(INFINITIME_WATCHFACE_NAME "Infineat" PARENT_SCOPE) +set(INFINITIME_WATCHFACE_NAMESPACE "Pinetime::Applications::Screens::WatchFaceInfineat" PARENT_SCOPE) +set(INFINITIME_WATCHFACE_INCLUDES "displayapp/watchfaces/infineat/WatchFaceInfineat.h" PARENT_SCOPE) +set(INFINITIME_WATCHFACE_SOURCES "displayapp/watchfaces/infineat/WatchFaceInfineat.cpp" PARENT_SCOPE) \ No newline at end of file diff --git a/src/displayapp/screens/WatchFaceInfineat.cpp b/src/displayapp/watchfaces/infineat/WatchFaceInfineat.cpp similarity index 99% rename from src/displayapp/screens/WatchFaceInfineat.cpp rename to src/displayapp/watchfaces/infineat/WatchFaceInfineat.cpp index c643f3bd..cde82e68 100644 --- a/src/displayapp/screens/WatchFaceInfineat.cpp +++ b/src/displayapp/watchfaces/infineat/WatchFaceInfineat.cpp @@ -1,4 +1,4 @@ -#include "displayapp/screens/WatchFaceInfineat.h" +#include "displayapp/watchfaces/infineat/WatchFaceInfineat.h" #include #include diff --git a/src/displayapp/screens/WatchFaceInfineat.h b/src/displayapp/watchfaces/infineat/WatchFaceInfineat.h similarity index 99% rename from src/displayapp/screens/WatchFaceInfineat.h rename to src/displayapp/watchfaces/infineat/WatchFaceInfineat.h index 393c0655..2e414832 100644 --- a/src/displayapp/screens/WatchFaceInfineat.h +++ b/src/displayapp/watchfaces/infineat/WatchFaceInfineat.h @@ -8,7 +8,7 @@ #include "displayapp/screens/Screen.h" #include "components/datetime/DateTimeController.h" #include "utility/DirtyValue.h" -#include "displayapp/apps/WatchFaces.h" +#include "displayapp/WatchFaces.h" namespace Pinetime { namespace Controllers { diff --git a/src/displayapp/watchfaces/pinetimestyle/CMakeLists.txt b/src/displayapp/watchfaces/pinetimestyle/CMakeLists.txt new file mode 100644 index 00000000..cc9c87f3 --- /dev/null +++ b/src/displayapp/watchfaces/pinetimestyle/CMakeLists.txt @@ -0,0 +1,4 @@ +set(INFINITIME_WATCHFACE_NAME "PineTimeStyle" PARENT_SCOPE) +set(INFINITIME_WATCHFACE_NAMESPACE "Pinetime::Applications::Screens::WatchFacePineTimeStyle" PARENT_SCOPE) +set(INFINITIME_WATCHFACE_INCLUDES "displayapp/watchfaces/pinetimestyle/WatchFacePineTimeStyle.h" PARENT_SCOPE) +set(INFINITIME_WATCHFACE_SOURCES "displayapp/watchfaces/pinetimestyle/WatchFacePineTimeStyle.cpp" PARENT_SCOPE) \ No newline at end of file diff --git a/src/displayapp/screens/WatchFacePineTimeStyle.cpp b/src/displayapp/watchfaces/pinetimestyle/WatchFacePineTimeStyle.cpp similarity index 99% rename from src/displayapp/screens/WatchFacePineTimeStyle.cpp rename to src/displayapp/watchfaces/pinetimestyle/WatchFacePineTimeStyle.cpp index e56031f7..0291ce6b 100644 --- a/src/displayapp/screens/WatchFacePineTimeStyle.cpp +++ b/src/displayapp/watchfaces/pinetimestyle/WatchFacePineTimeStyle.cpp @@ -19,7 +19,7 @@ * Style/layout copied from TimeStyle for Pebble by Dan Tilden (github.com/tilden) */ -#include "displayapp/screens/WatchFacePineTimeStyle.h" +#include "displayapp/watchfaces/pinetimestyle/WatchFacePineTimeStyle.h" #include #include #include diff --git a/src/displayapp/screens/WatchFacePineTimeStyle.h b/src/displayapp/watchfaces/pinetimestyle/WatchFacePineTimeStyle.h similarity index 99% rename from src/displayapp/screens/WatchFacePineTimeStyle.h rename to src/displayapp/watchfaces/pinetimestyle/WatchFacePineTimeStyle.h index 7cf06093..f6b04a4b 100644 --- a/src/displayapp/screens/WatchFacePineTimeStyle.h +++ b/src/displayapp/watchfaces/pinetimestyle/WatchFacePineTimeStyle.h @@ -12,7 +12,7 @@ #include "components/ble/SimpleWeatherService.h" #include "components/ble/BleController.h" #include "utility/DirtyValue.h" -#include "displayapp/apps/WatchFaces.h" +#include "displayapp/WatchFaces.h" namespace Pinetime { namespace Controllers { diff --git a/src/displayapp/watchfaces/terminal/CMakeLists.txt b/src/displayapp/watchfaces/terminal/CMakeLists.txt new file mode 100644 index 00000000..3347c033 --- /dev/null +++ b/src/displayapp/watchfaces/terminal/CMakeLists.txt @@ -0,0 +1,4 @@ +set(INFINITIME_WATCHFACE_NAME "Terminal" PARENT_SCOPE) +set(INFINITIME_WATCHFACE_NAMESPACE "Pinetime::Applications::Screens::WatchFaceTerminal" PARENT_SCOPE) +set(INFINITIME_WATCHFACE_INCLUDES "displayapp/watchfaces/terminal/WatchFaceTerminal.h" PARENT_SCOPE) +set(INFINITIME_WATCHFACE_SOURCES "displayapp/watchfaces/terminal/WatchFaceTerminal.cpp" PARENT_SCOPE) \ No newline at end of file diff --git a/src/displayapp/screens/WatchFaceTerminal.cpp b/src/displayapp/watchfaces/terminal/WatchFaceTerminal.cpp similarity index 99% rename from src/displayapp/screens/WatchFaceTerminal.cpp rename to src/displayapp/watchfaces/terminal/WatchFaceTerminal.cpp index 72383729..1a729628 100644 --- a/src/displayapp/screens/WatchFaceTerminal.cpp +++ b/src/displayapp/watchfaces/terminal/WatchFaceTerminal.cpp @@ -1,5 +1,5 @@ #include -#include "displayapp/screens/WatchFaceTerminal.h" +#include "displayapp/watchfaces/terminal/WatchFaceTerminal.h" #include "displayapp/screens/BatteryIcon.h" #include "displayapp/screens/NotificationIcon.h" #include "displayapp/screens/Symbols.h" diff --git a/src/displayapp/screens/WatchFaceTerminal.h b/src/displayapp/watchfaces/terminal/WatchFaceTerminal.h similarity index 98% rename from src/displayapp/screens/WatchFaceTerminal.h rename to src/displayapp/watchfaces/terminal/WatchFaceTerminal.h index db7565d9..1d4cbffe 100644 --- a/src/displayapp/screens/WatchFaceTerminal.h +++ b/src/displayapp/watchfaces/terminal/WatchFaceTerminal.h @@ -8,7 +8,7 @@ #include "displayapp/screens/Screen.h" #include "components/datetime/DateTimeController.h" #include "utility/DirtyValue.h" -#include "displayapp/apps/WatchFaces.h" +#include "displayapp/WatchFaces.h" namespace Pinetime { namespace Controllers {