Skip to content

Show notification indicator when a notification is available #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tgc-dk wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Show notification indicator when a notification is available #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
76047b9
Show notification indicator when a notification is available - Infini…
tgc-dk May 5, 2023
a3eb4ba
Merge branch 'main' into pr-1234-notifications
tgcfoss Sep 8, 2023
7ee1e7b
Merge branch 'main' into pr-1234-notifications
tgc-dk Jan 29, 2024
db4fd5e
Merge branch 'pr-1234-notifications' of github.com:tgc-dk/InfiniTime …
tgc-dk Jan 29, 2024
059eaa2
Removed unused variables
tgc-dk Aug 27, 2024
2b07b3e
Merge branch 'main' into pr-1234-notifications
tgc-dk Aug 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion src/displayapp/screens/WatchFaceAnalog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,15 @@ void WatchFaceAnalog::Refresh() {
notificationState = notificationManager.AreNewNotificationsAvailable();

if (notificationState.IsUpdated()) {
lv_label_set_text_static(notificationIcon, NotificationIcon::GetIcon(notificationState.Get()));
if (notificationState.Get()) {
lv_obj_set_style_local_text_color(notificationIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x00FF00));
lv_label_set_text_static(notificationIcon, NotificationIcon::GetIcon(true));
} else if (notificationManager.NbNotifications() > 0) {
lv_obj_set_style_local_text_color(notificationIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0xFFFFFF));
lv_label_set_text_static(notificationIcon, NotificationIcon::GetIcon(true));
} else {
lv_label_set_text_static(notificationIcon, NotificationIcon::GetIcon(false));
}
}

currentDateTime = dateTimeController.CurrentDateTime();
Expand Down
10 changes: 9 additions & 1 deletion src/displayapp/screens/WatchFaceCasioStyleG7710.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,15 @@ void WatchFaceCasioStyleG7710::Refresh() {

notificationState = notificatioManager.AreNewNotificationsAvailable();
if (notificationState.IsUpdated()) {
lv_label_set_text_static(notificationIcon, NotificationIcon::GetIcon(notificationState.Get()));
if (notificationState.Get()) {
lv_obj_set_style_local_text_color(notificationIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x00FF00));
lv_label_set_text_static(notificationIcon, NotificationIcon::GetIcon(true));
} else if (notificatioManager.NbNotifications() > 0) {
lv_obj_set_style_local_text_color(notificationIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0xFFFFFF));
lv_label_set_text_static(notificationIcon, NotificationIcon::GetIcon(true));
} else {
lv_label_set_text_static(notificationIcon, NotificationIcon::GetIcon(false));
}
}

currentDateTime = std::chrono::time_point_cast<std::chrono::minutes>(dateTimeController.CurrentDateTime());
Expand Down
10 changes: 9 additions & 1 deletion src/displayapp/screens/WatchFaceDigital.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,15 @@ void WatchFaceDigital::Refresh() {

notificationState = notificationManager.AreNewNotificationsAvailable();
if (notificationState.IsUpdated()) {
lv_label_set_text_static(notificationIcon, NotificationIcon::GetIcon(notificationState.Get()));
if (notificationState.Get()) {
lv_obj_set_style_local_text_color(notificationIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x00FF00));
lv_label_set_text_static(notificationIcon, NotificationIcon::GetIcon(true));
} else if (notificationManager.NbNotifications() > 0) {
lv_obj_set_style_local_text_color(notificationIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0xFFFFFF));
lv_label_set_text_static(notificationIcon, NotificationIcon::GetIcon(true));
} else {
lv_label_set_text_static(notificationIcon, NotificationIcon::GetIcon(false));
}
}

