haui/InfiniTime_mirror
1
0
Fork 1
mirror of https://github.com/InfiniTimeOrg/InfiniTime.git synced 2024-10-22 23:21:53 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

updated WatchFaceMeow to match alignment, settings, AMPM compatibility of Infineat. also files that seemed to have been modified by submodules update.

Browse source
This commit is contained in:
Eve C 2024-07-10 10:34:37 +02:00
parent 164a21218f
commit e4d6014d88
5 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/displayapp/screens/WatchFaceMeow.cpp
View file

@ -292,10 +292,10 @@ WatchFaceMeow::WatchFaceMeow(Controllers::DateTime& dateTimeController,
lv_obj_align(stepValue, lv_scr_act(), LV_ALIGN_IN_BOTTOM_RIGHT, 10, 0); lv_obj_align(stepValue, lv_scr_act(), LV_ALIGN_IN_BOTTOM_RIGHT, 10, 0);
lv_label_set_text_static(stepValue, "0"); lv_label_set_text_static(stepValue, "0");
stepIcon = lv_label_create(lv_scr_act(), nullptr); pawIcon = lv_label_create(lv_scr_act(), nullptr);
lv_obj_set_style_local_text_color(stepIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pinkColor); lv_obj_set_style_local_text_color(pawIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pinkColor);
lv_label_set_text_static(stepIcon, Symbols::paw); lv_label_set_text_static(pawIcon, Symbols::paw);
lv_obj_align(stepIcon, stepValue, LV_ALIGN_OUT_LEFT_MID, -5, 0); lv_obj_align(pawIcon, stepValue, LV_ALIGN_OUT_LEFT_MID, -5, 0);
// Setting buttons // Setting buttons
@ -582,7 +582,7 @@ void WatchFaceMeow::Refresh() {
if (stepCount.IsUpdated()) { if (stepCount.IsUpdated()) {
lv_label_set_text_fmt(stepValue, "%lu", stepCount.Get()); 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(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)) { if (!lv_obj_get_hidden(btnSettings)) {

8
src/displayapp/screens/WatchFaceMeow.h
View file

@ -64,7 +64,7 @@ namespace Pinetime {
lv_point_t lineBatteryPoints[2]; lv_point_t lineBatteryPoints[2];
lv_obj_t* logoPine; lv_obj_t* logoCat;
lv_obj_t* timeContainer; lv_obj_t* timeContainer;
lv_obj_t* labelHour; lv_obj_t* labelHour;
@ -74,18 +74,20 @@ namespace Pinetime {
lv_obj_t* labelDate; lv_obj_t* labelDate;
lv_obj_t* bleIcon; lv_obj_t* bleIcon;
lv_obj_t* labelAlarm; lv_obj_t* labelAlarm;
lv_obj_t* labelTimeAmPmAlarm;
lv_obj_t* alarmIcon; lv_obj_t* alarmIcon;
lv_obj_t* stepIcon;
lv_obj_t* pawIcon; lv_obj_t* pawIcon;
lv_obj_t* stepValue; lv_obj_t* stepValue;
lv_obj_t* notificationIcon; lv_obj_t* notificationIcon;
lv_obj_t* btnClose; lv_obj_t* btnClose;
lv_obj_t* btnNextColor; lv_obj_t* btnNextColor;
lv_obj_t* btnToggleCover; lv_obj_t* btnToggleCover;
lv_obj_t* btnToggleAlarm;
lv_obj_t* btnPrevColor; lv_obj_t* btnPrevColor;
lv_obj_t* btnSettings; lv_obj_t* btnSettings;
lv_obj_t* labelBtnSettings; lv_obj_t* labelBtnSettings;
lv_obj_t* lblToggle; lv_obj_t* lblToggle;
lv_obj_t* lblAlarm;
lv_obj_t* lines[nLines]; lv_obj_t* lines[nLines];
@ -100,6 +102,8 @@ namespace Pinetime {
void SetBatteryLevel(uint8_t batteryPercent); void SetBatteryLevel(uint8_t batteryPercent);
void ToggleBatteryIndicatorColor(bool showSideCover); void ToggleBatteryIndicatorColor(bool showSideCover);
void ToggleShowAlarmStatus(bool showAlarmStatus);
lv_task_t* taskRefresh; lv_task_t* taskRefresh;
lv_font_t* font_teko = nullptr; lv_font_t* font_teko = nullptr;
lv_font_t* font_bebas = nullptr; lv_font_t* font_bebas = nullptr;

2
src/libs/QCBOR

@ -1 +1 @@
Subproject commit 56b17bf9f74096774944bcac0829adcd887d391e Subproject commit 5d83b9b47547b322bb50174fcc6afb74d8b4ae09

2
src/libs/arduinoFFT

@ -1 +1 @@
Subproject commit 419d7b044e56b87de8efbcf76f09c04759628fb4 Subproject commit 0da88512f90b0c8c6c5d50127045ee4f745e343b

2
src/libs/littlefs

@ -1 +1 @@
Subproject commit ead50807f1ca3fdf2da00b77a0ce02651ded2d13 Subproject commit d01280e64934a09ba16cac60cf9d3a37e228bb66