will/InfiniTime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix button size and default step goal

Browse Source
This commit is contained in:
Joaquim 2021-04-20 16:21:01 +01:00
parent cd4a3e1dfe
commit 5fc07a8df7
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/settings/Settings.h
View File

@ -76,7 +76,7 @@ namespace Pinetime {
uint8_t clockFace = 0; uint8_t clockFace = 0;
uint32_t stepsGoal = 1000; uint32_t stepsGoal = 10000;
uint32_t screenTimeOut = 15000; uint32_t screenTimeOut = 15000;
WakeUpMode wakeUpMode = WakeUpMode::None; WakeUpMode wakeUpMode = WakeUpMode::None;

18
src/displayapp/screens/settings/SettingSteps.cpp
View File

@ -28,9 +28,6 @@ SettingSteps::SettingSteps(
lv_obj_set_pos(container1, 30, 60); lv_obj_set_pos(container1, 30, 60);
lv_obj_set_width(container1, LV_HOR_RES - 50); lv_obj_set_width(container1, LV_HOR_RES - 50);
lv_obj_set_height(container1, LV_VER_RES - 60); lv_obj_set_height(container1, LV_VER_RES - 60);
//lv_obj_set_auto_realign(container1, true);
//lv_obj_align_origo(container1, NULL, LV_ALIGN_CENTER, 0, 0);
//lv_cont_set_fit(container1, LV_FIT_MAX);
lv_cont_set_layout(container1, LV_LAYOUT_COLUMN_LEFT); lv_cont_set_layout(container1, LV_LAYOUT_COLUMN_LEFT);
lv_obj_t * title = lv_label_create(lv_scr_act(), NULL); lv_obj_t * title = lv_label_create(lv_scr_act(), NULL);
@ -50,23 +47,22 @@ SettingSteps::SettingSteps(
lv_obj_set_style_local_text_font(stepValue, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_42); lv_obj_set_style_local_text_font(stepValue, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_42);
lv_label_set_text_fmt(stepValue,"%i", settingsController.GetStepsGoal()); lv_label_set_text_fmt(stepValue,"%i", settingsController.GetStepsGoal());
lv_label_set_align(stepValue, LV_LABEL_ALIGN_CENTER); lv_label_set_align(stepValue, LV_LABEL_ALIGN_CENTER);
lv_obj_align(stepValue, lv_scr_act(), LV_ALIGN_CENTER, 0, 0); lv_obj_align(stepValue, lv_scr_act(), LV_ALIGN_CENTER, 0, -10);
btnPlus = lv_btn_create(lv_scr_act(), NULL); btnPlus = lv_btn_create(lv_scr_act(), NULL);
btnPlus->user_data = this; btnPlus->user_data = this;
lv_obj_set_size(btnPlus, 60, 40); lv_obj_set_size(btnPlus, 80, 50);
lv_obj_align(btnPlus, lv_scr_act(), LV_ALIGN_CENTER, 50, 80); lv_obj_align(btnPlus, lv_scr_act(), LV_ALIGN_CENTER, 55, 80);
lv_obj_set_style_local_value_str(btnPlus, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, "+"); lv_obj_set_style_local_value_str(btnPlus, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, "+");
lv_obj_set_event_cb(btnPlus, event_handler); lv_obj_set_event_cb(btnPlus, event_handler);
btnMinus = lv_btn_create(lv_scr_act(), NULL); btnMinus = lv_btn_create(lv_scr_act(), NULL);
btnMinus->user_data = this; btnMinus->user_data = this;
lv_obj_set_size(btnMinus, 60, 40); lv_obj_set_size(btnMinus, 80, 50);
lv_obj_set_event_cb(btnMinus, event_handler); lv_obj_set_event_cb(btnMinus, event_handler);
lv_obj_align(btnMinus, lv_scr_act(), LV_ALIGN_CENTER, -50, 80); lv_obj_align(btnMinus, lv_scr_act(), LV_ALIGN_CENTER, -55, 80);
lv_obj_set_style_local_value_str(btnMinus, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, "-"); lv_obj_set_style_local_value_str(btnMinus, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, "-");
} }
SettingSteps::~SettingSteps() { SettingSteps::~SettingSteps() {
@ -86,7 +82,7 @@ void SettingSteps::UpdateSelected(lv_obj_t *object, lv_event_t event) {
if ( value <= 500000 ) { if ( value <= 500000 ) {
settingsController.SetStepsGoal(value); settingsController.SetStepsGoal(value);
lv_label_set_text_fmt(stepValue,"%i", settingsController.GetStepsGoal()); lv_label_set_text_fmt(stepValue,"%i", settingsController.GetStepsGoal());
lv_obj_align(stepValue, lv_scr_act(), LV_ALIGN_CENTER, 0, 0); lv_obj_align(stepValue, lv_scr_act(), LV_ALIGN_CENTER, 0, -10);
} }
} }
@ -95,7 +91,7 @@ void SettingSteps::UpdateSelected(lv_obj_t *object, lv_event_t event) {
if ( value >= 1000 ) { if ( value >= 1000 ) {
settingsController.SetStepsGoal(value); settingsController.SetStepsGoal(value);
lv_label_set_text_fmt(stepValue,"%i", settingsController.GetStepsGoal()); lv_label_set_text_fmt(stepValue,"%i", settingsController.GetStepsGoal());
lv_obj_align(stepValue, lv_scr_act(), LV_ALIGN_CENTER, 0, 0); lv_obj_align(stepValue, lv_scr_act(), LV_ALIGN_CENTER, 0, -10);
} }
} }