Merge branch 'develop' into infineat-external-resources

# Conflicts:
#	src/displayapp/screens/Symbols.h
#	src/displayapp/screens/settings/SettingWatchFace.cpp
#	src/displayapp/screens/settings/SettingWatchFace.h

1 files changed, 5 insertions, 11 deletions

diff --git a/src/displayapp/screens/settings/SettingSetTime.h b/src/displayapp/screens/settings/SettingSetTime.h
index d02c332e..e0b42bdd 100644
--- a/src/displayapp/screens/settings/SettingSetTime.h
+++ b/src/displayapp/screens/settings/SettingSetTime.h
@@ -4,6 +4,7 @@
 #include <lvgl/lvgl.h>
 #include "components/datetime/DateTimeController.h"
 #include "components/settings/Settings.h"
+#include "displayapp/widgets/Counter.h"
 #include "displayapp/screens/Screen.h"
 
 namespace Pinetime {
@@ -16,24 +17,17 @@ namespace Pinetime {
                        Pinetime::Controllers::Settings& settingsController);
         ~SettingSetTime() override;
 
-        void HandleButtonPress(lv_obj_t* object, lv_event_t event);
+        void SetTime();
+        void UpdateScreen();
 
       private:
         Controllers::DateTime& dateTimeController;
         Controllers::Settings& settingsController;
 
-        void SetHourLabels();
-
-        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;
+        Widgets::Counter hourCounter = Widgets::Counter(0, 23, jetbrains_mono_42);
+        Widgets::Counter minuteCounter = Widgets::Counter(0, 59, jetbrains_mono_42);
       };
     }
   }