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, 57 insertions, 0 deletions

diff --git a/src/displayapp/screens/settings/QuickSettings.h b/src/displayapp/screens/settings/QuickSettings.h
new file mode 100644
index 00000000..329be55b
--- /dev/null
+++ b/src/displayapp/screens/settings/QuickSettings.h
@@ -0,0 +1,57 @@
+#pragma once
+
+#include <cstdint>
+#include <FreeRTOS.h>
+#include <timers.h>
+#include "displayapp/screens/Screen.h"
+#include <lvgl/lvgl.h>
+#include "components/datetime/DateTimeController.h"
+#include "components/brightness/BrightnessController.h"
+#include "components/settings/Settings.h"
+#include "components/battery/BatteryController.h"
+
+
+namespace Pinetime {
+
+  namespace Applications {
+    namespace Screens {
+
+      class QuickSettings : public Screen{
+        public:
+          QuickSettings(DisplayApp* app, 
+            Pinetime::Controllers::Battery& batteryController,
+            Controllers::DateTime& dateTimeController,
+            Controllers::BrightnessController& brightness,
+            Pinetime::Controllers::Settings &settingsController);
+
+          ~QuickSettings() override;
+
+          bool Refresh() override;
+          
+          bool OnTouchEvent(Pinetime::Applications::TouchEvents event) override;
+          void OnButtonEvent(lv_obj_t *object, lv_event_t event);
+
+          void UpdateScreen();
+
+        private:          
+
+          Pinetime::Controllers::Battery& batteryController;
+          Controllers::DateTime& dateTimeController;
+          Controllers::BrightnessController& brightness;
+          Controllers::Settings& settingsController;
+
+          lv_task_t* taskUpdate;
+          lv_obj_t * batteryIcon;
+          lv_obj_t * label_time;
+
+          lv_obj_t * btn1;
+          lv_obj_t * btn1_lvl;
+          lv_obj_t * btn2;
+          lv_obj_t * btn3;
+          lv_obj_t * btn3_lvl;
+          lv_obj_t * btn4;
+
+      };
+    }
+  }
+}