diff options
Diffstat (limited to 'src/displayapp/screens/Clock.cpp')
| -rw-r--r-- | src/displayapp/screens/Clock.cpp | 24 |
1 files changed, 8 insertions, 16 deletions
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, |