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, 9 insertions, 5 deletions

diff --git a/src/displayapp/screens/ApplicationList.h b/src/displayapp/screens/ApplicationList.h
index 0a0c6388..e334ccde 100644
--- a/src/displayapp/screens/ApplicationList.h
+++ b/src/displayapp/screens/ApplicationList.h
@@ -4,6 +4,9 @@
 
 #include "Screen.h"
 #include "ScreenList.h"
+#include "components/datetime/DateTimeController.h"
+#include "components/settings/Settings.h"
+#include "components/battery/BatteryController.h"
 
 namespace Pinetime {
   namespace Applications {
@@ -11,21 +14,22 @@ namespace Pinetime {
       class ApplicationList : public Screen {
         public:
           explicit ApplicationList(DisplayApp* app,
-            Pinetime::Controllers::Settings &settingsController);
+            Pinetime::Controllers::Settings &settingsController,
+            Pinetime::Controllers::Battery& batteryController,
+            Controllers::DateTime& dateTimeController);
           ~ApplicationList() override;
           bool Refresh() override;
-          bool OnButtonPushed() override;
           bool OnTouchEvent(TouchEvents event) override;
         private:
 
           Controllers::Settings& settingsController;
-          
-          bool running = true;
+          Pinetime::Controllers::Battery& batteryController;
+          Controllers::DateTime& dateTimeController;
 
           ScreenList<2> screens;
           std::unique_ptr<Screen> CreateScreen1();
           std::unique_ptr<Screen> CreateScreen2();
-          std::unique_ptr<Screen> CreateScreen3();
+          //std::unique_ptr<Screen> CreateScreen3();
       };
     }
   }