17 files changed, 16 insertions, 28 deletions
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(),