rei-forks
/
InfiniTime
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Code optimizations in SettingSetTime

This commit is contained in:
Tim Taenny 2021-07-09 17:13:29 +02:00
parent f78c9bfcab
commit 06dfe14251
1 changed files with 10 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/displayapp/screens/settings/SettingSetTime.cpp
View File

@ -19,19 +19,6 @@ SettingSetTime::SettingSetTime(
Screen(app), Screen(app),
dateTimeController {dateTimeController} dateTimeController {dateTimeController}
{ {
lv_obj_t * container1 = lv_cont_create(lv_scr_act(), nullptr);
//lv_obj_set_style_local_bg_color(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x111111));
lv_obj_set_style_local_bg_opa(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_TRANSP);
lv_obj_set_style_local_pad_all(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, 10);
lv_obj_set_style_local_pad_inner(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, 5);
lv_obj_set_style_local_border_width(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, 0);
lv_obj_set_pos(container1, 30, 60);
lv_obj_set_width(container1, LV_HOR_RES - 50);
lv_obj_set_height(container1, LV_VER_RES - 60);
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);
lv_label_set_text_static(title, "Set current time"); lv_label_set_text_static(title, "Set current time");
lv_label_set_align(title, LV_LABEL_ALIGN_CENTER); lv_label_set_align(title, LV_LABEL_ALIGN_CENTER);
@ -106,8 +93,8 @@ SettingSetTime::SettingSetTime(
btnSetTime = lv_btn_create(lv_scr_act(), NULL); btnSetTime = lv_btn_create(lv_scr_act(), NULL);
btnSetTime->user_data = this; btnSetTime->user_data = this;
lv_obj_set_size(btnSetTime, 70, 40); lv_obj_set_size(btnSetTime, 120, 48);
lv_obj_align(btnSetTime, lv_scr_act(), LV_ALIGN_CENTER, 0, 90); lv_obj_align(btnSetTime, lv_scr_act(), LV_ALIGN_IN_BOTTOM_MID, 0, 0);
lv_obj_set_style_local_value_str(btnSetTime, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, "Set"); lv_obj_set_style_local_value_str(btnSetTime, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, "Set");
lv_obj_set_event_cb(btnSetTime, event_handler); lv_obj_set_event_cb(btnSetTime, event_handler);
} }
@ -123,7 +110,10 @@ bool SettingSetTime::Refresh() {
void SettingSetTime::HandleButtonPress(lv_obj_t *object, lv_event_t event) { void SettingSetTime::HandleButtonPress(lv_obj_t *object, lv_event_t event) {
if(object == btnHoursPlus && (event == LV_EVENT_PRESSED)) { if (event != LV_EVENT_CLICKED)
return;
if (object == btnHoursPlus) {
hoursValue++; hoursValue++;
if (hoursValue > 23) if (hoursValue > 23)
hoursValue = 0; hoursValue = 0;
@ -131,8 +121,7 @@ void SettingSetTime::HandleButtonPress(lv_obj_t *object, lv_event_t event) {
lv_obj_align(lblHours, lv_scr_act(), LV_ALIGN_CENTER, -72, -6); lv_obj_align(lblHours, lv_scr_act(), LV_ALIGN_CENTER, -72, -6);
lv_btn_set_state(btnSetTime, LV_BTN_STATE_RELEASED); lv_btn_set_state(btnSetTime, LV_BTN_STATE_RELEASED);
} }
else if (object == btnHoursMinus) {
if(object == btnHoursMinus && (event == LV_EVENT_PRESSED)) {
hoursValue--; hoursValue--;
if (hoursValue < 0) if (hoursValue < 0)
hoursValue = 23; hoursValue = 23;
@ -140,8 +129,7 @@ void SettingSetTime::HandleButtonPress(lv_obj_t *object, lv_event_t event) {
lv_obj_align(lblHours, lv_scr_act(), LV_ALIGN_CENTER, -72, -6); lv_obj_align(lblHours, lv_scr_act(), LV_ALIGN_CENTER, -72, -6);
lv_btn_set_state(btnSetTime, LV_BTN_STATE_RELEASED); lv_btn_set_state(btnSetTime, LV_BTN_STATE_RELEASED);
} }
else if (object == btnMinutesPlus) {
if(object == btnMinutesPlus && (event == LV_EVENT_PRESSED)) {
minutesValue++; minutesValue++;
if (minutesValue > 59) if (minutesValue > 59)
minutesValue = 0; minutesValue = 0;
@ -149,8 +137,7 @@ void SettingSetTime::HandleButtonPress(lv_obj_t *object, lv_event_t event) {
lv_obj_align(lblMinutes, lv_scr_act(), LV_ALIGN_CENTER, 0, -6); lv_obj_align(lblMinutes, lv_scr_act(), LV_ALIGN_CENTER, 0, -6);
lv_btn_set_state(btnSetTime, LV_BTN_STATE_RELEASED); lv_btn_set_state(btnSetTime, LV_BTN_STATE_RELEASED);
} }
else if (object == btnMinutesMinus) {
if(object == btnMinutesMinus && (event == LV_EVENT_PRESSED)) {
minutesValue--; minutesValue--;
if (minutesValue < 0) if (minutesValue < 0)
minutesValue = 59; minutesValue = 59;
@ -158,8 +145,7 @@ void SettingSetTime::HandleButtonPress(lv_obj_t *object, lv_event_t event) {
lv_obj_align(lblMinutes, lv_scr_act(), LV_ALIGN_CENTER, 0, -6); lv_obj_align(lblMinutes, lv_scr_act(), LV_ALIGN_CENTER, 0, -6);
lv_btn_set_state(btnSetTime, LV_BTN_STATE_RELEASED); lv_btn_set_state(btnSetTime, LV_BTN_STATE_RELEASED);
} }
else if (object == btnSetTime) {
if(object == btnSetTime && (event == LV_EVENT_PRESSED)) {
NRF_LOG_INFO("Setting time (manually) to %02d:%02d:00", hoursValue, minutesValue); NRF_LOG_INFO("Setting time (manually) to %02d:%02d:00", hoursValue, minutesValue);
dateTimeController.SetTime(dateTimeController.Year(), dateTimeController.SetTime(dateTimeController.Year(),
static_cast<uint8_t>(dateTimeController.Month()), static_cast<uint8_t>(dateTimeController.Month()),