From 6ce316dc0641abd60de8417b80bccbd2e5418d5d Mon Sep 17 00:00:00 2001 From: Eve C Date: Mon, 15 Jul 2024 16:39:17 +0200 Subject: [PATCH] hide alarm depending on option status --- src/displayapp/screens/WatchFaceInfineat.cpp | 1 + src/displayapp/screens/WatchFaceMeow.cpp | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/displayapp/screens/WatchFaceInfineat.cpp b/src/displayapp/screens/WatchFaceInfineat.cpp index a411a477..952688f6 100644 --- a/src/displayapp/screens/WatchFaceInfineat.cpp +++ b/src/displayapp/screens/WatchFaceInfineat.cpp @@ -259,6 +259,7 @@ WatchFaceInfineat::WatchFaceInfineat(Controllers::DateTime& dateTimeController, lv_obj_set_hidden(alarmIcon, true); lv_obj_set_hidden(labelTimeAmPmAlarm, true); } + stepValue = lv_label_create(lv_scr_act(), nullptr); lv_obj_set_style_local_text_color(stepValue, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, grayColor); lv_obj_set_style_local_text_font(stepValue, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, font_teko); diff --git a/src/displayapp/screens/WatchFaceMeow.cpp b/src/displayapp/screens/WatchFaceMeow.cpp index 5097988b..9f4ae2b8 100644 --- a/src/displayapp/screens/WatchFaceMeow.cpp +++ b/src/displayapp/screens/WatchFaceMeow.cpp @@ -284,8 +284,16 @@ WatchFaceMeow::WatchFaceMeow(Controllers::DateTime& dateTimeController, // symbol alarmIcon = lv_label_create(lv_scr_act(), nullptr); lv_obj_set_style_local_text_color(alarmIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pinkColor); - lv_label_set_text_static(alarmIcon, Symbols::paw); + lv_label_set_text_static(alarmIcon, Symbols::zzz); lv_obj_align(alarmIcon, labelAlarm, LV_ALIGN_OUT_LEFT_MID, -3, 0); + + // don't show the icons jsut set if we don't show alarm status + if (!settingsController.GetInfineatShowAlarmStatus()) { + lv_obj_set_hidden(labelAlarm, true); + lv_obj_set_hidden(alarmIcon, true); + lv_obj_set_hidden(labelTimeAmPmAlarm, true); + } + stepValue = lv_label_create(lv_scr_act(), nullptr); lv_obj_set_style_local_text_color(stepValue, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pinkColor); lv_obj_set_style_local_text_font(stepValue, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, font_teko);