summaryrefslogtreecommitdiff
path: root/src/DisplayApp/Screens
diff options
context:
space:
mode:
Diffstat (limited to 'src/DisplayApp/Screens')
-rw-r--r--src/DisplayApp/Screens/BatteryIcon.cpp92
-rw-r--r--src/DisplayApp/Screens/BleIcon.cpp8
-rw-r--r--src/DisplayApp/Screens/Modal.cpp52
-rw-r--r--src/DisplayApp/Screens/Modal.h3
-rw-r--r--src/DisplayApp/Screens/Tile.cpp4
5 files changed, 81 insertions, 78 deletions
diff --git a/src/DisplayApp/Screens/BatteryIcon.cpp b/src/DisplayApp/Screens/BatteryIcon.cpp
index 575aa092..e20167d8 100644
--- a/src/DisplayApp/Screens/BatteryIcon.cpp
+++ b/src/DisplayApp/Screens/BatteryIcon.cpp
@@ -3,60 +3,60 @@
using namespace Pinetime::Applications::Screens;
-extern lv_img_dsc_t os_battery_error;
-extern lv_img_dsc_t os_batterycharging_100;
-extern lv_img_dsc_t os_batterycharging_090;
-extern lv_img_dsc_t os_batterycharging_080;
-extern lv_img_dsc_t os_batterycharging_070;
-extern lv_img_dsc_t os_batterycharging_060;
-extern lv_img_dsc_t os_batterycharging_050;
-extern lv_img_dsc_t os_batterycharging_040;
-extern lv_img_dsc_t os_batterycharging_030;
-extern lv_img_dsc_t os_batterycharging_020;
-extern lv_img_dsc_t os_batterycharging_010;
-extern lv_img_dsc_t os_batterycharging_005;
+extern lv_img_dsc_t ck_os_battery_error;
+extern lv_img_dsc_t ck_os_batterycharging_100;
+extern lv_img_dsc_t ck_os_batterycharging_090;
+extern lv_img_dsc_t ck_os_batterycharging_080;
+extern lv_img_dsc_t ck_os_batterycharging_070;
+extern lv_img_dsc_t ck_os_batterycharging_060;
+extern lv_img_dsc_t ck_os_batterycharging_050;
+extern lv_img_dsc_t ck_os_batterycharging_040;
+extern lv_img_dsc_t ck_os_batterycharging_030;
+extern lv_img_dsc_t ck_os_batterycharging_020;
+extern lv_img_dsc_t ck_os_batterycharging_010;
+extern lv_img_dsc_t ck_os_batterycharging_005;
-extern lv_img_dsc_t os_battery_100;
-extern lv_img_dsc_t os_battery_090;
-extern lv_img_dsc_t os_battery_080;
-extern lv_img_dsc_t os_battery_070;
-extern lv_img_dsc_t os_battery_060;
-extern lv_img_dsc_t os_battery_050;
-extern lv_img_dsc_t os_battery_040;
-extern lv_img_dsc_t os_battery_030;
-extern lv_img_dsc_t os_battery_020;
-extern lv_img_dsc_t os_battery_010;
-extern lv_img_dsc_t os_battery_005;
+extern lv_img_dsc_t ck_os_battery_100;
+extern lv_img_dsc_t ck_os_battery_090;
+extern lv_img_dsc_t ck_os_battery_080;
+extern lv_img_dsc_t ck_os_battery_070;
+extern lv_img_dsc_t ck_os_battery_060;
+extern lv_img_dsc_t ck_os_battery_050;
+extern lv_img_dsc_t ck_os_battery_040;
+extern lv_img_dsc_t ck_os_battery_030;
+extern lv_img_dsc_t ck_os_battery_020;
+extern lv_img_dsc_t ck_os_battery_010;
+extern lv_img_dsc_t ck_os_battery_005;
lv_img_dsc_t *BatteryIcon::GetIcon(bool isCharging, float batteryPercent) {
if(isCharging) {
- if(batteryPercent > 90.0f) return &os_batterycharging_100;
- else if(batteryPercent > 80.0f) return &os_batterycharging_090;
- else if(batteryPercent > 70.0f) return &os_batterycharging_080;
- else if(batteryPercent > 60.0f) return &os_batterycharging_070;
- else if(batteryPercent > 50.0f) return &os_batterycharging_060;
- else if(batteryPercent > 40.0f) return &os_batterycharging_050;
- else if(batteryPercent > 30.0f) return &os_batterycharging_040;
- else if(batteryPercent > 20.0f) return &os_batterycharging_030;
- else if(batteryPercent > 10.0f) return &os_batterycharging_020;
- else if(batteryPercent > 5.0f) return &os_batterycharging_010;
- else return &os_batterycharging_005;
+ if(batteryPercent > 90.0f) return &ck_os_batterycharging_100;
+ else if(batteryPercent > 80.0f) return &ck_os_batterycharging_090;
+ else if(batteryPercent > 70.0f) return &ck_os_batterycharging_080;
+ else if(batteryPercent > 60.0f) return &ck_os_batterycharging_070;
+ else if(batteryPercent > 50.0f) return &ck_os_batterycharging_060;
+ else if(batteryPercent > 40.0f) return &ck_os_batterycharging_050;
+ else if(batteryPercent > 30.0f) return &ck_os_batterycharging_040;
+ else if(batteryPercent > 20.0f) return &ck_os_batterycharging_030;
+ else if(batteryPercent > 10.0f) return &ck_os_batterycharging_020;
+ else if(batteryPercent > 5.0f) return &ck_os_batterycharging_010;
+ else return &ck_os_batterycharging_005;
} else {
- if(batteryPercent > 90.0f) return &os_battery_100;
- else if(batteryPercent > 80.0f) return &os_battery_090;
- else if(batteryPercent > 70.0f) return &os_battery_080;
- else if(batteryPercent > 60.0f) return &os_battery_070;
- else if(batteryPercent > 50.0f) return &os_battery_060;
- else if(batteryPercent > 40.0f) return &os_battery_050;
- else if(batteryPercent > 30.0f) return &os_battery_040;
- else if(batteryPercent > 20.0f) return &os_battery_030;
- else if(batteryPercent > 10.0f) return &os_battery_020;
- else if(batteryPercent > 5.0f) return &os_battery_010;
- else return &os_battery_005;
+ if(batteryPercent > 90.0f) return &ck_os_battery_100;
+ else if(batteryPercent > 80.0f) return &ck_os_battery_090;
+ else if(batteryPercent > 70.0f) return &ck_os_battery_080;
+ else if(batteryPercent > 60.0f) return &ck_os_battery_070;
+ else if(batteryPercent > 50.0f) return &ck_os_battery_060;
+ else if(batteryPercent > 40.0f) return &ck_os_battery_050;
+ else if(batteryPercent > 30.0f) return &ck_os_battery_040;
+ else if(batteryPercent > 20.0f) return &ck_os_battery_030;
+ else if(batteryPercent > 10.0f) return &ck_os_battery_020;
+ else if(batteryPercent > 5.0f) return &ck_os_battery_010;
+ else return &ck_os_battery_005;
}
}
lv_img_dsc_t *BatteryIcon::GetUnknownIcon() {
- return &os_battery_error;
+ return &ck_os_battery_error;
}
diff --git a/src/DisplayApp/Screens/BleIcon.cpp b/src/DisplayApp/Screens/BleIcon.cpp
index 4109b3fd..28a7727c 100644
--- a/src/DisplayApp/Screens/BleIcon.cpp
+++ b/src/DisplayApp/Screens/BleIcon.cpp
@@ -3,10 +3,10 @@
using namespace Pinetime::Applications::Screens;
-extern lv_img_dsc_t os_bt_connected;
-extern lv_img_dsc_t os_bt_disconnected;
+extern lv_img_dsc_t ck_os_bt_connected;
+extern lv_img_dsc_t ck_os_bt_disconnected;
lv_img_dsc_t *BleIcon::GetIcon(bool isConnected) {
- if(isConnected) return &os_bt_connected;
- else return &os_bt_disconnected;
+ if(isConnected) return &ck_os_bt_connected;
+ else return &ck_os_bt_disconnected;
} \ No newline at end of file
diff --git a/src/DisplayApp/Screens/Modal.cpp b/src/DisplayApp/Screens/Modal.cpp
index fc353c49..63ae70c0 100644
--- a/src/DisplayApp/Screens/Modal.cpp
+++ b/src/DisplayApp/Screens/Modal.cpp
@@ -25,7 +25,31 @@ bool Modal::OnButtonPushed() {
return true;
}
-void Modal::Show() {
+void Modal::Hide() {
+ /* Delete the parent modal background */
+ lv_obj_del_async(lv_obj_get_parent(mbox));
+ mbox = NULL; /* happens before object is actually deleted! */
+ isVisible = false;
+}
+
+void Modal::mbox_event_cb(lv_obj_t *obj, lv_event_t evt) {
+ auto* m = static_cast<Modal *>(obj->user_data);
+ m->OnEvent(obj, evt);
+}
+
+void Modal::OnEvent(lv_obj_t *event_obj, lv_event_t evt) {
+ if(evt == LV_EVENT_DELETE && event_obj == mbox) {
+ Hide();
+ } else if(evt == LV_EVENT_VALUE_CHANGED) {
+ /* A button was clicked */
+ lv_mbox_start_auto_close(mbox, 0);
+// Hide();
+ }
+}
+
+void Modal::Show(const char* msg) {
+ if(isVisible) return;
+ isVisible = true;
lv_style_copy(&modal_style, &lv_style_plain_color);
modal_style.body.main_color = modal_style.body.grad_color = LV_COLOR_BLACK;
modal_style.body.opa = LV_OPA_50;
@@ -41,10 +65,7 @@ void Modal::Show() {
/* Create the message box as a child of the modal background */
mbox = lv_mbox_create(obj, NULL);
lv_mbox_add_btns(mbox, btns2);
- char versionStr[20];
- sprintf(versionStr, "VERSION: %d.%d.%d", Version::Major(), Version::Minor(), Version::Patch());
- lv_mbox_set_text(mbox, versionStr);
-// lv_mbox_set_text(mbox, "Hello world!");
+ lv_mbox_set_text(mbox, msg);
lv_obj_align(mbox, NULL, LV_ALIGN_CENTER, 0, 0);
lv_obj_set_event_cb(mbox, Modal::mbox_event_cb);
@@ -58,24 +79,3 @@ void Modal::Show() {
lv_anim_set_exec_cb(&a, obj, (lv_anim_exec_xcb_t)lv_obj_set_opa_scale);
lv_anim_create(&a);
}
-
-void Modal::Hide() {
- /* Delete the parent modal background */
- lv_obj_del_async(lv_obj_get_parent(mbox));
- mbox = NULL; /* happens before object is actually deleted! */
-}
-
-void Modal::mbox_event_cb(lv_obj_t *obj, lv_event_t evt) {
- auto* m = static_cast<Modal *>(obj->user_data);
- m->OnEvent(obj, evt);
-}
-
-void Modal::OnEvent(lv_obj_t *event_obj, lv_event_t evt) {
- if(evt == LV_EVENT_DELETE && event_obj == mbox) {
- Hide();
- } else if(evt == LV_EVENT_VALUE_CHANGED) {
- /* A button was clicked */
- lv_mbox_start_auto_close(mbox, 0);
-// Hide();
- }
-}
diff --git a/src/DisplayApp/Screens/Modal.h b/src/DisplayApp/Screens/Modal.h
index de287293..b5425906 100644
--- a/src/DisplayApp/Screens/Modal.h
+++ b/src/DisplayApp/Screens/Modal.h
@@ -22,7 +22,7 @@ namespace Pinetime {
Modal(DisplayApp* app);
~Modal() override;
- void Show();
+ void Show(const char* msg);
void Hide();
bool Refresh() override;
@@ -37,6 +37,7 @@ namespace Pinetime {
lv_obj_t *mbox;
lv_obj_t *info;
bool running = true;
+ bool isVisible = false;
};
}
diff --git a/src/DisplayApp/Screens/Tile.cpp b/src/DisplayApp/Screens/Tile.cpp
index 7eb1018c..6c225c9d 100644
--- a/src/DisplayApp/Screens/Tile.cpp
+++ b/src/DisplayApp/Screens/Tile.cpp
@@ -123,7 +123,9 @@ void Tile::OnObjectEvent(lv_obj_t *obj, lv_event_t event, uint32_t buttonId) {
tile->StartClockApp();
break;
case 3:
- modal->Show();
+ char versionStr[20];
+ sprintf(versionStr, "VERSION: %d.%d.%d", Version::Major(), Version::Minor(), Version::Patch());
+ modal->Show(versionStr);
break;
case 4:
tile->StartSysInfoApp();
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-22 13:30:21 +0000