From e4a017c3f426fb9ed91c8be8c9cbecd5bd632a7e Mon Sep 17 00:00:00 2001 From: minacode Date: Thu, 8 Dec 2022 18:05:43 +0100 Subject: [PATCH 1/3] move notifiations to own component --- src/CMakeLists.txt | 8 ++++---- src/components/ble/AlertNotificationClient.cpp | 2 +- src/components/ble/AlertNotificationService.cpp | 2 +- src/components/ble/ImmediateAlertService.cpp | 2 +- src/components/ble/NimbleController.cpp | 2 +- .../{ble => notifications}/NotificationManager.cpp | 2 +- .../{ble => notifications}/NotificationManager.h | 7 ++++--- src/displayapp/DisplayApp.cpp | 2 +- src/displayapp/screens/Clock.cpp | 2 +- src/displayapp/screens/Notifications.h | 2 +- src/displayapp/screens/WatchFaceAnalog.h | 2 +- src/displayapp/screens/WatchFaceCasioStyleG7710.cpp | 2 +- src/displayapp/screens/WatchFaceDigital.cpp | 2 +- src/displayapp/screens/WatchFaceInfineat.cpp | 2 +- src/displayapp/screens/WatchFacePineTimeStyle.cpp | 2 +- src/displayapp/screens/WatchFaceTerminal.cpp | 2 +- src/main.cpp | 2 +- src/systemtask/SystemTask.h | 2 +- 18 files changed, 24 insertions(+), 23 deletions(-) rename src/components/{ble => notifications}/NotificationManager.cpp (98%) rename src/components/{ble => notifications}/NotificationManager.h (99%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e59c0d814b..0583ff7c17 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -448,7 +448,7 @@ list(APPEND SOURCE_FILES drivers/Bma421_C/bma423.c components/battery/BatteryController.cpp components/ble/BleController.cpp - components/ble/NotificationManager.cpp + components/notifications/NotificationManager.cpp components/datetime/DateTimeController.cpp components/brightness/BrightnessController.cpp components/motion/MotionController.cpp @@ -515,7 +515,7 @@ list(APPEND RECOVERY_SOURCE_FILES drivers/Bma421_C/bma423.c components/battery/BatteryController.cpp components/ble/BleController.cpp - components/ble/NotificationManager.cpp + components/notifications/NotificationManager.cpp components/datetime/DateTimeController.cpp components/brightness/BrightnessController.cpp components/motion/MotionController.cpp @@ -631,13 +631,13 @@ set(INCLUDE_FILES drivers/Bma421_C/bma423.c components/battery/BatteryController.h components/ble/BleController.h - components/ble/NotificationManager.h + components/notifications/NotificationManager.h components/datetime/DateTimeController.h components/brightness/BrightnessController.h components/motion/MotionController.h components/firmwarevalidator/FirmwareValidator.h components/ble/BleController.h - components/ble/NotificationManager.h + components/notifications/NotificationManager.h components/ble/NimbleController.h components/ble/DeviceInformationService.h components/ble/CurrentTimeClient.h diff --git a/src/components/ble/AlertNotificationClient.cpp b/src/components/ble/AlertNotificationClient.cpp index 095fdef611..38c4964b32 100644 --- a/src/components/ble/AlertNotificationClient.cpp +++ b/src/components/ble/AlertNotificationClient.cpp @@ -1,6 +1,6 @@ #include "components/ble/AlertNotificationClient.h" #include -#include "components/ble/NotificationManager.h" +#include "components/notifications/NotificationManager.h" #include "systemtask/SystemTask.h" #include diff --git a/src/components/ble/AlertNotificationService.cpp b/src/components/ble/AlertNotificationService.cpp index 048191225f..0f2de5e705 100644 --- a/src/components/ble/AlertNotificationService.cpp +++ b/src/components/ble/AlertNotificationService.cpp @@ -2,7 +2,7 @@ #include #include #include -#include "components/ble/NotificationManager.h" +#include "components/notifications/NotificationManager.h" #include "systemtask/SystemTask.h" using namespace Pinetime::Controllers; diff --git a/src/components/ble/ImmediateAlertService.cpp b/src/components/ble/ImmediateAlertService.cpp index c80b378385..833ac85ee1 100644 --- a/src/components/ble/ImmediateAlertService.cpp +++ b/src/components/ble/ImmediateAlertService.cpp @@ -1,6 +1,6 @@ #include "components/ble/ImmediateAlertService.h" #include -#include "components/ble/NotificationManager.h" +#include "components/notifications/NotificationManager.h" #include "systemtask/SystemTask.h" using namespace Pinetime::Controllers; diff --git a/src/components/ble/NimbleController.cpp b/src/components/ble/NimbleController.cpp index 52f4e4ceef..25d680e3da 100644 --- a/src/components/ble/NimbleController.cpp +++ b/src/components/ble/NimbleController.cpp @@ -16,7 +16,7 @@ #undef max #undef min #include "components/ble/BleController.h" -#include "components/ble/NotificationManager.h" +#include "components/notifications/NotificationManager.h" #include "components/datetime/DateTimeController.h" #include "components/fs/FS.h" #include "systemtask/SystemTask.h" diff --git a/src/components/ble/NotificationManager.cpp b/src/components/notifications/NotificationManager.cpp similarity index 98% rename from src/components/ble/NotificationManager.cpp rename to src/components/notifications/NotificationManager.cpp index 223f6221af..ae443b11fc 100644 --- a/src/components/ble/NotificationManager.cpp +++ b/src/components/notifications/NotificationManager.cpp @@ -1,4 +1,4 @@ -#include "components/ble/NotificationManager.h" +#include "components/notifications/NotificationManager.h" #include #include #include diff --git a/src/components/ble/NotificationManager.h b/src/components/notifications/NotificationManager.h similarity index 99% rename from src/components/ble/NotificationManager.h rename to src/components/notifications/NotificationManager.h index 4c199dbf50..92ff51d8e6 100644 --- a/src/components/ble/NotificationManager.h +++ b/src/components/notifications/NotificationManager.h @@ -27,11 +27,12 @@ namespace Pinetime { struct Notification { using Id = uint8_t; using Idx = uint8_t; - Id id = 0; - bool valid = false; - uint8_t size; + std::array message; + uint8_t size; Categories category = Categories::Unknown; + Id id = 0; + bool valid = false; const char* Message() const; const char* Title() const; diff --git a/src/displayapp/DisplayApp.cpp b/src/displayapp/DisplayApp.cpp index 108e380d69..c71329a343 100644 --- a/src/displayapp/DisplayApp.cpp +++ b/src/displayapp/DisplayApp.cpp @@ -7,7 +7,7 @@ #include "components/battery/BatteryController.h" #include "components/ble/BleController.h" #include "components/datetime/DateTimeController.h" -#include "components/ble/NotificationManager.h" +#include "components/notifications/NotificationManager.h" #include "components/motion/MotionController.h" #include "components/motor/MotorController.h" #include "displayapp/screens/ApplicationList.h" diff --git a/src/displayapp/screens/Clock.cpp b/src/displayapp/screens/Clock.cpp index 07d307e0f2..ab7880cae7 100644 --- a/src/displayapp/screens/Clock.cpp +++ b/src/displayapp/screens/Clock.cpp @@ -5,7 +5,7 @@ #include "components/battery/BatteryController.h" #include "components/motion/MotionController.h" #include "components/ble/BleController.h" -#include "components/ble/NotificationManager.h" +#include "components/notifications/NotificationManager.h" #include "components/settings/Settings.h" #include "displayapp/DisplayApp.h" #include "displayapp/screens/WatchFaceDigital.h" diff --git a/src/displayapp/screens/Notifications.h b/src/displayapp/screens/Notifications.h index 9d843a9b13..4317132f49 100644 --- a/src/displayapp/screens/Notifications.h +++ b/src/displayapp/screens/Notifications.h @@ -5,7 +5,7 @@ #include #include #include "displayapp/screens/Screen.h" -#include "components/ble/NotificationManager.h" +#include "components/notifications/NotificationManager.h" #include "components/motor/MotorController.h" #include "systemtask/SystemTask.h" diff --git a/src/displayapp/screens/WatchFaceAnalog.h b/src/displayapp/screens/WatchFaceAnalog.h index 04d9e7117c..4ff843d607 100644 --- a/src/displayapp/screens/WatchFaceAnalog.h +++ b/src/displayapp/screens/WatchFaceAnalog.h @@ -8,7 +8,7 @@ #include "components/datetime/DateTimeController.h" #include "components/battery/BatteryController.h" #include "components/ble/BleController.h" -#include "components/ble/NotificationManager.h" +#include "components/notifications/NotificationManager.h" #include namespace Pinetime { diff --git a/src/displayapp/screens/WatchFaceCasioStyleG7710.cpp b/src/displayapp/screens/WatchFaceCasioStyleG7710.cpp index bdae0d428e..1c6083c5b8 100644 --- a/src/displayapp/screens/WatchFaceCasioStyleG7710.cpp +++ b/src/displayapp/screens/WatchFaceCasioStyleG7710.cpp @@ -9,7 +9,7 @@ #include "displayapp/screens/Symbols.h" #include "components/battery/BatteryController.h" #include "components/ble/BleController.h" -#include "components/ble/NotificationManager.h" +#include "components/notifications/NotificationManager.h" #include "components/heartrate/HeartRateController.h" #include "components/motion/MotionController.h" #include "components/settings/Settings.h" diff --git a/src/displayapp/screens/WatchFaceDigital.cpp b/src/displayapp/screens/WatchFaceDigital.cpp index 47f40dabbe..f6b235990e 100644 --- a/src/displayapp/screens/WatchFaceDigital.cpp +++ b/src/displayapp/screens/WatchFaceDigital.cpp @@ -7,7 +7,7 @@ #include "displayapp/screens/Symbols.h" #include "components/battery/BatteryController.h" #include "components/ble/BleController.h" -#include "components/ble/NotificationManager.h" +#include "components/notifications/NotificationManager.h" #include "components/heartrate/HeartRateController.h" #include "components/motion/MotionController.h" #include "components/settings/Settings.h" diff --git a/src/displayapp/screens/WatchFaceInfineat.cpp b/src/displayapp/screens/WatchFaceInfineat.cpp index bd4e4ac84f..6b9b0f653f 100644 --- a/src/displayapp/screens/WatchFaceInfineat.cpp +++ b/src/displayapp/screens/WatchFaceInfineat.cpp @@ -8,7 +8,7 @@ #include "components/settings/Settings.h" #include "components/battery/BatteryController.h" #include "components/ble/BleController.h" -#include "components/ble/NotificationManager.h" +#include "components/notifications/NotificationManager.h" #include "components/motion/MotionController.h" using namespace Pinetime::Applications::Screens; diff --git a/src/displayapp/screens/WatchFacePineTimeStyle.cpp b/src/displayapp/screens/WatchFacePineTimeStyle.cpp index b6b3f5a9ab..6967e59ea1 100644 --- a/src/displayapp/screens/WatchFacePineTimeStyle.cpp +++ b/src/displayapp/screens/WatchFacePineTimeStyle.cpp @@ -30,7 +30,7 @@ #include "displayapp/screens/Symbols.h" #include "components/battery/BatteryController.h" #include "components/ble/BleController.h" -#include "components/ble/NotificationManager.h" +#include "components/notifications/NotificationManager.h" #include "components/motion/MotionController.h" #include "components/settings/Settings.h" #include "displayapp/DisplayApp.h" diff --git a/src/displayapp/screens/WatchFaceTerminal.cpp b/src/displayapp/screens/WatchFaceTerminal.cpp index d04cc517e9..b9f204cca1 100644 --- a/src/displayapp/screens/WatchFaceTerminal.cpp +++ b/src/displayapp/screens/WatchFaceTerminal.cpp @@ -6,7 +6,7 @@ #include "displayapp/screens/Symbols.h" #include "components/battery/BatteryController.h" #include "components/ble/BleController.h" -#include "components/ble/NotificationManager.h" +#include "components/notifications/NotificationManager.h" #include "components/heartrate/HeartRateController.h" #include "components/motion/MotionController.h" #include "components/settings/Settings.h" diff --git a/src/main.cpp b/src/main.cpp index ad7a07dc98..d87d93de43 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -31,7 +31,7 @@ #include "BootloaderVersion.h" #include "components/battery/BatteryController.h" #include "components/ble/BleController.h" -#include "components/ble/NotificationManager.h" +#include "components/notifications/NotificationManager.h" #include "components/brightness/BrightnessController.h" #include "components/motor/MotorController.h" #include "components/datetime/DateTimeController.h" diff --git a/src/systemtask/SystemTask.h b/src/systemtask/SystemTask.h index d1e4a004f9..7c099a0e23 100644 --- a/src/systemtask/SystemTask.h +++ b/src/systemtask/SystemTask.h @@ -14,7 +14,7 @@ #include "systemtask/SystemMonitor.h" #include "components/ble/NimbleController.h" -#include "components/ble/NotificationManager.h" +#include "components/notifications/NotificationManager.h" #include "components/motor/MotorController.h" #include "components/timer/TimerController.h" #include "components/alarm/AlarmController.h" From 7dc4bc3edae1f88377293b21d5808810cbfc7d71 Mon Sep 17 00:00:00 2001 From: minacode Date: Fri, 9 Dec 2022 18:27:14 +0100 Subject: [PATCH 2/3] move includes to headers --- src/displayapp/screens/WatchFaceCasioStyleG7710.cpp | 1 - src/displayapp/screens/WatchFaceCasioStyleG7710.h | 1 + src/displayapp/screens/WatchFaceDigital.cpp | 1 - src/displayapp/screens/WatchFaceDigital.h | 1 + src/displayapp/screens/WatchFaceInfineat.cpp | 1 - src/displayapp/screens/WatchFaceInfineat.h | 1 + src/displayapp/screens/WatchFacePineTimeStyle.cpp | 1 - src/displayapp/screens/WatchFacePineTimeStyle.h | 1 + src/displayapp/screens/WatchFaceTerminal.cpp | 1 - src/displayapp/screens/WatchFaceTerminal.h | 1 + 10 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/displayapp/screens/WatchFaceCasioStyleG7710.cpp b/src/displayapp/screens/WatchFaceCasioStyleG7710.cpp index 1c6083c5b8..e737d692da 100644 --- a/src/displayapp/screens/WatchFaceCasioStyleG7710.cpp +++ b/src/displayapp/screens/WatchFaceCasioStyleG7710.cpp @@ -9,7 +9,6 @@ #include "displayapp/screens/Symbols.h" #include "components/battery/BatteryController.h" #include "components/ble/BleController.h" -#include "components/notifications/NotificationManager.h" #include "components/heartrate/HeartRateController.h" #include "components/motion/MotionController.h" #include "components/settings/Settings.h" diff --git a/src/displayapp/screens/WatchFaceCasioStyleG7710.h b/src/displayapp/screens/WatchFaceCasioStyleG7710.h index eb7bb9e819..c050ebe2d6 100644 --- a/src/displayapp/screens/WatchFaceCasioStyleG7710.h +++ b/src/displayapp/screens/WatchFaceCasioStyleG7710.h @@ -8,6 +8,7 @@ #include "displayapp/screens/Screen.h" #include "components/datetime/DateTimeController.h" #include "components/ble/BleController.h" +#include "components/notifications/NotificationManager.h" namespace Pinetime { namespace Controllers { diff --git a/src/displayapp/screens/WatchFaceDigital.cpp b/src/displayapp/screens/WatchFaceDigital.cpp index f6b235990e..efa3e4884e 100644 --- a/src/displayapp/screens/WatchFaceDigital.cpp +++ b/src/displayapp/screens/WatchFaceDigital.cpp @@ -7,7 +7,6 @@ #include "displayapp/screens/Symbols.h" #include "components/battery/BatteryController.h" #include "components/ble/BleController.h" -#include "components/notifications/NotificationManager.h" #include "components/heartrate/HeartRateController.h" #include "components/motion/MotionController.h" #include "components/settings/Settings.h" diff --git a/src/displayapp/screens/WatchFaceDigital.h b/src/displayapp/screens/WatchFaceDigital.h index 60446afaa7..8531badd5a 100644 --- a/src/displayapp/screens/WatchFaceDigital.h +++ b/src/displayapp/screens/WatchFaceDigital.h @@ -7,6 +7,7 @@ #include "displayapp/screens/Screen.h" #include "components/datetime/DateTimeController.h" #include "components/ble/BleController.h" +#include "components/notifications/NotificationManager.h" #include "displayapp/widgets/StatusIcons.h" namespace Pinetime { diff --git a/src/displayapp/screens/WatchFaceInfineat.cpp b/src/displayapp/screens/WatchFaceInfineat.cpp index 6b9b0f653f..0fe5026737 100644 --- a/src/displayapp/screens/WatchFaceInfineat.cpp +++ b/src/displayapp/screens/WatchFaceInfineat.cpp @@ -8,7 +8,6 @@ #include "components/settings/Settings.h" #include "components/battery/BatteryController.h" #include "components/ble/BleController.h" -#include "components/notifications/NotificationManager.h" #include "components/motion/MotionController.h" using namespace Pinetime::Applications::Screens; diff --git a/src/displayapp/screens/WatchFaceInfineat.h b/src/displayapp/screens/WatchFaceInfineat.h index 6c3c30bace..667e5cb370 100644 --- a/src/displayapp/screens/WatchFaceInfineat.h +++ b/src/displayapp/screens/WatchFaceInfineat.h @@ -6,6 +6,7 @@ #include #include "displayapp/screens/Screen.h" #include "components/datetime/DateTimeController.h" +#include "components/notifications/NotificationManager.h" namespace Pinetime { namespace Controllers { diff --git a/src/displayapp/screens/WatchFacePineTimeStyle.cpp b/src/displayapp/screens/WatchFacePineTimeStyle.cpp index 6967e59ea1..fd4b4027e2 100644 --- a/src/displayapp/screens/WatchFacePineTimeStyle.cpp +++ b/src/displayapp/screens/WatchFacePineTimeStyle.cpp @@ -30,7 +30,6 @@ #include "displayapp/screens/Symbols.h" #include "components/battery/BatteryController.h" #include "components/ble/BleController.h" -#include "components/notifications/NotificationManager.h" #include "components/motion/MotionController.h" #include "components/settings/Settings.h" #include "displayapp/DisplayApp.h" diff --git a/src/displayapp/screens/WatchFacePineTimeStyle.h b/src/displayapp/screens/WatchFacePineTimeStyle.h index 3085a1aeca..7d7dc14ee0 100644 --- a/src/displayapp/screens/WatchFacePineTimeStyle.h +++ b/src/displayapp/screens/WatchFacePineTimeStyle.h @@ -8,6 +8,7 @@ #include "displayapp/Colors.h" #include "components/datetime/DateTimeController.h" #include "components/ble/BleController.h" +#include "components/notifications/NotificationManager.h" #include namespace Pinetime { diff --git a/src/displayapp/screens/WatchFaceTerminal.cpp b/src/displayapp/screens/WatchFaceTerminal.cpp index b9f204cca1..8ee59510cb 100644 --- a/src/displayapp/screens/WatchFaceTerminal.cpp +++ b/src/displayapp/screens/WatchFaceTerminal.cpp @@ -6,7 +6,6 @@ #include "displayapp/screens/Symbols.h" #include "components/battery/BatteryController.h" #include "components/ble/BleController.h" -#include "components/notifications/NotificationManager.h" #include "components/heartrate/HeartRateController.h" #include "components/motion/MotionController.h" #include "components/settings/Settings.h" diff --git a/src/displayapp/screens/WatchFaceTerminal.h b/src/displayapp/screens/WatchFaceTerminal.h index a81289a751..4495a471f4 100644 --- a/src/displayapp/screens/WatchFaceTerminal.h +++ b/src/displayapp/screens/WatchFaceTerminal.h @@ -5,6 +5,7 @@ #include #include #include "displayapp/screens/Screen.h" +#include "components/notifications/NotificationManager.h" #include "components/datetime/DateTimeController.h" namespace Pinetime { From 3f9c7b5545ec2e535b927fa08323951a10294e08 Mon Sep 17 00:00:00 2001 From: minacode Date: Mon, 12 Dec 2022 17:34:23 +0100 Subject: [PATCH 3/3] moved includes to cpp files --- src/displayapp/screens/WatchFaceAnalog.cpp | 1 + src/displayapp/screens/WatchFaceAnalog.h | 1 - src/displayapp/screens/WatchFaceCasioStyleG7710.cpp | 2 ++ src/displayapp/screens/WatchFaceCasioStyleG7710.h | 1 - src/displayapp/screens/WatchFaceDigital.cpp | 1 + src/displayapp/screens/WatchFaceDigital.h | 1 - src/displayapp/screens/WatchFaceInfineat.cpp | 1 + src/displayapp/screens/WatchFaceInfineat.h | 1 - src/displayapp/screens/WatchFacePineTimeStyle.cpp | 1 + src/displayapp/screens/WatchFacePineTimeStyle.h | 1 - src/displayapp/screens/WatchFaceTerminal.cpp | 1 + src/displayapp/screens/WatchFaceTerminal.h | 1 - 12 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/displayapp/screens/WatchFaceAnalog.cpp b/src/displayapp/screens/WatchFaceAnalog.cpp index 5e5317eefe..1c5820bb8b 100644 --- a/src/displayapp/screens/WatchFaceAnalog.cpp +++ b/src/displayapp/screens/WatchFaceAnalog.cpp @@ -5,6 +5,7 @@ #include "displayapp/screens/BleIcon.h" #include "displayapp/screens/Symbols.h" #include "displayapp/screens/NotificationIcon.h" +#include "components/notifications/NotificationManager.h" #include "components/settings/Settings.h" #include "displayapp/InfiniTimeTheme.h" diff --git a/src/displayapp/screens/WatchFaceAnalog.h b/src/displayapp/screens/WatchFaceAnalog.h index 4ff843d607..614f4d92fa 100644 --- a/src/displayapp/screens/WatchFaceAnalog.h +++ b/src/displayapp/screens/WatchFaceAnalog.h @@ -8,7 +8,6 @@ #include "components/datetime/DateTimeController.h" #include "components/battery/BatteryController.h" #include "components/ble/BleController.h" -#include "components/notifications/NotificationManager.h" #include namespace Pinetime { diff --git a/src/displayapp/screens/WatchFaceCasioStyleG7710.cpp b/src/displayapp/screens/WatchFaceCasioStyleG7710.cpp index e737d692da..c1b07683b6 100644 --- a/src/displayapp/screens/WatchFaceCasioStyleG7710.cpp +++ b/src/displayapp/screens/WatchFaceCasioStyleG7710.cpp @@ -11,7 +11,9 @@ #include "components/ble/BleController.h" #include "components/heartrate/HeartRateController.h" #include "components/motion/MotionController.h" +#include "components/notifications/NotificationManager.h" #include "components/settings/Settings.h" + using namespace Pinetime::Applications::Screens; WatchFaceCasioStyleG7710::WatchFaceCasioStyleG7710(DisplayApp* app, diff --git a/src/displayapp/screens/WatchFaceCasioStyleG7710.h b/src/displayapp/screens/WatchFaceCasioStyleG7710.h index c050ebe2d6..eb7bb9e819 100644 --- a/src/displayapp/screens/WatchFaceCasioStyleG7710.h +++ b/src/displayapp/screens/WatchFaceCasioStyleG7710.h @@ -8,7 +8,6 @@ #include "displayapp/screens/Screen.h" #include "components/datetime/DateTimeController.h" #include "components/ble/BleController.h" -#include "components/notifications/NotificationManager.h" namespace Pinetime { namespace Controllers { diff --git a/src/displayapp/screens/WatchFaceDigital.cpp b/src/displayapp/screens/WatchFaceDigital.cpp index efa3e4884e..9462984e52 100644 --- a/src/displayapp/screens/WatchFaceDigital.cpp +++ b/src/displayapp/screens/WatchFaceDigital.cpp @@ -9,6 +9,7 @@ #include "components/ble/BleController.h" #include "components/heartrate/HeartRateController.h" #include "components/motion/MotionController.h" +#include "components/notifications/NotificationManager.h" #include "components/settings/Settings.h" using namespace Pinetime::Applications::Screens; diff --git a/src/displayapp/screens/WatchFaceDigital.h b/src/displayapp/screens/WatchFaceDigital.h index 8531badd5a..60446afaa7 100644 --- a/src/displayapp/screens/WatchFaceDigital.h +++ b/src/displayapp/screens/WatchFaceDigital.h @@ -7,7 +7,6 @@ #include "displayapp/screens/Screen.h" #include "components/datetime/DateTimeController.h" #include "components/ble/BleController.h" -#include "components/notifications/NotificationManager.h" #include "displayapp/widgets/StatusIcons.h" namespace Pinetime { diff --git a/src/displayapp/screens/WatchFaceInfineat.cpp b/src/displayapp/screens/WatchFaceInfineat.cpp index 0fe5026737..c43157d309 100644 --- a/src/displayapp/screens/WatchFaceInfineat.cpp +++ b/src/displayapp/screens/WatchFaceInfineat.cpp @@ -9,6 +9,7 @@ #include "components/battery/BatteryController.h" #include "components/ble/BleController.h" #include "components/motion/MotionController.h" +#include "components/notifications/NotificationManager.h" using namespace Pinetime::Applications::Screens; diff --git a/src/displayapp/screens/WatchFaceInfineat.h b/src/displayapp/screens/WatchFaceInfineat.h index 667e5cb370..6c3c30bace 100644 --- a/src/displayapp/screens/WatchFaceInfineat.h +++ b/src/displayapp/screens/WatchFaceInfineat.h @@ -6,7 +6,6 @@ #include #include "displayapp/screens/Screen.h" #include "components/datetime/DateTimeController.h" -#include "components/notifications/NotificationManager.h" namespace Pinetime { namespace Controllers { diff --git a/src/displayapp/screens/WatchFacePineTimeStyle.cpp b/src/displayapp/screens/WatchFacePineTimeStyle.cpp index fd4b4027e2..d260a57ba2 100644 --- a/src/displayapp/screens/WatchFacePineTimeStyle.cpp +++ b/src/displayapp/screens/WatchFacePineTimeStyle.cpp @@ -31,6 +31,7 @@ #include "components/battery/BatteryController.h" #include "components/ble/BleController.h" #include "components/motion/MotionController.h" +#include "components/notifications/NotificationManager.h" #include "components/settings/Settings.h" #include "displayapp/DisplayApp.h" diff --git a/src/displayapp/screens/WatchFacePineTimeStyle.h b/src/displayapp/screens/WatchFacePineTimeStyle.h index 7d7dc14ee0..3085a1aeca 100644 --- a/src/displayapp/screens/WatchFacePineTimeStyle.h +++ b/src/displayapp/screens/WatchFacePineTimeStyle.h @@ -8,7 +8,6 @@ #include "displayapp/Colors.h" #include "components/datetime/DateTimeController.h" #include "components/ble/BleController.h" -#include "components/notifications/NotificationManager.h" #include namespace Pinetime { diff --git a/src/displayapp/screens/WatchFaceTerminal.cpp b/src/displayapp/screens/WatchFaceTerminal.cpp index 8ee59510cb..4f77b6c09d 100644 --- a/src/displayapp/screens/WatchFaceTerminal.cpp +++ b/src/displayapp/screens/WatchFaceTerminal.cpp @@ -8,6 +8,7 @@ #include "components/ble/BleController.h" #include "components/heartrate/HeartRateController.h" #include "components/motion/MotionController.h" +#include "components/notifications/NotificationManager.h" #include "components/settings/Settings.h" using namespace Pinetime::Applications::Screens; diff --git a/src/displayapp/screens/WatchFaceTerminal.h b/src/displayapp/screens/WatchFaceTerminal.h index 4495a471f4..a81289a751 100644 --- a/src/displayapp/screens/WatchFaceTerminal.h +++ b/src/displayapp/screens/WatchFaceTerminal.h @@ -5,7 +5,6 @@ #include #include #include "displayapp/screens/Screen.h" -#include "components/notifications/NotificationManager.h" #include "components/datetime/DateTimeController.h" namespace Pinetime {