diff --git a/src/displayapp/screens/WatchFaceMeow.cpp b/src/displayapp/screens/WatchFaceMeow.cpp index ca2de2c6..25891c22 100644 --- a/src/displayapp/screens/WatchFaceMeow.cpp +++ b/src/displayapp/screens/WatchFaceMeow.cpp @@ -292,10 +292,10 @@ WatchFaceMeow::WatchFaceMeow(Controllers::DateTime& dateTimeController, lv_obj_align(stepValue, lv_scr_act(), LV_ALIGN_IN_BOTTOM_RIGHT, 10, 0); lv_label_set_text_static(stepValue, "0"); - stepIcon = lv_label_create(lv_scr_act(), nullptr); - lv_obj_set_style_local_text_color(stepIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pinkColor); - lv_label_set_text_static(stepIcon, Symbols::paw); - lv_obj_align(stepIcon, stepValue, LV_ALIGN_OUT_LEFT_MID, -5, 0); + pawIcon = lv_label_create(lv_scr_act(), nullptr); + lv_obj_set_style_local_text_color(pawIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pinkColor); + lv_label_set_text_static(pawIcon, Symbols::paw); + lv_obj_align(pawIcon, stepValue, LV_ALIGN_OUT_LEFT_MID, -5, 0); // Setting buttons @@ -582,7 +582,7 @@ void WatchFaceMeow::Refresh() { if (stepCount.IsUpdated()) { lv_label_set_text_fmt(stepValue, "%lu", stepCount.Get()); lv_obj_align(stepValue, lv_scr_act(), LV_ALIGN_IN_BOTTOM_MID, 10, 0); - lv_obj_align(stepIcon, stepValue, LV_ALIGN_OUT_LEFT_MID, -5, 0); + lv_obj_align(pawIcon, stepValue, LV_ALIGN_OUT_LEFT_MID, -5, 0); } if (!lv_obj_get_hidden(btnSettings)) { diff --git a/src/displayapp/screens/WatchFaceMeow.h b/src/displayapp/screens/WatchFaceMeow.h index 8978f5bf..1fdacec3 100644 --- a/src/displayapp/screens/WatchFaceMeow.h +++ b/src/displayapp/screens/WatchFaceMeow.h @@ -64,7 +64,7 @@ namespace Pinetime { lv_point_t lineBatteryPoints[2]; - lv_obj_t* logoPine; + lv_obj_t* logoCat; lv_obj_t* timeContainer; lv_obj_t* labelHour; @@ -74,18 +74,20 @@ namespace Pinetime { lv_obj_t* labelDate; lv_obj_t* bleIcon; lv_obj_t* labelAlarm; + lv_obj_t* labelTimeAmPmAlarm; lv_obj_t* alarmIcon; - lv_obj_t* stepIcon; lv_obj_t* pawIcon; lv_obj_t* stepValue; lv_obj_t* notificationIcon; lv_obj_t* btnClose; lv_obj_t* btnNextColor; lv_obj_t* btnToggleCover; + lv_obj_t* btnToggleAlarm; lv_obj_t* btnPrevColor; lv_obj_t* btnSettings; lv_obj_t* labelBtnSettings; lv_obj_t* lblToggle; + lv_obj_t* lblAlarm; lv_obj_t* lines[nLines]; @@ -100,6 +102,8 @@ namespace Pinetime { void SetBatteryLevel(uint8_t batteryPercent); void ToggleBatteryIndicatorColor(bool showSideCover); + void ToggleShowAlarmStatus(bool showAlarmStatus); + lv_task_t* taskRefresh; lv_font_t* font_teko = nullptr; lv_font_t* font_bebas = nullptr; diff --git a/src/libs/QCBOR b/src/libs/QCBOR index 56b17bf9..5d83b9b4 160000 --- a/src/libs/QCBOR +++ b/src/libs/QCBOR @@ -1 +1 @@ -Subproject commit 56b17bf9f74096774944bcac0829adcd887d391e +Subproject commit 5d83b9b47547b322bb50174fcc6afb74d8b4ae09 diff --git a/src/libs/arduinoFFT b/src/libs/arduinoFFT index 419d7b04..0da88512 160000 --- a/src/libs/arduinoFFT +++ b/src/libs/arduinoFFT @@ -1 +1 @@ -Subproject commit 419d7b044e56b87de8efbcf76f09c04759628fb4 +Subproject commit 0da88512f90b0c8c6c5d50127045ee4f745e343b diff --git a/src/libs/littlefs b/src/libs/littlefs index ead50807..d01280e6 160000 --- a/src/libs/littlefs +++ b/src/libs/littlefs @@ -1 +1 @@ -Subproject commit ead50807f1ca3fdf2da00b77a0ce02651ded2d13 +Subproject commit d01280e64934a09ba16cac60cf9d3a37e228bb66