rei-forks
/
InfiniTime
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1005 from aveeryy/notifications-as-text 

Terminal watchface: replace notifications icon with a text entry
This commit is contained in:
JF 2022-03-09 21:33:46 +01:00 committed by GitHub
parent 7e0b053b38 8844ea60b1
commit dbfcb455fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/displayapp/screens/WatchFaceTerminal.cpp
View File

@ -41,7 +41,7 @@ WatchFaceTerminal::WatchFaceTerminal(DisplayApp* app,
lv_obj_align(connectState, lv_scr_act(), LV_ALIGN_IN_LEFT_MID, 0, 40); lv_obj_align(connectState, lv_scr_act(), LV_ALIGN_IN_LEFT_MID, 0, 40);
notificationIcon = lv_label_create(lv_scr_act(), nullptr); notificationIcon = lv_label_create(lv_scr_act(), nullptr);
lv_obj_align(notificationIcon, nullptr, LV_ALIGN_IN_TOP_LEFT, 10, 0); lv_obj_align(notificationIcon, nullptr, LV_ALIGN_IN_LEFT_MID, 0, -100);
label_date = lv_label_create(lv_scr_act(), nullptr); label_date = lv_label_create(lv_scr_act(), nullptr);
lv_label_set_recolor(label_date, true); lv_label_set_recolor(label_date, true);
@ -97,12 +97,12 @@ void WatchFaceTerminal::Refresh() {
bleRadioEnabled = bleController.IsRadioEnabled(); bleRadioEnabled = bleController.IsRadioEnabled();
if (bleState.IsUpdated() || bleRadioEnabled.IsUpdated()) { if (bleState.IsUpdated() || bleRadioEnabled.IsUpdated()) {
if(!bleRadioEnabled.Get()) { if(!bleRadioEnabled.Get()) {
lv_label_set_text_static(connectState, "[STAT]#387b54 Disabled#"); lv_label_set_text_static(connectState, "[STAT]#0082fc Disabled#");
} else { } else {
if (bleState.Get()) { if (bleState.Get()) {
lv_label_set_text_static(connectState, "[STAT]#387b54 Connected#"); lv_label_set_text_static(connectState, "[STAT]#0082fc Connected#");
} else { } else {
lv_label_set_text_static(connectState, "[STAT]#387b54 Disconnected#"); lv_label_set_text_static(connectState, "[STAT]#0082fc Disconnected#");
} }
} }
} }
@ -110,9 +110,9 @@ void WatchFaceTerminal::Refresh() {
notificationState = notificatioManager.AreNewNotificationsAvailable(); notificationState = notificatioManager.AreNewNotificationsAvailable();
if (notificationState.IsUpdated()) { if (notificationState.IsUpdated()) {
if (notificationState.Get()) { if (notificationState.Get()) {
lv_label_set_text_static(notificationIcon, NotificationIcon::GetIcon(true)); lv_label_set_text_static(notificationIcon, "You have mail.");
} else { } else {
lv_label_set_text_static(notificationIcon, NotificationIcon::GetIcon(false)); lv_label_set_text_static(notificationIcon, "");
} }
} }