From 698288d82202f5b55689db500033224f562481bc Mon Sep 17 00:00:00 2001 From: Eli Weiss Date: Sun, 2 Jan 2022 10:24:34 -0500 Subject: Added 12 hour set time --- src/displayapp/screens/settings/SettingSetTime.h | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'src/displayapp/screens/settings/SettingSetTime.h') diff --git a/src/displayapp/screens/settings/SettingSetTime.h b/src/displayapp/screens/settings/SettingSetTime.h index 8ba41eae..31f7d0be 100644 --- a/src/displayapp/screens/settings/SettingSetTime.h +++ b/src/displayapp/screens/settings/SettingSetTime.h @@ -3,6 +3,7 @@ #include #include #include "components/datetime/DateTimeController.h" +#include "components/settings/Settings.h" #include "displayapp/screens/Screen.h" namespace Pinetime { @@ -10,18 +11,24 @@ namespace Pinetime { namespace Screens { class SettingSetTime : public Screen{ public: - SettingSetTime(DisplayApp* app, Pinetime::Controllers::DateTime &dateTimeController); + SettingSetTime(DisplayApp* app, + Pinetime::Controllers::DateTime& dateTimeController, + Pinetime::Controllers::Settings& settingsController); ~SettingSetTime() override; void HandleButtonPress(lv_obj_t *object, lv_event_t event); - + 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; -- cgit v1.2.3