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

Corrected code formatting

Browse Source 
Corrected formatting and removed unnecessary variable time24H
This commit is contained in:
Eli Weiss 2022-01-11 16:23:49 -05:00 committed by JF
parent d86f81b9ad
commit 02e94acf18
2 changed files with 30 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -114,13 +114,38 @@ SettingSetTime::SettingSetTime(Pinetime::Applications::DisplayApp* app,
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);
setHourLabels(hoursValue); setHourLabels();
} }
SettingSetTime::~SettingSetTime() { SettingSetTime::~SettingSetTime() {
lv_obj_clean(lv_scr_act()); lv_obj_clean(lv_scr_act());
} }
void SettingSetTime::setHourLabels() {
if (settingsController.GetClockType() == Controllers::Settings::ClockType::H12) {
switch (hoursValue) {
case 0:
lv_label_set_text_static(lblHours, "12");
lv_label_set_text_static(lblampm, "AM");
break;
case 1 ... 11:
lv_label_set_text_fmt(lblHours, "%02d", hoursValue);
lv_label_set_text_static(lblampm, "AM");
break;
case 12:
lv_label_set_text_static(lblHours, "12");
lv_label_set_text_static(lblampm, "PM");
break;
case 13 ... 23:
lv_label_set_text_fmt(lblHours, "%02d", hoursValue - 12);
lv_label_set_text_static(lblampm, "PM");
break;
}
} else {
lv_label_set_text_fmt(lblHours, "%02d", hoursValue);
}
}
void SettingSetTime::HandleButtonPress(lv_obj_t* object, lv_event_t event) { void SettingSetTime::HandleButtonPress(lv_obj_t* object, lv_event_t event) {
if (event != LV_EVENT_CLICKED) if (event != LV_EVENT_CLICKED)
return; return;
@ -130,14 +155,14 @@ void SettingSetTime::HandleButtonPress(lv_obj_t* object, lv_event_t event) {
if (hoursValue > 23) { if (hoursValue > 23) {
hoursValue = 0; hoursValue = 0;
} }
setHourLabels(hoursValue); setHourLabels();
lv_btn_set_state(btnSetTime, LV_BTN_STATE_RELEASED); lv_btn_set_state(btnSetTime, LV_BTN_STATE_RELEASED);
} else if (object == btnHoursMinus) { } else if (object == btnHoursMinus) {
hoursValue--; hoursValue--;
if (hoursValue < 0) { if (hoursValue < 0) {
hoursValue = 23; hoursValue = 23;
} }
setHourLabels(hoursValue); setHourLabels();
lv_btn_set_state(btnSetTime, LV_BTN_STATE_RELEASED); lv_btn_set_state(btnSetTime, LV_BTN_STATE_RELEASED);
} else if (object == btnMinutesPlus) { } else if (object == btnMinutesPlus) {
minutesValue++; minutesValue++;

27
src/displayapp/screens/settings/SettingSetTime.h
View File

@ -22,6 +22,8 @@ namespace Pinetime {
Controllers::DateTime& dateTimeController; Controllers::DateTime& dateTimeController;
Controllers::Settings& settingsController; Controllers::Settings& settingsController;
void setHourLabels();
int hoursValue; int hoursValue;
int minutesValue; int minutesValue;
lv_obj_t* lblHours; lv_obj_t* lblHours;
@ -32,31 +34,6 @@ namespace Pinetime {
lv_obj_t* btnMinutesPlus; lv_obj_t* btnMinutesPlus;
lv_obj_t* btnMinutesMinus; lv_obj_t* btnMinutesMinus;
lv_obj_t* btnSetTime; lv_obj_t* btnSetTime;
void setHourLabels(int time24H) {
switch (time24H) {
if (settingsController.GetClockType() == Controllers::Settings::ClockType::H12) {
case 0:
lv_label_set_text_static(lblHours, "12");
lv_label_set_text_static(lblampm, "AM");
break;
case 1 ... 11:
lv_label_set_text_fmt(lblHours, "%02d", time24H);
lv_label_set_text_static(lblampm, "AM");
break;
case 12:
lv_label_set_text_static(lblHours, "12");
lv_label_set_text_static(lblampm, "PM");
break;
case 13 ... 23:
lv_label_set_text_fmt(lblHours, "%02d", time24H - 12);
lv_label_set_text_static(lblampm, "PM");
break;
} else {
lv_label_set_text_fmt(lblHours, "%02d", hoursValue);
}
}
}
}; };
} }
} }