Merge branch 'develop' into motion-sensor

# Conflicts:
#	src/CMakeLists.txt
#	src/displayapp/Apps.h
#	src/displayapp/DisplayApp.cpp
#	src/displayapp/DisplayApp.h
#	src/displayapp/lv_pinetime_theme.c
#	src/displayapp/screens/ApplicationList.cpp
#	src/drivers/TwiMaster.cpp
#	src/systemtask/SystemTask.h

1 files changed, 4 insertions, 0 deletions

diff --git a/src/components/ble/NotificationManager.h b/src/components/ble/NotificationManager.h
index 075a9a4..486bba1 100644
--- a/src/components/ble/NotificationManager.h
+++ b/src/components/ble/NotificationManager.h
@@ -17,8 +17,12 @@ namespace Pinetime {
           Id id;
           bool valid = false;
           uint8_t index;
+          uint8_t size;
           std::array<char, MessageSize+1> message;
           Categories category = Categories::Unknown;
+
+          const char* Message() const;
+          const char* Title() const;
         };
         Notification::Id nextId {0};