will/InfiniTime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Notifications : Replace the label "notificationNr/notificationNb" by a grey border on the bottom that is displayed when there are other notifications to available.

Browse Source
This commit is contained in:
JF 2020-10-22 15:39:20 +02:00
parent 07b6812f61
commit 5983e33b8d
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/displayapp/screens/Notifications.cpp
View File

@ -11,10 +11,10 @@ Notifications::Notifications(DisplayApp *app, Pinetime::Controllers::Notificatio
auto notification = notificationManager.GetLastNotification(); auto notification = notificationManager.GetLastNotification();
if(notification.valid) { if(notification.valid) {
currentId = notification.id; currentId = notification.id;
currentItem.reset(new NotificationItem("Notification", notification.message.data(), notification.index, notificationManager.NbNotifications(), mode)); currentItem.reset(new NotificationItem("\nNotification", notification.message.data(), notification.index, notificationManager.NbNotifications(), mode));
validDisplay = true; validDisplay = true;
} else { } else {
currentItem.reset(new NotificationItem("Notification", "No notification to display", 0, notificationManager.NbNotifications(), Modes::Preview)); currentItem.reset(new NotificationItem("\nNotification", "No notification to display", 0, notificationManager.NbNotifications(), Modes::Preview));
} }
if(mode == Modes::Preview) { if(mode == Modes::Preview) {
@ -71,7 +71,7 @@ bool Notifications::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
currentId = previousNotification.id; currentId = previousNotification.id;
currentItem.reset(nullptr); currentItem.reset(nullptr);
app->SetFullRefresh(DisplayApp::FullRefreshDirections::Up); app->SetFullRefresh(DisplayApp::FullRefreshDirections::Up);
currentItem.reset(new NotificationItem("Notification", previousNotification.message.data(), previousNotification.index, notificationManager.NbNotifications(), mode)); currentItem.reset(new NotificationItem("\nNotification", previousNotification.message.data(), previousNotification.index, notificationManager.NbNotifications(), mode));
} }
return true; return true;
case Pinetime::Applications::TouchEvents::SwipeDown: { case Pinetime::Applications::TouchEvents::SwipeDown: {
@ -87,7 +87,7 @@ bool Notifications::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
currentId = nextNotification.id; currentId = nextNotification.id;
currentItem.reset(nullptr); currentItem.reset(nullptr);
app->SetFullRefresh(DisplayApp::FullRefreshDirections::Down); app->SetFullRefresh(DisplayApp::FullRefreshDirections::Down);
currentItem.reset(new NotificationItem("Notification", nextNotification.message.data(), nextNotification.index, notificationManager.NbNotifications(), mode)); currentItem.reset(new NotificationItem("\nNotification", nextNotification.message.data(), nextNotification.index, notificationManager.NbNotifications(), mode));
} }
return true; return true;
default: default:
@ -104,7 +104,6 @@ bool Notifications::OnButtonPushed() {
Notifications::NotificationItem::NotificationItem(const char *title, const char *msg, uint8_t notifNr, uint8_t notifNb, Modes mode) Notifications::NotificationItem::NotificationItem(const char *title, const char *msg, uint8_t notifNr, uint8_t notifNb, Modes mode)
: notifNr{notifNr}, notifNb{notifNb}, mode{mode} { : notifNr{notifNr}, notifNb{notifNb}, mode{mode} {
container1 = lv_cont_create(lv_scr_act(), nullptr); container1 = lv_cont_create(lv_scr_act(), nullptr);
static lv_style_t contStyle; static lv_style_t contStyle;
lv_style_copy(&contStyle, lv_cont_get_style(container1, LV_CONT_STYLE_MAIN)); lv_style_copy(&contStyle, lv_cont_get_style(container1, LV_CONT_STYLE_MAIN));
@ -140,14 +139,15 @@ Notifications::NotificationItem::NotificationItem(const char *title, const char
lv_label_set_body_draw(t1, true); lv_label_set_body_draw(t1, true);
lv_obj_set_width(t1, LV_HOR_RES - (titleStyle.body.padding.left + titleStyle.body.padding.right)); lv_obj_set_width(t1, LV_HOR_RES - (titleStyle.body.padding.left + titleStyle.body.padding.right));
lv_label_set_text(t1, title); lv_label_set_text(t1, title);
lv_obj_set_pos(t1, titleStyle.body.padding.left, titleStyle.body.padding.top); static constexpr int16_t offscreenOffset = -20 ;
lv_obj_set_pos(t1, titleStyle.body.padding.left, offscreenOffset);
auto titleHeight = lv_obj_get_height(t1); auto titleHeight = lv_obj_get_height(t1);
l1 = lv_label_create(container1, nullptr); l1 = lv_label_create(container1, nullptr);
lv_label_set_style(l1, LV_LABEL_STYLE_MAIN, &textStyle); lv_label_set_style(l1, LV_LABEL_STYLE_MAIN, &textStyle);
lv_obj_set_pos(l1, textStyle.body.padding.left, lv_obj_set_pos(l1, textStyle.body.padding.left,
titleHeight + titleStyle.body.padding.bottom + textStyle.body.padding.bottom + titleHeight + offscreenOffset + textStyle.body.padding.bottom +
textStyle.body.padding.top); textStyle.body.padding.top);
lv_label_set_long_mode(l1, LV_LABEL_LONG_BREAK); lv_label_set_long_mode(l1, LV_LABEL_LONG_BREAK);
@ -156,11 +156,15 @@ Notifications::NotificationItem::NotificationItem(const char *title, const char
lv_label_set_text(l1, msg); lv_label_set_text(l1, msg);
if(mode == Modes::Normal) { if(mode == Modes::Normal) {
lv_obj_t *bottomlabel = lv_label_create(container1, nullptr); if(notifNr < notifNb) {
lv_label_set_style(bottomlabel, LV_LABEL_STYLE_MAIN, &bottomStyle); bottomPlaceholder = lv_label_create(container1, nullptr);
lv_obj_align(bottomlabel, container1, LV_ALIGN_IN_BOTTOM_RIGHT, 0, 0); lv_label_set_style(bottomPlaceholder, LV_LABEL_STYLE_MAIN, &titleStyle);
snprintf(pageText, 4, "%d/%d", notifNr, notifNb); lv_label_set_long_mode(bottomPlaceholder, LV_LABEL_LONG_BREAK);
lv_label_set_text(bottomlabel, pageText); lv_label_set_body_draw(bottomPlaceholder, true);
lv_obj_set_width(bottomPlaceholder, LV_HOR_RES - (titleStyle.body.padding.left + titleStyle.body.padding.right));
lv_label_set_text(bottomPlaceholder, " ");
lv_obj_set_pos(bottomPlaceholder, titleStyle.body.padding.left, LV_VER_RES - 5);
}
} }
} }

1
src/displayapp/screens/Notifications.h
View File

@ -37,6 +37,7 @@ namespace Pinetime {
lv_obj_t* container1; lv_obj_t* container1;
lv_obj_t* t1; lv_obj_t* t1;
lv_obj_t* l1; lv_obj_t* l1;
lv_obj_t* bottomPlaceholder;
Modes mode; Modes mode;
}; };