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

diff --git a/src/displayapp/screens/FlashLight.h b/src/displayapp/screens/FlashLight.h
new file mode 100644
index 00000000..c62472ab
--- /dev/null
+++ b/src/displayapp/screens/FlashLight.h
@@ -0,0 +1,36 @@
+#pragma once
+
+#include <cstdint>
+#include "Screen.h"
+#include <lvgl/lvgl.h>
+#include "systemtask/SystemTask.h"
+#include "components/brightness/BrightnessController.h"
+
+
+namespace Pinetime {
+ 
+  namespace Applications {
+    namespace Screens {
+
+      class FlashLight : public Screen{
+        public:
+          FlashLight(DisplayApp* app, System::SystemTask &systemTask, Controllers::BrightnessController& brightness);
+          ~FlashLight() override;
+
+          bool Refresh() override;
+          
+          bool OnTouchEvent(Pinetime::Applications::TouchEvents event) override;
+          void OnClickEvent(lv_obj_t *obj, lv_event_t event);
+
+        private:
+          Pinetime::System::SystemTask& systemTask;
+          Controllers::BrightnessController& brightness;
+
+          lv_obj_t* flashLight;
+          lv_obj_t* backgroundAction;
+          bool isOn = true;
+
+      };
+    }
+  }
+}