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

Consolidated time conversion logic

Browse Source 
Consolidated 24 hour to 12 hour time conversion logic into function, addressed formatting issues, cleaned up code.
This commit is contained in:
Eli Weiss
2022-01-09 10:39:04 -05:00
committed by JF
parent 1813399959
commit 5be2f57a78
2 changed files with 94 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,31 +9,29 @@
namespace Pinetime {
namespace Applications {
namespace Screens {
class SettingSetTime : public Screen{
public:
SettingSetTime(DisplayApp* app,
Pinetime::Controllers::DateTime& dateTimeController,
Pinetime::Controllers::Settings& settingsController);
~SettingSetTime() override;
class SettingSetTime : public Screen {
public:
SettingSetTime(DisplayApp* app,
Pinetime::Controllers::DateTime& dateTimeController,
Pinetime::Controllers::Settings& settingsController);
~SettingSetTime() override;
void HandleButtonPress(lv_obj_t *object, lv_event_t event);
void HandleButtonPress(lv_obj_t* object, lv_event_t event);
private:
Controllers::DateTime& dateTimeController;
Controllers::Settings& settingsController;
private:
Controllers::DateTime& dateTimeController;
Controllers::Settings& settingsController;
int hoursValue;
int minutesValue;
char ampmValue[3];
bool is24H;
lv_obj_t * lblHours;
lv_obj_t * lblMinutes;
lv_obj_t * lblampm;
lv_obj_t * btnHoursPlus;
lv_obj_t * btnHoursMinus;
lv_obj_t * btnMinutesPlus;
lv_obj_t * btnMinutesMinus;
lv_obj_t * btnSetTime;
int hoursValue;
int minutesValue;
lv_obj_t* lblHours;
lv_obj_t* lblMinutes;
lv_obj_t* lblampm;
lv_obj_t* btnHoursPlus;
lv_obj_t* btnHoursMinus;
lv_obj_t* btnMinutesPlus;
lv_obj_t* btnMinutesMinus;
lv_obj_t* btnSetTime;
};
}
}