1 files changed, 9 insertions, 11 deletions

diff --git a/src/displayapp/screens/Clock.cpp b/src/displayapp/screens/Clock.cpp
index 342dd22..c218aa5 100644
--- a/src/displayapp/screens/Clock.cpp
+++ b/src/displayapp/screens/Clock.cpp
@@ -8,6 +8,7 @@
 #include "NotificationIcon.h"
 #include "Symbols.h"
 #include "components/battery/BatteryController.h"
+#include "components/motion/MotionController.h"
 #include "components/ble/BleController.h"
 #include "components/ble/NotificationManager.h"
 #include "../DisplayApp.h"
@@ -23,12 +24,14 @@ Clock::Clock(DisplayApp* app,
         Controllers::Ble& bleController,
         Controllers::NotificationManager& notificatioManager,
         Controllers::Settings &settingsController,
-        Controllers::HeartRateController& heartRateController) : Screen(app),
+        Controllers::HeartRateController& heartRateController,
+        Controllers::MotionController& motionController) : Screen(app),
         dateTimeController{dateTimeController}, batteryController{batteryController},
         bleController{bleController}, notificatioManager{notificatioManager},
         settingsController{settingsController},
         heartRateController{heartRateController},
-        screens{app, 
+        motionController{motionController},
+        screens{app,
           settingsController.GetClockFace(),
           {
                 [this]() -> std::unique_ptr<Screen> { return WatchFaceDigitalScreen(); },
@@ -54,30 +57,25 @@ bool Clock::Refresh() {
   return running;
 }
 
-bool Clock::OnButtonPushed() {
-  running = false;
-  return false;
-}
-
 bool Clock::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
   return screens.OnTouchEvent(event);
 }
 
 std::unique_ptr<Screen> Clock::WatchFaceDigitalScreen() {  
-  return std::unique_ptr<Screen>(new Screens::WatchFaceDigital(app, dateTimeController, batteryController, bleController, notificatioManager, settingsController, heartRateController));
+  return std::make_unique<Screens::WatchFaceDigital>(app, dateTimeController, batteryController, bleController, notificatioManager, settingsController, heartRateController, motionController);
 }
 
 std::unique_ptr<Screen> Clock::WatchFaceAnalogScreen() {  
-  return std::unique_ptr<Screen>(new Screens::WatchFaceAnalog(app, dateTimeController, batteryController, bleController, notificatioManager, settingsController));
+  return std::make_unique<Screens::WatchFaceAnalog>(app, dateTimeController, batteryController, bleController, notificatioManager, settingsController);
 }
 
 /*
 // Examples for more watch faces
 std::unique_ptr<Screen> Clock::WatchFaceMinimalScreen() {  
-  return std::unique_ptr<Screen>(new Screens::WatchFaceMinimal(app, dateTimeController, batteryController, bleController, notificatioManager, settingsController));
+  return std::make_unique<Screens::WatchFaceMinimal>(app, dateTimeController, batteryController, bleController, notificatioManager, settingsController);
 }
 
 std::unique_ptr<Screen> Clock::WatchFaceCustomScreen() {  
-  return std::unique_ptr<Screen>(new Screens::WatchFaceCustom(app, dateTimeController, batteryController, bleController, notificatioManager, settingsController));
+  return std::make_unique<Screens::WatchFaceCustom>(app, dateTimeController, batteryController, bleController, notificatioManager, settingsController);
 }
 */
\ No newline at end of file