Merge branch 'ble-notifications' of JF/PineTime into develop

1 files changed, 12 insertions, 9 deletions

diff --git a/src/DisplayApp/DisplayApp.h b/src/DisplayApp/DisplayApp.h
index 04c82fe..09f0d1c 100644
--- a/src/DisplayApp/DisplayApp.h
+++ b/src/DisplayApp/DisplayApp.h
@@ -16,6 +16,8 @@
 #include <date/date.h>
 #include <DisplayApp/Screens/Clock.h>
 #include <drivers/Watchdog.h>
+#include <DisplayApp/Screens/Modal.h>
+#include <Components/Ble/NotificationManager.h>
 #include "TouchEvents.h"
 
 
@@ -27,18 +29,17 @@ namespace Pinetime {
     class DisplayApp {
       public:
         enum class States {Idle, Running};
-        enum class Messages : uint8_t {GoToSleep, GoToRunning, UpdateDateTime, UpdateBleConnection, UpdateBatteryLevel, TouchEvent, SwitchScreen,ButtonPushed};
+        enum class Messages : uint8_t {GoToSleep, GoToRunning, UpdateDateTime, UpdateBleConnection, UpdateBatteryLevel, TouchEvent, SwitchScreen,ButtonPushed,
+            NewNotification
+        };
         enum class FullRefreshDirections { None, Up, Down };
 
 
-        DisplayApp(Pinetime::Drivers::St7789& lcd,
-                   Pinetime::Components::LittleVgl& lvgl,
-                   Pinetime::Drivers::Cst816S&,
-                   Controllers::Battery &batteryController,
-                   Controllers::Ble &bleController,
-                   Controllers::DateTime& dateTimeController,
-                   Pinetime::Drivers::WatchdogView& watchdog,
-                   Pinetime::System::SystemTask& systemTask);
+        DisplayApp(Drivers::St7789 &lcd, Components::LittleVgl &lvgl, Drivers::Cst816S &,
+                   Controllers::Battery &batteryController, Controllers::Ble &bleController,
+                   Controllers::DateTime &dateTimeController, Drivers::WatchdogView &watchdog,
+                   System::SystemTask &systemTask,
+                   Pinetime::Controllers::NotificationManager& notificationManager);
         void Start();
         void PushMessage(Messages msg);
 
@@ -78,6 +79,8 @@ namespace Pinetime {
         Apps nextApp = Apps::None;
         bool onClockApp = false; // TODO find a better way to know that we should handle gestures and button differently for the Clock app.
         Controllers::BrightnessController brightnessController;
+        std::unique_ptr<Screens::Modal> modal;
+        Pinetime::Controllers::NotificationManager& notificationManager;
     };
   }
 }