Consolidated time conversion logic

Consolidated 24 hour to 12 hour time conversion logic into function, addressed formatting issues, cleaned up code.

1 files changed, 20 insertions, 22 deletions

diff --git a/src/displayapp/screens/settings/SettingSetTime.h b/src/displayapp/screens/settings/SettingSetTime.h
index 74588ca3..eb0423f2 100644
--- a/src/displayapp/screens/settings/SettingSetTime.h
+++ b/src/displayapp/screens/settings/SettingSetTime.h
@@ -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;
       };
     }
   }