From ef5670c7e09a1a63fc5df4a066472ed7fe7550ff Mon Sep 17 00:00:00 2001 From: JF Date: Tue, 20 Oct 2020 20:57:39 +0200 Subject: Integrate new notification UI with notifications coming from BLE --- src/displayapp/screens/Clock.h | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'src/displayapp/screens/Clock.h') diff --git a/src/displayapp/screens/Clock.h b/src/displayapp/screens/Clock.h index 5753f6a3..58149a79 100644 --- a/src/displayapp/screens/Clock.h +++ b/src/displayapp/screens/Clock.h @@ -7,6 +7,7 @@ #include #include #include +#include "components/ble/NotificationManager.h" #include "components/battery/BatteryController.h" #include "components/ble/BleController.h" @@ -38,7 +39,8 @@ namespace Pinetime { Clock(DisplayApp* app, Controllers::DateTime& dateTimeController, Controllers::Battery& batteryController, - Controllers::Ble& bleController); + Controllers::Ble& bleController, + Controllers::NotificationManager& notificatioManager); ~Clock() override; bool Refresh() override; @@ -63,23 +65,25 @@ namespace Pinetime { DirtyValue> currentDateTime; DirtyValue stepCount {0}; DirtyValue heartbeat {0}; - + DirtyValue notificationState {false}; lv_obj_t* label_time; lv_obj_t* label_date; lv_obj_t* backgroundLabel; - lv_obj_t * batteryIcon; - lv_obj_t * bleIcon; + lv_obj_t* batteryIcon; + lv_obj_t* bleIcon; lv_obj_t* batteryPlug; lv_obj_t* heartbeatIcon; lv_obj_t* heartbeatValue; lv_obj_t* heartbeatBpm; lv_obj_t* stepIcon; lv_obj_t* stepValue; + lv_obj_t* notificationIcon; Controllers::DateTime& dateTimeController; Controllers::Battery& batteryController; Controllers::Ble& bleController; + Controllers::NotificationManager& notificatioManager; bool running = true; -- cgit v1.2.3