Merge branch 'develop'

# Conflicts:
#	doc/buildAndProgram.md

1 files changed, 41 insertions, 0 deletions

diff --git a/src/displayapp/screens/settings/SettingSetDate.h b/src/displayapp/screens/settings/SettingSetDate.h
new file mode 100644
index 0000000..477337f
--- /dev/null
+++ b/src/displayapp/screens/settings/SettingSetDate.h
@@ -0,0 +1,41 @@
+#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 SettingSetDate : public Screen{
+        public:
+          SettingSetDate(DisplayApp* app, Pinetime::Controllers::DateTime &dateTimeController);
+          ~SettingSetDate() override;
+
+          void HandleButtonPress(lv_obj_t *object, lv_event_t event);
+         
+        private:
+          Controllers::DateTime& dateTimeController;
+
+          int dayValue;
+          int monthValue;
+          int yearValue;
+          lv_obj_t * lblDay;
+          lv_obj_t * lblMonth;
+          lv_obj_t * lblYear;
+          lv_obj_t * btnDayPlus;
+          lv_obj_t * btnDayMinus;
+          lv_obj_t * btnMonthPlus;
+          lv_obj_t * btnMonthMinus;
+          lv_obj_t * btnYearPlus;
+          lv_obj_t * btnYearMinus;
+          lv_obj_t * btnSetTime;
+
+          int MaximumDayOfMonth() const;
+          void CheckDay();
+          void UpdateMonthLabel();
+      };
+    }
+  }
+}