From 1f6e32fae73463ed5ec110a304998d90f6dc3ac4 Mon Sep 17 00:00:00 2001 From: davidpkj Date: Sun, 22 Jan 2023 17:48:03 +0100 Subject: Change: colors & menu items --- src/displayapp/screens/settings/SettingSetTime.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/displayapp/screens/settings/SettingSetTime.cpp') diff --git a/src/displayapp/screens/settings/SettingSetTime.cpp b/src/displayapp/screens/settings/SettingSetTime.cpp index 7fad33ae..25bfc94f 100644 --- a/src/displayapp/screens/settings/SettingSetTime.cpp +++ b/src/displayapp/screens/settings/SettingSetTime.cpp @@ -37,7 +37,7 @@ SettingSetTime::SettingSetTime(Pinetime::Applications::DisplayApp* app, lv_obj_align(title, lv_scr_act(), LV_ALIGN_IN_TOP_MID, 15, 15); lv_obj_t* icon = lv_label_create(lv_scr_act(), nullptr); - lv_obj_set_style_local_text_color(icon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_ORANGE); + lv_obj_set_style_local_text_color(icon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, Colors::primary); lv_label_set_text_static(icon, Symbols::clock); lv_label_set_align(icon, LV_LABEL_ALIGN_CENTER); lv_obj_align(icon, title, LV_ALIGN_OUT_LEFT_MID, -10, 0); -- cgit v1.2.3 From ad085e554060b9064e512f92da912e2c5dd15101 Mon Sep 17 00:00:00 2001 From: davidpkj Date: Tue, 24 Jan 2023 13:34:41 +0100 Subject: Fix: uniform date & time settings --- release.sh | 3 ++- src/displayapp/screens/settings/SettingSetDate.cpp | 4 ++-- src/displayapp/screens/settings/SettingSetTime.cpp | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) (limited to 'src/displayapp/screens/settings/SettingSetTime.cpp') diff --git a/release.sh b/release.sh index d9ecb8eb..3894affc 100755 --- a/release.sh +++ b/release.sh @@ -9,4 +9,5 @@ cmake -S . -B build/ \ -DBUILD_RESOURCES=1 \ -DBUILD_DFU=1 && cd build && -make -j6 pinetime-app +make -j6 pinetime-mcuboot-app && +echo "--- Done" && find "$(pwd)/src/" | grep zip diff --git a/src/displayapp/screens/settings/SettingSetDate.cpp b/src/displayapp/screens/settings/SettingSetDate.cpp index c8b1eadf..a30a5c7e 100644 --- a/src/displayapp/screens/settings/SettingSetDate.cpp +++ b/src/displayapp/screens/settings/SettingSetDate.cpp @@ -81,9 +81,9 @@ SettingSetDate::SettingSetDate(Pinetime::Applications::DisplayApp* app, btnSetTime = lv_btn_create(lv_scr_act(), nullptr); btnSetTime->user_data = this; - lv_obj_set_size(btnSetTime, 120, 48); + lv_obj_set_size(btnSetTime, LV_HOR_RES - 35, 48); lv_obj_align(btnSetTime, lv_scr_act(), LV_ALIGN_IN_BOTTOM_MID, 0, 0); - lv_obj_set_style_local_bg_color(btnSetTime, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_MAKE(0x38, 0x38, 0x38)); + lv_obj_set_style_local_bg_color(btnSetTime, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, Colors::bgAlt); lblSetTime = lv_label_create(btnSetTime, nullptr); lv_label_set_text_static(lblSetTime, "Set"); lv_obj_set_event_cb(btnSetTime, event_handler); diff --git a/src/displayapp/screens/settings/SettingSetTime.cpp b/src/displayapp/screens/settings/SettingSetTime.cpp index 25bfc94f..8ef50d53 100644 --- a/src/displayapp/screens/settings/SettingSetTime.cpp +++ b/src/displayapp/screens/settings/SettingSetTime.cpp @@ -43,7 +43,7 @@ SettingSetTime::SettingSetTime(Pinetime::Applications::DisplayApp* app, lv_obj_align(icon, title, LV_ALIGN_OUT_LEFT_MID, -10, 0); lv_obj_t* staticLabel = lv_label_create(lv_scr_act(), nullptr); - lv_obj_set_style_local_text_font(staticLabel, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_42); + lv_obj_set_style_local_text_font(staticLabel, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_bold_20); lv_label_set_text_static(staticLabel, "00:00:00"); lv_obj_align(staticLabel, lv_scr_act(), LV_ALIGN_CENTER, 0, POS_Y_TEXT); @@ -67,7 +67,7 @@ SettingSetTime::SettingSetTime(Pinetime::Applications::DisplayApp* app, btnSetTime = lv_btn_create(lv_scr_act(), nullptr); btnSetTime->user_data = this; - lv_obj_set_size(btnSetTime, 120, 50); + lv_obj_set_size(btnSetTime, LV_HOR_RES - 35, 48); lv_obj_align(btnSetTime, lv_scr_act(), LV_ALIGN_IN_BOTTOM_MID, 0, 0); lblSetTime = lv_label_create(btnSetTime, nullptr); lv_label_set_text_static(lblSetTime, "Set"); -- cgit v1.2.3 From 2b7c4b66e2da6f768d762add798999c7cdceffc5 Mon Sep 17 00:00:00 2001 From: davidpkj Date: Tue, 24 Jan 2023 14:02:59 +0100 Subject: Fix: uniform date & time settings label --- src/displayapp/screens/settings/SettingSetTime.cpp | 2 +- src/displayapp/screens/settings/SettingSetTime.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/displayapp/screens/settings/SettingSetTime.cpp') diff --git a/src/displayapp/screens/settings/SettingSetTime.cpp b/src/displayapp/screens/settings/SettingSetTime.cpp index 8ef50d53..af765871 100644 --- a/src/displayapp/screens/settings/SettingSetTime.cpp +++ b/src/displayapp/screens/settings/SettingSetTime.cpp @@ -44,7 +44,7 @@ SettingSetTime::SettingSetTime(Pinetime::Applications::DisplayApp* app, lv_obj_t* staticLabel = lv_label_create(lv_scr_act(), nullptr); lv_obj_set_style_local_text_font(staticLabel, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_bold_20); - lv_label_set_text_static(staticLabel, "00:00:00"); + lv_label_set_text_static(staticLabel, "00 : 00 : 00"); lv_obj_align(staticLabel, lv_scr_act(), LV_ALIGN_CENTER, 0, POS_Y_TEXT); hourCounter.Create(); diff --git a/src/displayapp/screens/settings/SettingSetTime.h b/src/displayapp/screens/settings/SettingSetTime.h index edd89b16..b9c26cd6 100644 --- a/src/displayapp/screens/settings/SettingSetTime.h +++ b/src/displayapp/screens/settings/SettingSetTime.h @@ -31,8 +31,8 @@ namespace Pinetime { lv_obj_t* lblampm; lv_obj_t* btnSetTime; lv_obj_t* lblSetTime; - Widgets::Counter hourCounter = Widgets::Counter(0, 23, jetbrains_mono_42); - Widgets::Counter minuteCounter = Widgets::Counter(0, 59, jetbrains_mono_42); + Widgets::Counter hourCounter = Widgets::Counter(0, 23, jetbrains_mono_bold_20); + Widgets::Counter minuteCounter = Widgets::Counter(0, 59, jetbrains_mono_bold_20); }; } } -- cgit v1.2.3