summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xrelease.sh3
-rw-r--r--src/displayapp/screens/settings/SettingSetDate.cpp4
-rw-r--r--src/displayapp/screens/settings/SettingSetTime.cpp4
3 files changed, 6 insertions, 5 deletions
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");