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

Changed setHourLabels function to handle 24H too

Browse Source 
Changed setHourLabels function to handle 24 hour time labeling, changed to private
This commit is contained in:
Eli Weiss 2022-01-11 10:24:17 -05:00 committed by JF
parent c8d998e82c
commit d86f81b9ad
2 changed files with 28 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,8 +23,6 @@ namespace {
} }
} }
void set12HourLabels(int time24H, lv_obj_t* lblampm, lv_obj_t* lblHours);
SettingSetTime::SettingSetTime(Pinetime::Applications::DisplayApp* app, SettingSetTime::SettingSetTime(Pinetime::Applications::DisplayApp* app,
Pinetime::Controllers::DateTime& dateTimeController, Pinetime::Controllers::DateTime& dateTimeController,
Pinetime::Controllers::Settings& settingsController) Pinetime::Controllers::Settings& settingsController)
@ -116,36 +114,13 @@ 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);
if (settingsController.GetClockType() == Controllers::Settings::ClockType::H12) { setHourLabels(hoursValue);
set12HourLabels(hoursValue, lblampm, lblHours);
}
} }
SettingSetTime::~SettingSetTime() { SettingSetTime::~SettingSetTime() {
lv_obj_clean(lv_scr_act()); lv_obj_clean(lv_scr_act());
} }
void set12HourLabels(int time24H, lv_obj_t* lblampm, lv_obj_t* lblHours) {
switch (time24H) {
case 0:
lv_label_set_text_fmt(lblHours, "%02d", 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_fmt(lblHours, "%02d", 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;
}
}
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;
@ -155,22 +130,14 @@ void SettingSetTime::HandleButtonPress(lv_obj_t* object, lv_event_t event) {
if (hoursValue > 23) { if (hoursValue > 23) {
hoursValue = 0; hoursValue = 0;
} }
if (settingsController.GetClockType() == Controllers::Settings::ClockType::H12) { setHourLabels(hoursValue);
set12HourLabels(hoursValue, lblampm, lblHours);
} else {
lv_label_set_text_fmt(lblHours, "%02d", hoursValue);
}
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;
} }
if (settingsController.GetClockType() == Controllers::Settings::ClockType::H12) { setHourLabels(hoursValue);
set12HourLabels(hoursValue, lblampm, lblHours);
} else {
lv_label_set_text_fmt(lblHours, "%02d", hoursValue);
}
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++;

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

@ -32,6 +32,31 @@ 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);
}
}
}
}; };
} }
} }