Merge with develop and fix conflicts from timaios:set-datetime-manually.

1 files changed, 37 insertions, 0 deletions

diff --git a/src/displayapp/screens/settings/SettingSetTime.h b/src/displayapp/screens/settings/SettingSetTime.h
new file mode 100644
index 00000000..63fb7d3e
--- /dev/null
+++ b/src/displayapp/screens/settings/SettingSetTime.h
@@ -0,0 +1,37 @@
+#pragma once
+
+#include <cstdint>
+#include <lvgl/lvgl.h>
+#include "components/datetime/DateTimeController.h"
+#include "displayapp/screens/Screen.h"
+
+namespace Pinetime {
+
+  namespace Applications {
+    namespace Screens {
+
+      class SettingSetTime : public Screen{
+        public:
+          SettingSetTime(DisplayApp* app, Pinetime::Controllers::DateTime &dateTimeController);
+          ~SettingSetTime() override;
+
+          void HandleButtonPress(lv_obj_t *object, lv_event_t event);
+         
+        private:          
+
+          Controllers::DateTime& dateTimeController;
+
+          int hoursValue;
+          int minutesValue;
+          lv_obj_t * lblHours;
+          lv_obj_t * lblMinutes;
+          lv_obj_t * btnHoursPlus;
+          lv_obj_t * btnHoursMinus;
+          lv_obj_t * btnMinutesPlus;
+          lv_obj_t * btnMinutesMinus;
+          lv_obj_t * btnSetTime;
+          
+      };
+    }
+  }
+}