Revert invalid changes in Navigation.h and add missing changes in Notifications.h.
This commit is contained in:
parent
219bafb01a
commit
3d1881c5ab
|
@ -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} } };
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in New Issue
Block a user