Merge branch 'develop' into motion-sensor

# Conflicts:
#	src/CMakeLists.txt
#	src/displayapp/Apps.h
#	src/displayapp/DisplayApp.cpp
#	src/displayapp/DisplayApp.h
#	src/displayapp/lv_pinetime_theme.c
#	src/displayapp/screens/ApplicationList.cpp
#	src/drivers/TwiMaster.cpp
#	src/systemtask/SystemTask.h

1 files changed, 37 insertions, 0 deletions

diff --git a/src/displayapp/screens/settings/Settings.h b/src/displayapp/screens/settings/Settings.h
new file mode 100644
index 00000000..9955e1d4
--- /dev/null
+++ b/src/displayapp/screens/settings/Settings.h
@@ -0,0 +1,37 @@
+#pragma once
+
+#include <cstdint>
+#include "displayapp/screens/Screen.h"
+#include "displayapp/screens/ScreenList.h"
+
+namespace Pinetime {
+
+
+  namespace Applications {
+    namespace Screens {
+
+      class Settings : public Screen{
+        public:
+          Settings(DisplayApp* app,
+          Pinetime::Controllers::Settings &settingsController);
+          ~Settings() override;
+
+          bool Refresh() override;
+          
+          void OnButtonEvent(lv_obj_t *object, lv_event_t event);
+          bool OnTouchEvent(Pinetime::Applications::TouchEvents event) override;
+
+        private:          
+
+          Controllers::Settings& settingsController;
+          
+          ScreenList<2> screens;
+
+          std::unique_ptr<Screen> CreateScreen1();
+          std::unique_ptr<Screen> CreateScreen2();
+
+
+      };
+    }
+  }
+}