first try at adding notification age

Author: clemensvonmolo

src/components/ble/NotificationManager.cpp

@@ -10,6 +10,7 @@ constexpr uint8_t NotificationManager::MessageSize;
 void NotificationManager::Push(NotificationManager::Notification&& notif) {
   notif.id = GetNextId();
   notif.valid = true;
+  notif.timeArrived = std::chrono::system_clock::to_time_t(dateTimeController.CurrentDateTime());
   newNotification = true;
   if (beginIdx > 0) {
     --beginIdx;

src/components/ble/NotificationManager.h

@@ -4,6 +4,8 @@
 #include <atomic>
 #include <cstddef>
 #include <cstdint>
+#include <chrono>
+#include "components/datetime/DateTimeController.h"
 
 namespace Pinetime {
   namespace Controllers {
@@ -28,6 +30,7 @@ namespace Pinetime {
         using Id = uint8_t;
         using Idx = uint8_t;
 
+        std::time_t timeArrived;
         std::array<char, MessageSize + 1> message;
         uint8_t size;
         Categories category = Categories::Unknown;
@@ -38,6 +41,9 @@ namespace Pinetime {
         const char* Title() const;
       };
 
+      NotificationManager(Controllers::DateTime& dateTimeController) : dateTimeController {dateTimeController} {
+      }
+
       void Push(Notification&& notif);
       Notification GetLastNotification() const;
       Notification Get(Notification::Id id) const;
@@ -61,6 +67,7 @@ namespace Pinetime {
 
     private:
       Notification::Id nextId {0};
+      Controllers::DateTime& dateTimeController;
       Notification::Id GetNextId();
       const Notification& At(Notification::Idx idx) const;
       Notification& At(Notification::Idx idx);

src/displayapp/DisplayApp.cpp

@@ -562,6 +562,7 @@ void DisplayApp::LoadScreen(Apps app, DisplayApp::FullRefreshDirections directio
                                                                notificationManager,
                                                                systemTask->nimble().alertService(),
                                                                motorController,
+                                                               dateTimeController,
                                                                *systemTask,
                                                                Screens::Notifications::Modes::Normal);
       break;
@@ -570,6 +571,7 @@ void DisplayApp::LoadScreen(Apps app, DisplayApp::FullRefreshDirections directio
                                                                notificationManager,
                                                                systemTask->nimble().alertService(),
                                                                motorController,
+                                                               dateTimeController,
                                                                *systemTask,
                                                                Screens::Notifications::Modes::Preview);
       break;

src/displayapp/screens/Notifications.cpp

@@ -14,12 +14,14 @@ Notifications::Notifications(DisplayApp* app,
                              Pinetime::Controllers::NotificationManager& notificationManager,
                              Pinetime::Controllers::AlertNotificationService& alertNotificationService,
                              Pinetime::Controllers::MotorController& motorController,
+                             Pinetime::Controllers::DateTime& dateTimeController,
                              System::SystemTask& systemTask,
                              Modes mode)
   : app {app},
     notificationManager {notificationManager},
     alertNotificationService {alertNotificationService},
     motorController {motorController},
+    dateTimeController {dateTimeController},
     wakeLock(systemTask),
     mode {mode} {
 
@@ -31,6 +33,8 @@ Notifications::Notifications(DisplayApp* app,
                                                      notification.Message(),
                                                      1,
                                                      notification.category,
+                                                     notification.timeArrived,
+                                                     std::chrono::system_clock::to_time_t(this->dateTimeController.CurrentDateTime()),
                                                      notificationManager.NbNotifications(),
                                                      alertNotificationService,
                                                      motorController);
@@ -200,6 +204,8 @@ bool Notifications::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
                                                        previousNotification.Message(),
                                                        currentIdx + 1,
                                                        previousNotification.category,
+                                                       previousNotification.timeArrived,
+                                                       std::chrono::system_clock::to_time_t(dateTimeController.CurrentDateTime()),
                                                        notificationManager.NbNotifications(),
                                                        alertNotificationService,
                                                        motorController);
@@ -227,6 +233,8 @@ bool Notifications::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
                                                        nextNotification.Message(),
                                                        currentIdx + 1,
                                                        nextNotification.category,
+                                                       nextNotification.timeArrived,
+                                                       std::chrono::system_clock::to_time_t(dateTimeController.CurrentDateTime()),
                                                        notificationManager.NbNotifications(),
                                                        alertNotificationService,
                                                        motorController);
@@ -251,6 +259,8 @@ Notifications::NotificationItem::NotificationItem(Pinetime::Controllers::AlertNo
                      0,
                      Controllers::NotificationManager::Categories::Unknown,
                      0,
+                     0,
+                     0,
                      alertNotificationService,
                      motorController) {
 }
@@ -259,6 +269,8 @@ Notifications::NotificationItem::NotificationItem(const char* title,
                                                   const char* msg,
                                                   uint8_t notifNr,
                                                   Controllers::NotificationManager::Categories category,
+                                                  std::time_t timeArrived,
+                                                  std::time_t timeNow,
                                                   uint8_t notifNb,
                                                   Pinetime::Controllers::AlertNotificationService& alertNotificationService,
                                                   Pinetime::Controllers::MotorController& motorController)
@@ -290,6 +302,21 @@ Notifications::NotificationItem::NotificationItem(const char* title,
   if (title == nullptr) {
     lv_label_set_text_static(alert_type, "Notification");
   } else {
+    auto diff = std::chrono::system_clock::from_time_t(timeNow) - std::chrono::system_clock::from_time_t(timeArrived);
+    std::chrono::minutes age = std::chrono::duration_cast<std::chrono::minutes>(diff);
+    std::string ageString;
+    ageString.reserve(10);
+    if ((age.count() / (60 * 24)) >= 1) {
+      ageString = std::to_string(static_cast<uint16_t>(age.count() / (60 * 24))) + "d ago";
+    } else if ((age.count() / 60) >= 1) {
+      ageString = std::to_string(static_cast<uint8_t>(age.count() / 60)) + "h ago";
+    } else {
+      ageString = std::to_string(static_cast<uint8_t>(age.count())) + "m ago";
+    }
+    lv_obj_t* alert_age = lv_label_create(lv_scr_act(), nullptr);
+    lv_label_set_text(alert_age, ageString.c_str());
+    lv_obj_align(alert_age, container1, LV_ALIGN_IN_BOTTOM_RIGHT, 0, 0);
+
     // copy title to label and replace newlines with spaces
     lv_label_set_text(alert_type, title);
     char* pchar = strchr(lv_label_get_text(alert_type), '\n');

src/displayapp/screens/Notifications.h

@@ -2,10 +2,12 @@
 
 #include <lvgl/lvgl.h>
 #include <FreeRTOS.h>
+#include <chrono>
 #include <cstdint>
 #include <memory>
 #include "displayapp/screens/Screen.h"
 #include "components/ble/NotificationManager.h"
+#include "components/datetime/DateTimeController.h"
 #include "components/motor/MotorController.h"
 #include "systemtask/SystemTask.h"
 #include "systemtask/WakeLock.h"
@@ -25,6 +27,7 @@ namespace Pinetime {
                                Pinetime::Controllers::NotificationManager& notificationManager,
                                Pinetime::Controllers::AlertNotificationService& alertNotificationService,
                                Pinetime::Controllers::MotorController& motorController,
+                               Pinetime::Controllers::DateTime& dateTimeController,
                                System::SystemTask& systemTask,
                                Modes mode);
         ~Notifications() override;
@@ -43,6 +46,8 @@ namespace Pinetime {
                            const char* msg,
                            uint8_t notifNr,
                            Controllers::NotificationManager::Categories,
+                           std::time_t timeArrived,
+                           std::time_t timeNow,
                            uint8_t notifNb,
                            Pinetime::Controllers::AlertNotificationService& alertNotificationService,
                            Pinetime::Controllers::MotorController& motorController);
@@ -74,6 +79,7 @@ namespace Pinetime {
         Pinetime::Controllers::NotificationManager& notificationManager;
         Pinetime::Controllers::AlertNotificationService& alertNotificationService;
         Pinetime::Controllers::MotorController& motorController;
+        Pinetime::Controllers::DateTime& dateTimeController;
         System::WakeLock wakeLock;
         Modes mode = Modes::Normal;
         std::unique_ptr<NotificationItem> currentItem;

src/main.cpp

@@ -102,7 +102,7 @@ Pinetime::Controllers::MotorController motorController {};
 
 Pinetime::Controllers::DateTime dateTimeController {settingsController};
 Pinetime::Drivers::Watchdog watchdog;
-Pinetime::Controllers::NotificationManager notificationManager;
+Pinetime::Controllers::NotificationManager notificationManager {dateTimeController};
 Pinetime::Controllers::MotionController motionController;
 Pinetime::Controllers::AlarmController alarmController {dateTimeController, fs};
 Pinetime::Controllers::TouchHandler touchHandler;