Merge branch 'develop' of github.com:JF002/Pinetime into develop

# Conflicts:
#	src/main.cpp
#	src/systemtask/SystemTask.h

1 files changed, 5 insertions, 1 deletions

diff --git a/src/displayapp/screens/ApplicationList.h b/src/displayapp/screens/ApplicationList.h
index aefb2385..0a0c6388 100644
--- a/src/displayapp/screens/ApplicationList.h
+++ b/src/displayapp/screens/ApplicationList.h
@@ -10,12 +10,16 @@ namespace Pinetime {
     namespace Screens {
       class ApplicationList : public Screen {
         public:
-          explicit ApplicationList(DisplayApp* app);
+          explicit ApplicationList(DisplayApp* app,
+            Pinetime::Controllers::Settings &settingsController);
           ~ApplicationList() override;
           bool Refresh() override;
           bool OnButtonPushed() override;
           bool OnTouchEvent(TouchEvents event) override;
         private:
+
+          Controllers::Settings& settingsController;
+          
           bool running = true;
 
           ScreenList<2> screens;