currentDateTime = std::chrono::time_point_cast<std::chrono::minutes>(dateTimeController.CurrentDateTime());
Expand Down
2 changes: 1 addition & 1 deletion src/displayapp/screens/WatchFaceInfineat.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@ void WatchFaceInfineat::UpdateSelected(lv_obj_t* object, lv_event_t event) {
void WatchFaceInfineat::Refresh() {
notificationState = notificationManager.AreNewNotificationsAvailable();
if (notificationState.IsUpdated()) {
lv_obj_set_hidden(notificationIcon, !notificationState.Get());
lv_obj_set_hidden(notificationIcon, !(notificationState.Get() || (notificationManager.NbNotifications() > 0)));
lv_obj_align(notificationIcon, lv_scr_act(), LV_ALIGN_IN_TOP_RIGHT, 0, 0);
}

Expand Down
26 changes: 24 additions & 2 deletions src/displayapp/screens/WatchFacePineTimeStyle.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,6 +444,18 @@ void WatchFacePineTimeStyle::SetBatteryIcon() {
batteryIcon.SetBatteryPercentage(batteryPercent);
}

void WatchFacePineTimeStyle::AlignIcons() {
bool notif = notificationState.Get() || notificationNbState.Get();
if (notif && bleState.Get()) {
lv_obj_align(bleIcon, sidebar, LV_ALIGN_IN_TOP_MID, 8, 25);
lv_obj_align(notificationIcon, sidebar, LV_ALIGN_IN_TOP_MID, -8, 25);
} else if (notif && !bleState.Get()) {
lv_obj_align(notificationIcon, sidebar, LV_ALIGN_IN_TOP_MID, 0, 25);
} else {
lv_obj_align(bleIcon, sidebar, LV_ALIGN_IN_TOP_MID, 0, 25);
}
}

void WatchFacePineTimeStyle::Refresh() {
isCharging = batteryController.IsCharging();
if (isCharging.IsUpdated()) {
Expand Down Expand Up @@ -471,8 +483,18 @@ void WatchFacePineTimeStyle::Refresh() {
}

notificationState = notificationManager.AreNewNotificationsAvailable();
if (notificationState.IsUpdated()) {
lv_label_set_text_static(notificationIcon, NotificationIcon::GetIcon(notificationState.Get()));
notificationNbState = notificationManager.NbNotifications() > 0;
if (notificationState.IsUpdated() || notificationNbState.IsUpdated()) {
if (notificationState.Get()) {
lv_obj_set_style_local_text_color(notificationIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0xFFFFFF));
lv_label_set_text_static(notificationIcon, NotificationIcon::GetIcon(true));
} else if (notificationNbState.Get()) {
lv_obj_set_style_local_text_color(notificationIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x000000));
lv_label_set_text_static(notificationIcon, NotificationIcon::GetIcon(true));
} else {
lv_label_set_text_static(notificationIcon, NotificationIcon::GetIcon(true));
}
AlignIcons();
}

currentDateTime = dateTimeController.CurrentDateTime();
Expand Down
1 change: 1 addition & 0 deletions src/displayapp/screens/WatchFacePineTimeStyle.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ namespace Pinetime {
Utility::DirtyValue<std::chrono::time_point<std::chrono::system_clock, std::chrono::nanoseconds>> currentDateTime {};
Utility::DirtyValue<uint32_t> stepCount {};
Utility::DirtyValue<bool> notificationState {};
Utility::DirtyValue<bool> notificationNbState {};
Utility::DirtyValue<std::optional<Pinetime::Controllers::SimpleWeatherService::CurrentWeather>> currentWeather {};

static Pinetime::Controllers::Settings::Colors GetNext(Controllers::Settings::Colors color);
Expand Down
4 changes: 4 additions & 0 deletions src/displayapp/screens/WatchFaceTerminal.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,10 @@ void WatchFaceTerminal::Refresh() {
notificationState = notificationManager.AreNewNotificationsAvailable();
if (notificationState.IsUpdated()) {
if (notificationState.Get()) {
lv_obj_set_style_local_text_color(notificationIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x00FF00));
lv_label_set_text_static(notificationIcon, "You have mail.");
} else if (notificationManager.NbNotifications() > 0) {
lv_obj_set_style_local_text_color(notificationIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0xFFFFFF));
lv_label_set_text_static(notificationIcon, "You have mail.");
} else {
lv_label_set_text_static(notificationIcon, "");
Expand Down