summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/displayapp/screens/Navigation.h4
-rw-r--r--src/displayapp/screens/Notifications.h7
2 files changed, 8 insertions, 3 deletions
diff --git a/src/displayapp/screens/Navigation.h b/src/displayapp/screens/Navigation.h
index ab622496..9fdd37d9 100644
--- a/src/displayapp/screens/Navigation.h
+++ b/src/displayapp/screens/Navigation.h
@@ -145,7 +145,7 @@ namespace Pinetime {
const lv_img_dsc_t* iconForName(std::string icon);
- std::array<std::pair<std::string, const lv_img_dsc_t*>, 89 > m_iconMap;/* = { {
+ std::array<std::pair<std::string, const lv_img_dsc_t*>, 89 > m_iconMap = { {
{"arrive-left", &arrive_left},
{"arrive-right", &arrive_right},
{"arrive-straight", &arrive_straight},
@@ -231,7 +231,7 @@ namespace Pinetime {
{"turn-slight-right", &turn_slight_right},
{"turn-straight", &turn_straight},
{"updown", &updown},
- {"uturn", &uturn} } };*/
+ {"uturn", &uturn} } };
};
}
}
diff --git a/src/displayapp/screens/Notifications.h b/src/displayapp/screens/Notifications.h
index 4305c796..aafd3e33 100644
--- a/src/displayapp/screens/Notifications.h
+++ b/src/displayapp/screens/Notifications.h
@@ -7,12 +7,16 @@
#include "components/ble/NotificationManager.h"
namespace Pinetime {
+ namespace Controllers {
+ class AlertNotificationService;
+ }
namespace Applications {
namespace Screens {
+
class Notifications : public Screen {
public:
enum class Modes {Normal, Preview};
- explicit Notifications(DisplayApp* app, Pinetime::Controllers::NotificationManager& notificationManager, Modes mode);
+ explicit Notifications(DisplayApp* app, Pinetime::Controllers::NotificationManager& notificationManager, Pinetime::Controllers::AlertNotificationService& alertNotificationService, Modes mode);
~Notifications() override;
bool Refresh() override;
@@ -55,6 +59,7 @@ namespace Pinetime {
const char* text;
};
Pinetime::Controllers::NotificationManager& notificationManager;
+ Pinetime::Controllers::AlertNotificationService& alertNotificationService;
Modes mode = Modes::Normal;
std::unique_ptr<NotificationItem> currentItem;
Controllers::NotificationManager::Notification::Id currentId;