summaryrefslogtreecommitdiff
path: root/src/displayapp
diff options
context:
space:
mode:
authorJF <JF002@users.noreply.github.com>2022-03-09 21:33:46 +0100
committerGitHub <noreply@github.com>2022-03-09 21:33:46 +0100
commitdbfcb455fe0f242eee1397cd5aeb0a3071b1ab14 (patch)
tree33edd3a95d3f48c42fee56055961e6a2f3e690a7 /src/displayapp
parent7e0b053b38d0491eb4ee666be34d0ea2ab029d19 (diff)
parent8844ea60b1ccb174e431f1dd96c72c5bb53c227b (diff)
Merge pull request #1005 from aveeryy/notifications-as-text
Terminal watchface: replace notifications icon with a text entry
Diffstat (limited to 'src/displayapp')
-rw-r--r--src/displayapp/screens/WatchFaceTerminal.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/displayapp/screens/WatchFaceTerminal.cpp b/src/displayapp/screens/WatchFaceTerminal.cpp
index 08a9db5b..3a47fc53 100644
--- a/src/displayapp/screens/WatchFaceTerminal.cpp
+++ b/src/displayapp/screens/WatchFaceTerminal.cpp
@@ -41,7 +41,7 @@ WatchFaceTerminal::WatchFaceTerminal(DisplayApp* app,
lv_obj_align(connectState, lv_scr_act(), LV_ALIGN_IN_LEFT_MID, 0, 40);
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);
lv_label_set_recolor(label_date, true);
@@ -97,12 +97,12 @@ void WatchFaceTerminal::Refresh() {
bleRadioEnabled = bleController.IsRadioEnabled();
if (bleState.IsUpdated() || bleRadioEnabled.IsUpdated()) {
if(!bleRadioEnabled.Get()) {
- lv_label_set_text_static(connectState, "[STAT]#387b54 Disabled#");
+ lv_label_set_text_static(connectState, "[STAT]#0082fc Disabled#");
} else {
if (bleState.Get()) {
- lv_label_set_text_static(connectState, "[STAT]#387b54 Connected#");
+ lv_label_set_text_static(connectState, "[STAT]#0082fc Connected#");
} 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();
if (notificationState.IsUpdated()) {
if (notificationState.Get()) {
- lv_label_set_text_static(notificationIcon, NotificationIcon::GetIcon(true));
+ lv_label_set_text_static(notificationIcon, "You have mail.");
} else {
- lv_label_set_text_static(notificationIcon, NotificationIcon::GetIcon(false));
+ lv_label_set_text_static(notificationIcon, "");
}
}