screens: Remove unused DisplayApp parameters

72 files changed, 99 insertions, 156 deletions

diff --git a/src/displayapp/DisplayApp.cpp b/src/displayapp/DisplayApp.cpp
index 055a6a80..7b824ff2 100644
--- a/src/displayapp/DisplayApp.cpp
+++ b/src/displayapp/DisplayApp.cpp
@@ -361,8 +361,7 @@ void DisplayApp::LoadScreen(Apps app, DisplayApp::FullRefreshDirections directio
       break;
     case Apps::None:
     case Apps::Clock:
-      currentScreen = std::make_unique<Screens::Clock>(this,
-                                                       dateTimeController,
+      currentScreen = std::make_unique<Screens::Clock>(dateTimeController,
                                                        batteryController,
                                                        bleController,
                                                        notificationManager,
@@ -373,18 +372,18 @@ void DisplayApp::LoadScreen(Apps app, DisplayApp::FullRefreshDirections directio
       break;
 
     case Apps::Error:
-      currentScreen = std::make_unique<Screens::Error>(this, bootError);
+      currentScreen = std::make_unique<Screens::Error>(bootError);
       break;
 
     case Apps::FirmwareValidation:
-      currentScreen = std::make_unique<Screens::FirmwareValidation>(this, validator);
+      currentScreen = std::make_unique<Screens::FirmwareValidation>(validator);
       break;
     case Apps::FirmwareUpdate:
-      currentScreen = std::make_unique<Screens::FirmwareUpdate>(this, bleController);
+      currentScreen = std::make_unique<Screens::FirmwareUpdate>(bleController);
       break;
 
     case Apps::PassKey:
-      currentScreen = std::make_unique<Screens::PassKey>(this, bleController.GetPairingKey());
+      currentScreen = std::make_unique<Screens::PassKey>(bleController.GetPairingKey());
       break;
 
     case Apps::Notifications:
@@ -404,11 +403,10 @@ void DisplayApp::LoadScreen(Apps app, DisplayApp::FullRefreshDirections directio
                                                                Screens::Notifications::Modes::Preview);
       break;
     case Apps::Timer:
-      currentScreen = std::make_unique<Screens::Timer>(this, timerController);
+      currentScreen = std::make_unique<Screens::Timer>(timerController);
       break;
     case Apps::Alarm:
-      currentScreen =
-        std::make_unique<Screens::Alarm>(this, alarmController, settingsController.GetClockType(), *systemTask, motorController);
+      currentScreen = std::make_unique<Screens::Alarm>(alarmController, settingsController.GetClockType(), *systemTask, motorController);
       break;
 
     // Settings
@@ -428,31 +426,31 @@ void DisplayApp::LoadScreen(Apps app, DisplayApp::FullRefreshDirections directio
       currentScreen = std::make_unique<Screens::SettingWatchFace>(this, settingsController, filesystem);
       break;
     case Apps::SettingTimeFormat:
-      currentScreen = std::make_unique<Screens::SettingTimeFormat>(this, settingsController);
+      currentScreen = std::make_unique<Screens::SettingTimeFormat>(settingsController);
       break;
     case Apps::SettingWakeUp:
-      currentScreen = std::make_unique<Screens::SettingWakeUp>(this, settingsController);
+      currentScreen = std::make_unique<Screens::SettingWakeUp>(settingsController);
       break;
     case Apps::SettingDisplay:
       currentScreen = std::make_unique<Screens::SettingDisplay>(this, settingsController);
       break;
     case Apps::SettingSteps:
-      currentScreen = std::make_unique<Screens::SettingSteps>(this, settingsController);
+      currentScreen = std::make_unique<Screens::SettingSteps>(settingsController);
       break;
     case Apps::SettingSetDateTime:
       currentScreen = std::make_unique<Screens::SettingSetDateTime>(this, dateTimeController, settingsController);
       break;
     case Apps::SettingChimes:
-      currentScreen = std::make_unique<Screens::SettingChimes>(this, settingsController);
+      currentScreen = std::make_unique<Screens::SettingChimes>(settingsController);
       break;
     case Apps::SettingShakeThreshold:
-      currentScreen = std::make_unique<Screens::SettingShakeThreshold>(this, settingsController, motionController, *systemTask);
+      currentScreen = std::make_unique<Screens::SettingShakeThreshold>(settingsController, motionController, *systemTask);
       break;
     case Apps::SettingBluetooth:
       currentScreen = std::make_unique<Screens::SettingBluetooth>(this, settingsController);
       break;
     case Apps::BatteryInfo:
-      currentScreen = std::make_unique<Screens::BatteryInfo>(this, batteryController);
+      currentScreen = std::make_unique<Screens::BatteryInfo>(batteryController);
       break;
     case Apps::SysInfo:
       currentScreen = std::make_unique<Screens::SystemInfo>(this,
@@ -465,37 +463,37 @@ void DisplayApp::LoadScreen(Apps app, DisplayApp::FullRefreshDirections directio
                                                             touchPanel);
       break;
     case Apps::FlashLight:
-      currentScreen = std::make_unique<Screens::FlashLight>(this, *systemTask, brightnessController);
+      currentScreen = std::make_unique<Screens::FlashLight>(*systemTask, brightnessController);
       break;
     case Apps::StopWatch:
-      currentScreen = std::make_unique<Screens::StopWatch>(this, *systemTask);
+      currentScreen = std::make_unique<Screens::StopWatch>(*systemTask);
       break;
     case Apps::Twos:
-      currentScreen = std::make_unique<Screens::Twos>(this);
+      currentScreen = std::make_unique<Screens::Twos>();
       break;
     case Apps::Paint:
-      currentScreen = std::make_unique<Screens::InfiniPaint>(this, lvgl, motorController);
+      currentScreen = std::make_unique<Screens::InfiniPaint>(lvgl, motorController);
       break;
     case Apps::Paddle:
-      currentScreen = std::make_unique<Screens::Paddle>(this, lvgl);
+      currentScreen = std::make_unique<Screens::Paddle>(lvgl);
       break;
     case Apps::Music:
-      currentScreen = std::make_unique<Screens::Music>(this, systemTask->nimble().music());
+      currentScreen = std::make_unique<Screens::Music>(systemTask->nimble().music());
       break;
     case Apps::Navigation:
-      currentScreen = std::make_unique<Screens::Navigation>(this, systemTask->nimble().navigation());
+      currentScreen = std::make_unique<Screens::Navigation>(systemTask->nimble().navigation());
       break;
     case Apps::HeartRate:
-      currentScreen = std::make_unique<Screens::HeartRate>(this, heartRateController, *systemTask);
+      currentScreen = std::make_unique<Screens::HeartRate>(heartRateController, *systemTask);
       break;
     case Apps::Metronome:
-      currentScreen = std::make_unique<Screens::Metronome>(this, motorController, *systemTask);
+      currentScreen = std::make_unique<Screens::Metronome>(motorController, *systemTask);
       break;
     case Apps::Motion:
-      currentScreen = std::make_unique<Screens::Motion>(this, motionController);
+      currentScreen = std::make_unique<Screens::Motion>(motionController);
       break;
     case Apps::Steps:
-      currentScreen = std::make_unique<Screens::Steps>(this, motionController, settingsController);
+      currentScreen = std::make_unique<Screens::Steps>(motionController, settingsController);
       break;
   }
   currentApp = app;
diff --git a/src/displayapp/screens/Alarm.cpp b/src/displayapp/screens/Alarm.cpp
index 4c8d7568..4e6ce797 100644
--- a/src/displayapp/screens/Alarm.cpp
+++ b/src/displayapp/screens/Alarm.cpp
@@ -40,8 +40,7 @@ static void StopAlarmTaskCallback(lv_task_t* task) {
   screen->StopAlerting();
 }
 
-Alarm::Alarm(DisplayApp* app,
-             Controllers::AlarmController& alarmController,
+Alarm::Alarm(Controllers::AlarmController& alarmController,
              Controllers::Settings::ClockType clockType,
              System::SystemTask& systemTask,
              Controllers::MotorController& motorController)
diff --git a/src/displayapp/screens/Alarm.h b/src/displayapp/screens/Alarm.h
index d7935549..91177366 100644
--- a/src/displayapp/screens/Alarm.h
+++ b/src/displayapp/screens/Alarm.h
@@ -28,8 +28,7 @@ namespace Pinetime {
     namespace Screens {
       class Alarm : public Screen {
       public:
-        Alarm(DisplayApp* app,
-              Controllers::AlarmController& alarmController,
+        Alarm(Controllers::AlarmController& alarmController,
               Controllers::Settings::ClockType clockType,
               System::SystemTask& systemTask,
               Controllers::MotorController& motorController);
diff --git a/src/displayapp/screens/BatteryInfo.cpp b/src/displayapp/screens/BatteryInfo.cpp
index 1ed6172d..7cfd0aca 100644
--- a/src/displayapp/screens/BatteryInfo.cpp
+++ b/src/displayapp/screens/BatteryInfo.cpp
@@ -5,8 +5,7 @@
 
 using namespace Pinetime::Applications::Screens;
 
-BatteryInfo::BatteryInfo(Pinetime::Applications::DisplayApp* app, const Pinetime::Controllers::Battery& batteryController)
-  : batteryController {batteryController} {
+BatteryInfo::BatteryInfo(const Pinetime::Controllers::Battery& batteryController) : batteryController {batteryController} {
 
   batteryPercent = batteryController.PercentRemaining();
   batteryVoltage = batteryController.Voltage();
diff --git a/src/displayapp/screens/BatteryInfo.h b/src/displayapp/screens/BatteryInfo.h
index 2c32cebb..aa01d464 100644
--- a/src/displayapp/screens/BatteryInfo.h
+++ b/src/displayapp/screens/BatteryInfo.h
@@ -14,7 +14,7 @@ namespace Pinetime {
 
       class BatteryInfo : public Screen {
       public:
-        BatteryInfo(DisplayApp* app, const Pinetime::Controllers::Battery& batteryController);
+        BatteryInfo(const Pinetime::Controllers::Battery& batteryController);
         ~BatteryInfo() override;
 
         void Refresh() override;
diff --git a/src/displayapp/screens/CheckboxList.cpp b/src/displayapp/screens/CheckboxList.cpp
index 7388f9e3..9eb80bba 100644
--- a/src/displayapp/screens/CheckboxList.cpp
+++ b/src/displayapp/screens/CheckboxList.cpp
@@ -13,7 +13,6 @@ namespace {
 
 CheckboxList::CheckboxList(const uint8_t screenID,
                            const uint8_t numScreens,
-                           DisplayApp* app,
                            const char* optionsTitle,
                            const char* optionsSymbol,
                            uint32_t originalValue,
diff --git a/src/displayapp/screens/CheckboxList.h b/src/displayapp/screens/CheckboxList.h
index 359b835e..c208bc48 100644
--- a/src/displayapp/screens/CheckboxList.h
+++ b/src/displayapp/screens/CheckboxList.h
@@ -23,7 +23,6 @@ namespace Pinetime {
 
         CheckboxList(const uint8_t screenID,
                      const uint8_t numScreens,
-                     DisplayApp* app,
                      const char* optionsTitle,
                      const char* optionsSymbol,
                      uint32_t originalValue,
diff --git a/src/displayapp/screens/Clock.cpp b/src/displayapp/screens/Clock.cpp
index 8627fb45..73c2ab9b 100644
--- a/src/displayapp/screens/Clock.cpp
+++ b/src/displayapp/screens/Clock.cpp
@@ -17,8 +17,7 @@
 
 using namespace Pinetime::Applications::Screens;
 
-Clock::Clock(DisplayApp* app,
-             Controllers::DateTime& dateTimeController,
+Clock::Clock(Controllers::DateTime& dateTimeController,
              const Controllers::Battery& batteryController,
              const Controllers::Ble& bleController,
              Controllers::NotificationManager& notificationManager,
@@ -26,8 +25,7 @@ Clock::Clock(DisplayApp* app,
              Controllers::HeartRateController& heartRateController,
              Controllers::MotionController& motionController,
              Controllers::FS& filesystem)
-  : app {app},
-    dateTimeController {dateTimeController},
+  : dateTimeController {dateTimeController},
     batteryController {batteryController},
     bleController {bleController},
     notificationManager {notificationManager},
@@ -74,8 +72,7 @@ bool Clock::OnButtonPushed() {
 }
 
 std::unique_ptr<Screen> Clock::WatchFaceDigitalScreen() {
-  return std::make_unique<Screens::WatchFaceDigital>(app,
-                                                     dateTimeController,
+  return std::make_unique<Screens::WatchFaceDigital>(dateTimeController,
                                                      batteryController,
                                                      bleController,
                                                      notificationManager,
@@ -85,8 +82,7 @@ std::unique_ptr<Screen> Clock::WatchFaceDigitalScreen() {
 }
 
 std::unique_ptr<Screen> Clock::WatchFaceAnalogScreen() {
-  return std::make_unique<Screens::WatchFaceAnalog>(app,
-                                                    dateTimeController,
+  return std::make_unique<Screens::WatchFaceAnalog>(dateTimeController,
                                                     batteryController,
                                                     bleController,
                                                     notificationManager,
@@ -94,8 +90,7 @@ std::unique_ptr<Screen> Clock::WatchFaceAnalogScreen() {
 }
 
 std::unique_ptr<Screen> Clock::WatchFacePineTimeStyleScreen() {
-  return std::make_unique<Screens::WatchFacePineTimeStyle>(app,
-                                                           dateTimeController,
+  return std::make_unique<Screens::WatchFacePineTimeStyle>(dateTimeController,
                                                            batteryController,
                                                            bleController,
                                                            notificationManager,
@@ -104,8 +99,7 @@ std::unique_ptr<Screen> Clock::WatchFacePineTimeStyleScreen() {
 }
 
 std::unique_ptr<Screen> Clock::WatchFaceTerminalScreen() {
-  return std::make_unique<Screens::WatchFaceTerminal>(app,
-                                                      dateTimeController,
+  return std::make_unique<Screens::WatchFaceTerminal>(dateTimeController,
                                                       batteryController,
                                                       bleController,
                                                       notificationManager,
@@ -115,8 +109,7 @@ std::unique_ptr<Screen> Clock::WatchFaceTerminalScreen() {
 }
 
 std::unique_ptr<Screen> Clock::WatchFaceInfineatScreen() {
-  return std::make_unique<Screens::WatchFaceInfineat>(app,
-                                                      dateTimeController,
+  return std::make_unique<Screens::WatchFaceInfineat>(dateTimeController,
                                                       batteryController,
                                                       bleController,
                                                       notificationManager,
@@ -126,8 +119,7 @@ std::unique_ptr<Screen> Clock::WatchFaceInfineatScreen() {
 }
 
 std::unique_ptr<Screen> Clock::WatchFaceCasioStyleG7710() {
-  return std::make_unique<Screens::WatchFaceCasioStyleG7710>(app,
-                                                             dateTimeController,
+  return std::make_unique<Screens::WatchFaceCasioStyleG7710>(dateTimeController,
                                                              batteryController,
                                                              bleController,
                                                              notificationManager,
diff --git a/src/displayapp/screens/Clock.h b/src/displayapp/screens/Clock.h
index 8cd92090..8c987fbb 100644
--- a/src/displayapp/screens/Clock.h
+++ b/src/displayapp/screens/Clock.h
@@ -21,8 +21,7 @@ namespace Pinetime {
     namespace Screens {
       class Clock : public Screen {
       public:
-        Clock(DisplayApp* app,
-              Controllers::DateTime& dateTimeController,
+        Clock(Controllers::DateTime& dateTimeController,
               const Controllers::Battery& batteryController,
               const Controllers::Ble& bleController,
               Controllers::NotificationManager& notificationManager,
@@ -36,7 +35,6 @@ namespace Pinetime {
         bool OnButtonPushed() override;
 
       private:
-        DisplayApp* app;
         Controllers::DateTime& dateTimeController;
         const Controllers::Battery& batteryController;
         const Controllers::Ble& bleController;
diff --git a/src/displayapp/screens/Error.cpp b/src/displayapp/screens/Error.cpp
index 27eb6023..6f826b87 100644
--- a/src/displayapp/screens/Error.cpp
+++ b/src/displayapp/screens/Error.cpp
@@ -9,7 +9,7 @@ namespace {
   }
 }
 
-Error::Error(Pinetime::Applications::DisplayApp* app, System::BootErrors error) {
+Error::Error(System::BootErrors error) {
 
   lv_obj_t* warningLabel = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_text_color(warningLabel, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_ORANGE);
diff --git a/src/displayapp/screens/Error.h b/src/displayapp/screens/Error.h
index 6dbcc38b..8e7d4708 100644
--- a/src/displayapp/screens/Error.h
+++ b/src/displayapp/screens/Error.h
@@ -9,7 +9,7 @@ namespace Pinetime {
     namespace Screens {
       class Error : public Screen {
       public:
-        Error(DisplayApp* app, System::BootErrors error);
+        Error(System::BootErrors error);
         ~Error() override;
 
         void ButtonEventHandler();
diff --git a/src/displayapp/screens/FirmwareUpdate.cpp b/src/displayapp/screens/FirmwareUpdate.cpp
index fa8bbede..c40240c9 100644
--- a/src/displayapp/screens/FirmwareUpdate.cpp
+++ b/src/displayapp/screens/FirmwareUpdate.cpp
@@ -5,8 +5,7 @@
 
 using namespace Pinetime::Applications::Screens;
 
-FirmwareUpdate::FirmwareUpdate(Pinetime::Applications::DisplayApp* app, const Pinetime::Controllers::Ble& bleController)
-  : bleController {bleController} {
+FirmwareUpdate::FirmwareUpdate(const Pinetime::Controllers::Ble& bleController) : bleController {bleController} {
 
   titleLabel = lv_label_create(lv_scr_act(), nullptr);
   lv_label_set_text_static(titleLabel, "Firmware update");
diff --git a/src/displayapp/screens/FirmwareUpdate.h b/src/displayapp/screens/FirmwareUpdate.h
index 067e4e40..ebe7c2d7 100644
--- a/src/displayapp/screens/FirmwareUpdate.h
+++ b/src/displayapp/screens/FirmwareUpdate.h
@@ -14,7 +14,7 @@ namespace Pinetime {
 
       class FirmwareUpdate : public Screen {
       public:
-        FirmwareUpdate(DisplayApp* app, const Pinetime::Controllers::Ble& bleController);
+        FirmwareUpdate(const Pinetime::Controllers::Ble& bleController);
         ~FirmwareUpdate() override;
 
         void Refresh() override;
diff --git a/src/displayapp/screens/FirmwareValidation.cpp b/src/displayapp/screens/FirmwareValidation.cpp
index 80994a6a..4a1b3d9f 100644
--- a/src/displayapp/screens/FirmwareValidation.cpp
+++ b/src/displayapp/screens/FirmwareValidation.cpp
@@ -14,8 +14,7 @@ namespace {
   }
 }
 
-FirmwareValidation::FirmwareValidation(Pinetime::Applications::DisplayApp* app, Pinetime::Controllers::FirmwareValidator& validator)
-  : validator {validator} {
+FirmwareValidation::FirmwareValidation(Pinetime::Controllers::FirmwareValidator& validator) : validator {validator} {
   labelVersion = lv_label_create(lv_scr_act(), nullptr);
   lv_label_set_text_fmt(labelVersion,
                         "Version : %lu.%lu.%lu\n"
diff --git a/src/displayapp/screens/FirmwareValidation.h b/src/displayapp/screens/FirmwareValidation.h
index 278c4adf..a30f8c59 100644
--- a/src/displayapp/screens/FirmwareValidation.h
+++ b/src/displayapp/screens/FirmwareValidation.h
@@ -13,7 +13,7 @@ namespace Pinetime {
 
       class FirmwareValidation : public Screen {
       public:
-        FirmwareValidation(DisplayApp* app, Pinetime::Controllers::FirmwareValidator& validator);
+        FirmwareValidation(Pinetime::Controllers::FirmwareValidator& validator);
         ~FirmwareValidation() override;
 
         void OnButtonEvent(lv_obj_t* object, lv_event_t event);
diff --git a/src/displayapp/screens/FlashLight.cpp b/src/displayapp/screens/FlashLight.cpp
index f55a6598..1b7cf39c 100644
--- a/src/displayapp/screens/FlashLight.cpp
+++ b/src/displayapp/screens/FlashLight.cpp
@@ -14,9 +14,7 @@ namespace {
   }
 }
 
-FlashLight::FlashLight(Pinetime::Applications::DisplayApp* app,
-                       System::SystemTask& systemTask,
-                       Controllers::BrightnessController& brightnessController)
+FlashLight::FlashLight(System::SystemTask& systemTask, Controllers::BrightnessController& brightnessController)
   : systemTask {systemTask}, brightnessController {brightnessController} {
 
   brightnessController.Set(Controllers::BrightnessController::Levels::Low);
diff --git a/src/displayapp/screens/FlashLight.h b/src/displayapp/screens/FlashLight.h
index c885048f..2b710ed5 100644
--- a/src/displayapp/screens/FlashLight.h
+++ b/src/displayapp/screens/FlashLight.h
@@ -13,7 +13,7 @@ namespace Pinetime {
 
       class FlashLight : public Screen {
       public:
-        FlashLight(DisplayApp* app, System::SystemTask& systemTask, Controllers::BrightnessController& brightness);
+        FlashLight(System::SystemTask& systemTask, Controllers::BrightnessController& brightness);
         ~FlashLight() override;
 
         bool OnTouchEvent(Pinetime::Applications::TouchEvents event) override;
diff --git a/src/displayapp/screens/HeartRate.cpp b/src/displayapp/screens/HeartRate.cpp
index 57a3d43a..f611fa26 100644
--- a/src/displayapp/screens/HeartRate.cpp
+++ b/src/displayapp/screens/HeartRate.cpp
@@ -28,9 +28,7 @@ namespace {
   }
 }
 
-HeartRate::HeartRate(Pinetime::Applications::DisplayApp* app,
-                     Controllers::HeartRateController& heartRateController,
-                     System::SystemTask& systemTask)
+HeartRate::HeartRate(Controllers::HeartRateController& heartRateController, System::SystemTask& systemTask)
   : heartRateController {heartRateController}, systemTask {systemTask} {
   bool isHrRunning = heartRateController.State() != Controllers::HeartRateController::States::Stopped;
   label_hr = lv_label_create(lv_scr_act(), nullptr);
diff --git a/src/displayapp/screens/HeartRate.h b/src/displayapp/screens/HeartRate.h
index d68133ad..78ae63db 100644
--- a/src/displayapp/screens/HeartRate.h
+++ b/src/displayapp/screens/HeartRate.h
@@ -17,7 +17,7 @@ namespace Pinetime {
 
       class HeartRate : public Screen {
       public:
-        HeartRate(DisplayApp* app, Controllers::HeartRateController& HeartRateController, System::SystemTask& systemTask);
+        HeartRate(Controllers::HeartRateController& HeartRateController, System::SystemTask& systemTask);
         ~HeartRate() override;
 
         void Refresh() override;
diff --git a/src/displayapp/screens/InfiniPaint.cpp b/src/displayapp/screens/InfiniPaint.cpp
index 1239ca95..1d6be979 100644
--- a/src/displayapp/screens/InfiniPaint.cpp
+++ b/src/displayapp/screens/InfiniPaint.cpp
@@ -7,9 +7,7 @@
 
 using namespace Pinetime::Applications::Screens;
 
-InfiniPaint::InfiniPaint(Pinetime::Applications::DisplayApp* app,
-                         Pinetime::Components::LittleVgl& lvgl,
-                         Pinetime::Controllers::MotorController& motor)
+InfiniPaint::InfiniPaint(Pinetime::Components::LittleVgl& lvgl, Pinetime::Controllers::MotorController& motor)
   : lvgl {lvgl}, motor {motor} {
   std::fill(b, b + bufferSize, selectColor);
 }
diff --git a/src/displayapp/screens/InfiniPaint.h b/src/displayapp/screens/InfiniPaint.h
index a6b6eb18..ec184c44 100644
--- a/src/displayapp/screens/InfiniPaint.h
+++ b/src/displayapp/screens/InfiniPaint.h
@@ -16,7 +16,7 @@ namespace Pinetime {
 
       class InfiniPaint : public Screen {
       public:
-        InfiniPaint(DisplayApp* app, Pinetime::Components::LittleVgl& lvgl, Controllers::MotorController& motor);
+        InfiniPaint(Pinetime::Components::LittleVgl& lvgl, Controllers::MotorController& motor);
 
         ~InfiniPaint() override;
 
diff --git a/src/displayapp/screens/Label.cpp b/src/displayapp/screens/Label.cpp
index e85e2a5a..8092be0c 100644
--- a/src/displayapp/screens/Label.cpp
+++ b/src/displayapp/screens/Label.cpp
@@ -2,8 +2,7 @@
 
 using namespace Pinetime::Applications::Screens;
 
-Label::Label(uint8_t screenID, uint8_t numScreens, lv_obj_t* labelText)
-  : labelText {labelText}, pageIndicator(screenID, numScreens) {
+Label::Label(uint8_t screenID, uint8_t numScreens, lv_obj_t* labelText) : labelText {labelText}, pageIndicator(screenID, numScreens) {
 
   pageIndicator.Create();
 }
diff --git a/src/displayapp/screens/Metronome.cpp b/src/displayapp/screens/Metronome.cpp
index f906a7be..314fde73 100644
--- a/src/displayapp/screens/Metronome.cpp
+++ b/src/displayapp/screens/Metronome.cpp
@@ -21,7 +21,7 @@ namespace {
   }
 }
 
-Metronome::Metronome(DisplayApp* app, Controllers::MotorController& motorController, System::SystemTask& systemTask)
+Metronome::Metronome(Controllers::MotorController& motorController, System::SystemTask& systemTask)
   : motorController {motorController}, systemTask {systemTask} {
 
   bpmArc = lv_arc_create(lv_scr_act(), nullptr);
diff --git a/src/displayapp/screens/Metronome.h b/src/displayapp/screens/Metronome.h
index c062959c..13b0d664 100644
--- a/src/displayapp/screens/Metronome.h
+++ b/src/displayapp/screens/Metronome.h
@@ -10,7 +10,7 @@ namespace Pinetime {
 
       class Metronome : public Screen {
       public:
-        Metronome(DisplayApp* app, Controllers::MotorController& motorController, System::SystemTask& systemTask);
+        Metronome(Controllers::MotorController& motorController, System::SystemTask& systemTask);
         ~Metronome() override;
         void Refresh() override;
         void OnEvent(lv_obj_t* obj, lv_event_t event);
diff --git a/src/displayapp/screens/Motion.cpp b/src/displayapp/screens/Motion.cpp
index ac6af3b0..87c55eea 100644
--- a/src/displayapp/screens/Motion.cpp
+++ b/src/displayapp/screens/Motion.cpp
@@ -5,8 +5,7 @@
 
 using namespace Pinetime::Applications::Screens;
 
-Motion::Motion(Pinetime::Applications::DisplayApp* app, Controllers::MotionController& motionController)
-  : motionController {motionController} {
+Motion::Motion(Controllers::MotionController& motionController) : motionController {motionController} {
   chart = lv_chart_create(lv_scr_act(), nullptr);
   lv_obj_set_size(chart, 240, 240);
   lv_obj_align(chart, nullptr, LV_ALIGN_IN_TOP_MID, 0, 0);
diff --git a/src/displayapp/screens/Motion.h b/src/displayapp/screens/Motion.h
index 4d2bd4f2..e4cbe483 100644
--- a/src/displayapp/screens/Motion.h
+++ b/src/displayapp/screens/Motion.h
@@ -13,7 +13,7 @@ namespace Pinetime {
 
       class Motion : public Screen {
       public:
-        Motion(DisplayApp* app, Controllers::MotionController& motionController);
+        Motion(Controllers::MotionController& motionController);
         ~Motion() override;
 
         void Refresh() override;
diff --git a/src/displayapp/screens/Music.cpp b/src/displayapp/screens/Music.cpp
index 7952784a..0763da0f 100644
--- a/src/displayapp/screens/Music.cpp
+++ b/src/displayapp/screens/Music.cpp
@@ -47,7 +47,7 @@ inline void lv_img_set_src_arr(lv_obj_t* img, const lv_img_dsc_t* src_img) {
  *
  * TODO: Investigate Apple Media Service and AVRCPv1.6 support for seamless integration
  */
-Music::Music(Pinetime::Applications::DisplayApp* app, Pinetime::Controllers::MusicService& music) : musicService(music) {
+Music::Music(Pinetime::Controllers::MusicService& music) : musicService(music) {
   lv_obj_t* label;
 
   lv_style_init(&btn_style);
diff --git a/src/displayapp/screens/Music.h b/src/displayapp/screens/Music.h
index 258a4020..847c6e74 100644
--- a/src/displayapp/screens/Music.h
+++ b/src/displayapp/screens/Music.h
@@ -31,7 +31,7 @@ namespace Pinetime {
     namespace Screens {
       class Music : public Screen {
       public:
-        Music(DisplayApp* app, Pinetime::Controllers::MusicService& music);
+        Music(Pinetime::Controllers::MusicService& music);
 
         ~Music() override;
 
diff --git a/src/displayapp/screens/Navigation.cpp b/src/displayapp/screens/Navigation.cpp
index c9b35f83..7baea09d 100644
--- a/src/displayapp/screens/Navigation.cpp
+++ b/src/displayapp/screens/Navigation.cpp
@@ -129,8 +129,7 @@ namespace {
  * Navigation watchapp
  *
  */
-Navigation::Navigation(Pinetime::Applications::DisplayApp* app, Pinetime::Controllers::NavigationService& nav)
-  : navService(nav) {
+Navigation::Navigation(Pinetime::Controllers::NavigationService& nav) : navService(nav) {
 
   imgFlag = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_text_font(imgFlag, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &lv_font_navi_80);
diff --git a/src/displayapp/screens/Navigation.h b/src/displayapp/screens/Navigation.h
index 07674ef1..6495edb2 100644
--- a/src/displayapp/screens/Navigation.h
+++ b/src/displayapp/screens/Navigation.h
@@ -32,7 +32,7 @@ namespace Pinetime {
     namespace Screens {
       class Navigation : public Screen {
       public:
-        Navigation(DisplayApp* app, Pinetime::Controllers::NavigationService& nav);
+        Navigation(Pinetime::Controllers::NavigationService& nav);
         ~Navigation() override;
 
         void Refresh() override;
diff --git a/src/displayapp/screens/Paddle.cpp b/src/displayapp/screens/Paddle.cpp
index 42726a7e..00298eca 100644
--- a/src/displayapp/screens/Paddle.cpp
+++ b/src/displayapp/screens/Paddle.cpp
@@ -6,7 +6,7 @@
 
 using namespace Pinetime::Applications::Screens;
 
-Paddle::Paddle(Pinetime::Applications::DisplayApp* app, Pinetime::Components::LittleVgl& lvgl) : lvgl {lvgl} {
+Paddle::Paddle(Pinetime::Components::LittleVgl& lvgl) : lvgl {lvgl} {
   background = lv_obj_create(lv_scr_act(), nullptr);
   lv_obj_set_size(background, LV_HOR_RES + 1, LV_VER_RES);
   lv_obj_set_pos(background, -1, 0);
diff --git a/src/displayapp/screens/Paddle.h b/src/displayapp/screens/Paddle.h
index d62550c4..33dac191 100644
--- a/src/displayapp/screens/Paddle.h
+++ b/src/displayapp/screens/Paddle.h
@@ -14,7 +14,7 @@ namespace Pinetime {
 
       class Paddle : public Screen {
       public:
-        Paddle(DisplayApp* app, Pinetime::Components::LittleVgl& lvgl);
+        Paddle(Pinetime::Components::LittleVgl& lvgl);
         ~Paddle() override;
 
         void Refresh() override;
diff --git a/src/displayapp/screens/PassKey.cpp b/src/displayapp/screens/PassKey.cpp
index 2091d438..78e51caa 100644
--- a/src/displayapp/screens/PassKey.cpp
+++ b/src/displayapp/screens/PassKey.cpp
@@ -3,7 +3,7 @@
 
 using namespace Pinetime::Applications::Screens;
 
-PassKey::PassKey(Pinetime::Applications::DisplayApp* app, uint32_t key) {
+PassKey::PassKey(uint32_t key) {
   passkeyLabel = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_text_color(passkeyLabel, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_YELLOW);
   lv_obj_set_style_local_text_font(passkeyLabel, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_42);
diff --git a/src/displayapp/screens/PassKey.h b/src/displayapp/screens/PassKey.h
index 82735b56..afdbb133 100644
--- a/src/displayapp/screens/PassKey.h
+++ b/src/displayapp/screens/PassKey.h
@@ -9,7 +9,7 @@ namespace Pinetime {
 
       class PassKey : public Screen {
       public:
-        PassKey(DisplayApp* app, uint32_t key);
+        explicit PassKey(uint32_t key);
         ~PassKey() override;
 
       private:
diff --git a/src/displayapp/screens/Steps.cpp b/src/displayapp/screens/Steps.cpp
index 7ab9d653..c5faaf05 100644
--- a/src/displayapp/screens/Steps.cpp
+++ b/src/displayapp/screens/Steps.cpp
@@ -10,9 +10,7 @@ static void lap_event_handler(lv_obj_t* obj, lv_event_t event) {
   steps->lapBtnEventHandler(event);
 }
 
-Steps::Steps(Pinetime::Applications::DisplayApp* app,
-             Controllers::MotionController& motionController,
-             Controllers::Settings& settingsController)
+Steps::Steps(Controllers::MotionController& motionController, Controllers::Settings& settingsController)
   : motionController {motionController}, settingsController {settingsController} {
 
   stepsArc = lv_arc_create(lv_scr_act(), nullptr);
diff --git a/src/displayapp/screens/Steps.h b/src/displayapp/screens/Steps.h
index 32ad40bd..5dc07eff 100644
--- a/src/displayapp/screens/Steps.h
+++ b/src/displayapp/screens/Steps.h
@@ -16,7 +16,7 @@ namespace Pinetime {
 
       class Steps : public Screen {
       public:
-        Steps(DisplayApp* app, Controllers::MotionController& motionController, Controllers::Settings& settingsController);
+        Steps(Controllers::MotionController& motionController, Controllers::Settings& settingsController);
         ~Steps() override;
 
         void Refresh() override;
diff --git a/src/displayapp/screens/StopWatch.cpp b/src/displayapp/screens/StopWatch.cpp
index 933b0186..72904c88 100644
--- a/src/displayapp/screens/StopWatch.cpp
+++ b/src/displayapp/screens/StopWatch.cpp
@@ -33,7 +33,7 @@ namespace {
   constexpr TickType_t blinkInterval = pdMS_TO_TICKS(1000);
 }
 
-StopWatch::StopWatch(DisplayApp* app, System::SystemTask& systemTask) : systemTask {systemTask} {
+StopWatch::StopWatch(System::SystemTask& systemTask) : systemTask {systemTask} {
   static constexpr uint8_t btnWidth = 115;
   static constexpr uint8_t btnHeight = 80;
   btnPlayPause = lv_btn_create(lv_scr_act(), nullptr);
diff --git a/src/displayapp/screens/StopWatch.h b/src/displayapp/screens/StopWatch.h
index ce9d0fea..409e3a19 100644
--- a/src/displayapp/screens/StopWatch.h
+++ b/src/displayapp/screens/StopWatch.h
@@ -20,7 +20,7 @@ namespace Pinetime::Applications::Screens {
 
   class StopWatch : public Screen {
   public:
-    StopWatch(DisplayApp* app, System::SystemTask& systemTask);
+    explicit StopWatch(System::SystemTask& systemTask);
     ~StopWatch() override;
     void Refresh() override;
 
diff --git a/src/displayapp/screens/Tile.cpp b/src/displayapp/screens/Tile.cpp
index 4d9ee163..1266f379 100644
--- a/src/displayapp/screens/Tile.cpp
+++ b/src/displayapp/screens/Tile.cpp
@@ -32,10 +32,7 @@ Tile::Tile(uint8_t screenID,
            const Controllers::Ble& bleController,
            Controllers::DateTime& dateTimeController,
            std::array<Applications, 6>& applications)
-  : app {app},
-    dateTimeController {dateTimeController},
-    pageIndicator(screenID, numScreens),
-    statusIcons(batteryController, bleController) {
+  : app {app}, dateTimeController {dateTimeController}, pageIndicator(screenID, numScreens), statusIcons(batteryController, bleController) {
 
   settingsController.SetAppMenu(screenID);
 
diff --git a/src/displayapp/screens/Timer.cpp b/src/displayapp/screens/Timer.cpp
index 60201cb8..df78a5a0 100644
--- a/src/displayapp/screens/Timer.cpp
+++ b/src/displayapp/screens/Timer.cpp
@@ -17,7 +17,7 @@ static void btnEventHandler(lv_obj_t* obj, lv_event_t event) {
   }
 }
 
-Timer::Timer(DisplayApp* app, Controllers::TimerController& timerController) : timerController {timerController} {
+Timer::Timer(Controllers::TimerController& timerController) : timerController {timerController} {
 
   lv_obj_t* colonLabel = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_text_font(colonLabel, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_76);
diff --git a/src/displayapp/screens/Timer.h b/src/displayapp/screens/Timer.h
index 306281d7..a6e26063 100644
--- a/src/displayapp/screens/Timer.h
+++ b/src/displayapp/screens/Timer.h
@@ -12,7 +12,7 @@
 namespace Pinetime::Applications::Screens {
   class Timer : public Screen {
   public:
-    Timer(DisplayApp* app, Controllers::TimerController& timerController);
+    Timer(Controllers::TimerController& timerController);
     ~Timer() override;
     void Refresh() override;
     void Reset();
diff --git a/src/displayapp/screens/Twos.cpp b/src/displayapp/screens/Twos.cpp
index 5328c5df..8157a160 100644
--- a/src/displayapp/screens/Twos.cpp
+++ b/src/displayapp/screens/Twos.cpp
@@ -5,7 +5,7 @@
 
 using namespace Pinetime::Applications::Screens;
 
-Twos::Twos(Pinetime::Applications::DisplayApp* app) {
+Twos::Twos() {
 
   struct colorPair {
     lv_color_t bg;
diff --git a/src/displayapp/screens/Twos.h b/src/displayapp/screens/Twos.h
index 15017581..e731eae6 100644
--- a/src/displayapp/screens/Twos.h
+++ b/src/displayapp/screens/Twos.h
@@ -13,7 +13,7 @@ namespace Pinetime {
     namespace Screens {
       class Twos : public Screen {
       public:
-        Twos(DisplayApp* app);
+        Twos();
         ~Twos() override;
 
         bool OnTouchEvent(TouchEvents event) override;
diff --git a/src/displayapp/screens/WatchFaceAnalog.cpp b/src/displayapp/screens/WatchFaceAnalog.cpp
index d3b9b1c7..34b50655 100644
--- a/src/displayapp/screens/WatchFaceAnalog.cpp
+++ b/src/displayapp/screens/WatchFaceAnalog.cpp
@@ -43,8 +43,7 @@ namespace {
 
 }
 
-WatchFaceAnalog::WatchFaceAnalog(Pinetime::Applications::DisplayApp* app,
-                                 Controllers::DateTime& dateTimeController,
+WatchFaceAnalog::WatchFaceAnalog(Controllers::DateTime& dateTimeController,
                                  const Controllers::Battery& batteryController,
                                  const Controllers::Ble& bleController,
                                  Controllers::NotificationManager& notificationManager,
diff --git a/src/displayapp/screens/WatchFaceAnalog.h b/src/displayapp/screens/WatchFaceAnalog.h
index 25438384..cbb0b2cb 100644
--- a/src/displayapp/screens/WatchFaceAnalog.h
+++ b/src/displayapp/screens/WatchFaceAnalog.h
@@ -24,8 +24,7 @@ namespace Pinetime {
 
       class WatchFaceAnalog : public Screen {
       public:
-        WatchFaceAnalog(DisplayApp* app,
-                        Controllers::DateTime& dateTimeController,
+        WatchFaceAnalog(Controllers::DateTime& dateTimeController,
                         const Controllers::Battery& batteryController,
                         const Controllers::Ble& bleController,
                         Controllers::NotificationManager& notificationManager,
diff --git a/src/displayapp/screens/WatchFaceCasioStyleG7710.cpp b/src/displayapp/screens/WatchFaceCasioStyleG7710.cpp
index 819103f6..d6f66ed0 100644
--- a/src/displayapp/screens/WatchFaceCasioStyleG7710.cpp
+++ b/src/displayapp/screens/WatchFaceCasioStyleG7710.cpp
@@ -15,8 +15,7 @@
 #include "components/settings/Settings.h"
 using namespace Pinetime::Applications::Screens;
 
-WatchFaceCasioStyleG7710::WatchFaceCasioStyleG7710(DisplayApp* app,
-                                                   Controllers::DateTime& dateTimeController,
+WatchFaceCasioStyleG7710::WatchFaceCasioStyleG7710(Controllers::DateTime& dateTimeController,
                                                    const Controllers::Battery& batteryController,
                                                    const Controllers::Ble& bleController,
                                                    Controllers::NotificationManager& notificatioManager,
diff --git a/src/displayapp/screens/WatchFaceCasioStyleG7710.h b/src/displayapp/screens/WatchFaceCasioStyleG7710.h
index 50612d50..0445c9f2 100644
--- a/src/displayapp/screens/WatchFaceCasioStyleG7710.h
+++ b/src/displayapp/screens/WatchFaceCasioStyleG7710.h
@@ -24,8 +24,7 @@ namespace Pinetime {
 
       class WatchFaceCasioStyleG7710 : public Screen {
       public:
-        WatchFaceCasioStyleG7710(DisplayApp* app,
-                                 Controllers::DateTime& dateTimeController,
+        WatchFaceCasioStyleG7710(Controllers::DateTime& dateTimeController,
                                  const Controllers::Battery& batteryController,
                                  const Controllers::Ble& bleController,
                                  Controllers::NotificationManager& notificatioManager,
diff --git a/src/displayapp/screens/WatchFaceDigital.cpp b/src/displayapp/screens/WatchFaceDigital.cpp
index c8e5df8d..d33f4b28 100644
--- a/src/displayapp/screens/WatchFaceDigital.cpp
+++ b/src/displayapp/screens/WatchFaceDigital.cpp
@@ -14,8 +14,7 @@
 
 using namespace Pinetime::Applications::Screens;
 
-WatchFaceDigital::WatchFaceDigital(DisplayApp* app,
-                                   Controllers::DateTime& dateTimeController,
+WatchFaceDigital::WatchFaceDigital(Controllers::DateTime& dateTimeController,
                                    const Controllers::Battery& batteryController,
                                    const Controllers::Ble& bleController,
                                    Controllers::NotificationManager& notificationManager,
diff --git a/src/displayapp/screens/WatchFaceDigital.h b/src/displayapp/screens/WatchFaceDigital.h
index 24319af9..0931f007 100644
--- a/src/displayapp/screens/WatchFaceDigital.h
+++ b/src/displayapp/screens/WatchFaceDigital.h
@@ -24,8 +24,7 @@ namespace Pinetime {
 
       class WatchFaceDigital : public Screen {
       public:
-        WatchFaceDigital(DisplayApp* app,
-                         Controllers::DateTime& dateTimeController,
+        WatchFaceDigital(Controllers::DateTime& dateTimeController,
                          const Controllers::Battery& batteryController,
                          const Controllers::Ble& bleController,
                          Controllers::NotificationManager& notificationManager,
diff --git a/src/displayapp/screens/WatchFaceInfineat.cpp b/src/displayapp/screens/WatchFaceInfineat.cpp
index 416fee7b..6bd16430 100644
--- a/src/displayapp/screens/WatchFaceInfineat.cpp
+++ b/src/displayapp/screens/WatchFaceInfineat.cpp
@@ -20,8 +20,7 @@ namespace {
   }
 }
 
-WatchFaceInfineat::WatchFaceInfineat(DisplayApp* app,
-                                     Controllers::DateTime& dateTimeController,
+WatchFaceInfineat::WatchFaceInfineat(Controllers::DateTime& dateTimeController,
                                      const Controllers::Battery& batteryController,
                                      const Controllers::Ble& bleController,
                                      Controllers::NotificationManager& notificationManager,
diff --git a/src/displayapp/screens/WatchFaceInfineat.h b/src/displayapp/screens/WatchFaceInfineat.h
index 7091d98b..e50912de 100644
--- a/src/displayapp/screens/WatchFaceInfineat.h
+++ b/src/displayapp/screens/WatchFaceInfineat.h
@@ -21,8 +21,7 @@ namespace Pinetime {
 
       class WatchFaceInfineat : public Screen {
       public:
-        WatchFaceInfineat(DisplayApp* app,
-                          Controllers::DateTime& dateTimeController,
+        WatchFaceInfineat(Controllers::DateTime& dateTimeController,
                           const Controllers::Battery& batteryController,
                           const Controllers::Ble& bleController,
                           Controllers::NotificationManager& notificationManager,
diff --git a/src/displayapp/screens/WatchFacePineTimeStyle.cpp b/src/displayapp/screens/WatchFacePineTimeStyle.cpp
index 66781146..fc5d1462 100644
--- a/src/displayapp/screens/WatchFacePineTimeStyle.cpp
+++ b/src/displayapp/screens/WatchFacePineTimeStyle.cpp
@@ -44,8 +44,7 @@ namespace {
   }
 }
 
-WatchFacePineTimeStyle::WatchFacePineTimeStyle(DisplayApp* app,
-                                               Controllers::DateTime& dateTimeController,
+WatchFacePineTimeStyle::WatchFacePineTimeStyle(Controllers::DateTime& dateTimeController,
                                                const Controllers::Battery& batteryController,
                                                const Controllers::Ble& bleController,
                                                Controllers::NotificationManager& notificationManager,
diff --git a/src/displayapp/screens/WatchFacePineTimeStyle.h b/src/displayapp/screens/WatchFacePineTimeStyle.h
index a349aa7c..bccb224a 100644
--- a/src/displayapp/screens/WatchFacePineTimeStyle.h
+++ b/src/displayapp/screens/WatchFacePineTimeStyle.h
@@ -24,8 +24,7 @@ namespace Pinetime {
     namespace Screens {
       class WatchFacePineTimeStyle : public Screen {
       public:
-        WatchFacePineTimeStyle(DisplayApp* app,
-                               Controllers::DateTime& dateTimeController,
+        WatchFacePineTimeStyle(Controllers::DateTime& dateTimeController,
                                const Controllers::Battery& batteryController,
                                const Controllers::Ble& bleController,
                                Controllers::NotificationManager& notificationManager,
diff --git a/src/displayapp/screens/WatchFaceTerminal.cpp b/src/displayapp/screens/WatchFaceTerminal.cpp
index ba56e723..d3534c08 100644
--- a/src/displayapp/screens/WatchFaceTerminal.cpp
+++ b/src/displayapp/screens/WatchFaceTerminal.cpp
@@ -13,8 +13,7 @@
 
 using namespace Pinetime::Applications::Screens;
 
-WatchFaceTerminal::WatchFaceTerminal(DisplayApp* app,
-                                     Controllers::DateTime& dateTimeController,
+WatchFaceTerminal::WatchFaceTerminal(Controllers::DateTime& dateTimeController,
                                      const Controllers::Battery& batteryController,
                                      const Controllers::Ble& bleController,
                                      Controllers::NotificationManager& notificationManager,
diff --git a/src/displayapp/screens/WatchFaceTerminal.h b/src/displayapp/screens/WatchFaceTerminal.h
index d4593b5f..67156a50 100644
--- a/src/displayapp/screens/WatchFaceTerminal.h
+++ b/src/displayapp/screens/WatchFaceTerminal.h
@@ -22,8 +22,7 @@ namespace Pinetime {
 
       class WatchFaceTerminal : public Screen {
       public:
-        WatchFaceTerminal(DisplayApp* app,
-                          Controllers::DateTime& dateTimeController,
+        WatchFaceTerminal(Controllers::DateTime& dateTimeController,
                           const Controllers::Battery& batteryController,
                           const Controllers::Ble& bleController,
                           Controllers::NotificationManager& notificationManager,
diff --git a/src/displayapp/screens/settings/SettingBluetooth.cpp b/src/displayapp/screens/settings/SettingBluetooth.cpp
index 75a62d89..82c3dee1 100644
--- a/src/displayapp/screens/settings/SettingBluetooth.cpp
+++ b/src/displayapp/screens/settings/SettingBluetooth.cpp
@@ -39,7 +39,6 @@ SettingBluetooth::SettingBluetooth(Pinetime::Applications::DisplayApp* app, Pine
     checkboxList(
       0,
       1,
-      app,
       "Bluetooth",
       Symbols::bluetooth,
       settingsController.GetBleRadioEnabled() ? 0 : 1,
diff --git a/src/displayapp/screens/settings/SettingChimes.cpp b/src/displayapp/screens/settings/SettingChimes.cpp
index c9617139..2d3473de 100644
--- a/src/displayapp/screens/settings/SettingChimes.cpp
+++ b/src/displayapp/screens/settings/SettingChimes.cpp
@@ -44,11 +44,10 @@ namespace {
   }
 }
 
-SettingChimes::SettingChimes(Pinetime::Applications::DisplayApp* app, Pinetime::Controllers::Settings& settingsController)
+SettingChimes::SettingChimes(Pinetime::Controllers::Settings& settingsController)
   : checkboxList(
       0,
       1,
-      app,
       "Chimes",
       Symbols::clock,
       GetDefaultOption(settingsController.GetChimeOption()),
diff --git a/src/displayapp/screens/settings/SettingChimes.h b/src/displayapp/screens/settings/SettingChimes.h
index a306e81d..a34a9cf8 100644
--- a/src/displayapp/screens/settings/SettingChimes.h
+++ b/src/displayapp/screens/settings/SettingChimes.h
@@ -14,7 +14,7 @@ namespace Pinetime {
 
       class SettingChimes : public Screen {
       public:
-        SettingChimes(DisplayApp* app, Pinetime::Controllers::Settings& settingsController);
+        SettingChimes(Pinetime::Controllers::Settings& settingsController);
         ~SettingChimes() override;
 
         void UpdateSelected(lv_obj_t* object, lv_event_t event);
diff --git a/src/displayapp/screens/settings/SettingSetDate.cpp b/src/displayapp/screens/settings/SettingSetDate.cpp
index 17f452ca..08add508 100644
--- a/src/displayapp/screens/settings/SettingSetDate.cpp
+++ b/src/displayapp/screens/settings/SettingSetDate.cpp
@@ -45,8 +45,7 @@ namespace {
   }
 }
 
-SettingSetDate::SettingSetDate(Pinetime::Applications::DisplayApp* app,
-                               Pinetime::Controllers::DateTime& dateTimeController,
+SettingSetDate::SettingSetDate(Pinetime::Controllers::DateTime& dateTimeController,
                                Pinetime::Applications::Screens::SettingSetDateTime& settingSetDateTime)
   : dateTimeController {dateTimeController}, settingSetDateTime {settingSetDateTime} {
 
diff --git a/src/displayapp/screens/settings/SettingSetDate.h b/src/displayapp/screens/settings/SettingSetDate.h
index dfb0e0d2..1fe2bd9e 100644
--- a/src/displayapp/screens/settings/SettingSetDate.h
+++ b/src/displayapp/screens/settings/SettingSetDate.h
@@ -13,8 +13,7 @@ namespace Pinetime {
     namespace Screens {
       class SettingSetDate : public Screen {
       public:
-        SettingSetDate(DisplayApp* app,
-                       Pinetime::Controllers::DateTime& dateTimeController,
+        SettingSetDate(Pinetime::Controllers::DateTime& dateTimeController,
                        Pinetime::Applications::Screens::SettingSetDateTime& settingSetDateTime);
         ~SettingSetDate() override;
 
diff --git a/src/displayapp/screens/settings/SettingSetDateTime.cpp b/src/displayapp/screens/settings/SettingSetDateTime.cpp
index 6a06aae4..cf9b0638 100644
--- a/src/displayapp/screens/settings/SettingSetDateTime.cpp
+++ b/src/displayapp/screens/settings/SettingSetDateTime.cpp
@@ -32,13 +32,13 @@ SettingSetDateTime::SettingSetDateTime(Pinetime::Applications::DisplayApp* app,
 std::unique_ptr<Screen> SettingSetDateTime::screenSetDate() {
   Widgets::DotIndicator dotIndicator(0, 2);
   dotIndicator.Create();
-  return std::make_unique<Screens::SettingSetDate>(app, dateTimeController, *this);
+  return std::make_unique<Screens::SettingSetDate>(dateTimeController, *this);
 }
 
 std::unique_ptr<Screen> SettingSetDateTime::screenSetTime() {
   Widgets::DotIndicator dotIndicator(1, 2);
   dotIndicator.Create();
-  return std::make_unique<Screens::SettingSetTime>(app, dateTimeController, settingsController, *this);
+  return std::make_unique<Screens::SettingSetTime>(dateTimeController, settingsController, *this);
 }
 
 SettingSetDateTime::~SettingSetDateTime() {
diff --git a/src/displayapp/screens/settings/SettingSetTime.cpp b/src/displayapp/screens/settings/SettingSetTime.cpp
index 4dbd86ed..efb8578f 100644
--- a/src/displayapp/screens/settings/SettingSetTime.cpp
+++ b/src/displayapp/screens/settings/SettingSetTime.cpp
@@ -25,8 +25,7 @@ namespace {
   }
 }
 
-SettingSetTime::SettingSetTime(Pinetime::Applications::DisplayApp* app,
-                               Pinetime::Controllers::DateTime& dateTimeController,
+SettingSetTime::SettingSetTime(Pinetime::Controllers::DateTime& dateTimeController,
                                Pinetime::Controllers::Settings& settingsController,
                                Pinetime::Applications::Screens::SettingSetDateTime& settingSetDateTime)
   : dateTimeController {dateTimeController}, settingsController {settingsController}, settingSetDateTime {settingSetDateTime} {
diff --git a/src/displayapp/screens/settings/SettingSetTime.h b/src/displayapp/screens/settings/SettingSetTime.h
index edd89b16..feac15d5 100644
--- a/src/displayapp/screens/settings/SettingSetTime.h
+++ b/src/displayapp/screens/settings/SettingSetTime.h
@@ -14,8 +14,7 @@ namespace Pinetime {
     namespace Screens {
       class SettingSetTime : public Screen {
       public:
-        SettingSetTime(DisplayApp* app,
-                       Pinetime::Controllers::DateTime& dateTimeController,
+        SettingSetTime(Pinetime::Controllers::DateTime& dateTimeController,
                        Pinetime::Controllers::Settings& settingsController,
                        Pinetime::Applications::Screens::SettingSetDateTime& settingSetDateTime);
         ~SettingSetTime() override;
diff --git a/src/displayapp/screens/settings/SettingShakeThreshold.cpp b/src/displayapp/screens/settings/SettingShakeThreshold.cpp
index ecb1adac..f4b6f959 100644
--- a/src/displayapp/screens/settings/SettingShakeThreshold.cpp
+++ b/src/displayapp/screens/settings/SettingShakeThreshold.cpp
@@ -14,8 +14,7 @@ namespace {
   }
 }
 
-SettingShakeThreshold::SettingShakeThreshold(DisplayApp* app,
-                                             Controllers::Settings& settingsController,
+SettingShakeThreshold::SettingShakeThreshold(Controllers::Settings& settingsController,
                                              Controllers::MotionController& motionController,
                                              System::SystemTask& systemTask)
   : settingsController {settingsController}, motionController {motionController}, systemTask {systemTask} {
diff --git a/src/displayapp/screens/settings/SettingShakeThreshold.h b/src/displayapp/screens/settings/SettingShakeThreshold.h
index d0979fa6..58bdb83a 100644
--- a/src/displayapp/screens/settings/SettingShakeThreshold.h
+++ b/src/displayapp/screens/settings/SettingShakeThreshold.h
@@ -14,8 +14,7 @@ namespace Pinetime {
 
       class SettingShakeThreshold : public Screen {
       public:
-        SettingShakeThreshold(DisplayApp* app,
-                              Pinetime::Controllers::Settings& settingsController,
+        SettingShakeThreshold(Pinetime::Controllers::Settings& settingsController,
                               Controllers::MotionController& motionController,
                               System::SystemTask& systemTask);
 
diff --git a/src/displayapp/screens/settings/SettingSteps.cpp b/src/displayapp/screens/settings/SettingSteps.cpp
index b022074f..b8d5c405 100644
--- a/src/displayapp/screens/settings/SettingSteps.cpp
+++ b/src/displayapp/screens/settings/SettingSteps.cpp
@@ -13,8 +13,7 @@ namespace {
   }
 }
 
-SettingSteps::SettingSteps(Pinetime::Applications::DisplayApp* app, Pinetime::Controllers::Settings& settingsController)
-  : settingsController {settingsController} {
+SettingSteps::SettingSteps(Pinetime::Controllers::Settings& settingsController) : settingsController {settingsController} {
 
   lv_obj_t* container1 = lv_cont_create(lv_scr_act(), nullptr);
 
diff --git a/src/displayapp/screens/settings/SettingSteps.h b/src/displayapp/screens/settings/SettingSteps.h
index 5fc05dee..ba6d6f92 100644
--- a/src/displayapp/screens/settings/SettingSteps.h
+++ b/src/displayapp/screens/settings/SettingSteps.h
@@ -12,7 +12,7 @@ namespace Pinetime {
 
       class SettingSteps : public Screen {
       public:
-        SettingSteps(DisplayApp* app, Pinetime::Controllers::Settings& settingsController);
+        SettingSteps(Pinetime::Controllers::Settings& settingsController);
         ~SettingSteps() override;
 
         void UpdateSelected(lv_obj_t* object, lv_event_t event);
diff --git a/src/displayapp/screens/settings/SettingTimeFormat.cpp b/src/displayapp/screens/settings/SettingTimeFormat.cpp
index f7c2515b..df46d8a8 100644
--- a/src/displayapp/screens/settings/SettingTimeFormat.cpp
+++ b/src/displayapp/screens/settings/SettingTimeFormat.cpp
@@ -42,11 +42,10 @@ namespace {
   }
 }
 
-SettingTimeFormat::SettingTimeFormat(Pinetime::Applications::DisplayApp* app, Pinetime::Controllers::Settings& settingsController)
+SettingTimeFormat::SettingTimeFormat(Pinetime::Controllers::Settings& settingsController)
   : checkboxList(
       0,
       1,
-      app,
       "Time format",
       Symbols::clock,
       GetDefaultOption(settingsController.GetClockType()),
diff --git a/src/displayapp/screens/settings/SettingTimeFormat.h b/src/displayapp/screens/settings/SettingTimeFormat.h
index de37f43e..c33f75c0 100644
--- a/src/displayapp/screens/settings/SettingTimeFormat.h
+++ b/src/displayapp/screens/settings/SettingTimeFormat.h
@@ -15,7 +15,7 @@ namespace Pinetime {
 
       class SettingTimeFormat : public Screen {
       public:
-        SettingTimeFormat(DisplayApp* app, Pinetime::Controllers::Settings& settingsController);
+        SettingTimeFormat(Pinetime::Controllers::Settings& settingsController);
         ~SettingTimeFormat() override;
 
       private:
diff --git a/src/displayapp/screens/settings/SettingWakeUp.cpp b/src/displayapp/screens/settings/SettingWakeUp.cpp
index b587abdf..8df34c20 100644
--- a/src/displayapp/screens/settings/SettingWakeUp.cpp
+++ b/src/displayapp/screens/settings/SettingWakeUp.cpp
@@ -19,8 +19,7 @@ namespace {
   }
 }
 
-SettingWakeUp::SettingWakeUp(Pinetime::Applications::DisplayApp* app, Pinetime::Controllers::Settings& settingsController)
-  : settingsController {settingsController} {
+SettingWakeUp::SettingWakeUp(Pinetime::Controllers::Settings& settingsController) : settingsController {settingsController} {
   lv_obj_t* container1 = lv_cont_create(lv_scr_act(), nullptr);
 
   lv_obj_set_style_local_bg_opa(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_TRANSP);
diff --git a/src/displayapp/screens/settings/SettingWakeUp.h b/src/displayapp/screens/settings/SettingWakeUp.h
index 2a4e7509..28219ca1 100644
--- a/src/displayapp/screens/settings/SettingWakeUp.h
+++ b/src/displayapp/screens/settings/SettingWakeUp.h
@@ -13,7 +13,7 @@ namespace Pinetime {
 
       class SettingWakeUp : public Screen {
       public:
-        SettingWakeUp(DisplayApp* app, Pinetime::Controllers::Settings& settingsController);
+        SettingWakeUp(Pinetime::Controllers::Settings& settingsController);
         ~SettingWakeUp() override;
 
         void UpdateSelected(lv_obj_t* object);
diff --git a/src/displayapp/screens/settings/SettingWatchFace.cpp b/src/displayapp/screens/settings/SettingWatchFace.cpp
index 03ff3b8b..285efa72 100644
--- a/src/displayapp/screens/settings/SettingWatchFace.cpp
+++ b/src/displayapp/screens/settings/SettingWatchFace.cpp
@@ -45,7 +45,6 @@ std::unique_ptr<Screen> SettingWatchFace::CreateScreen(unsigned int screenNum) c
   return std::make_unique<Screens::CheckboxList>(
     screenNum,
     nScreens,
-    app,
     title,
     symbol,
     settingsController.GetClockFace(),