summaryrefslogtreecommitdiff
path: root/src/displayapp/screens/Clock.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/displayapp/screens/Clock.cpp')
-rw-r--r--src/displayapp/screens/Clock.cpp89
1 files changed, 51 insertions, 38 deletions
diff --git a/src/displayapp/screens/Clock.cpp b/src/displayapp/screens/Clock.cpp
index c218aa5c..14299840 100644
--- a/src/displayapp/screens/Clock.cpp
+++ b/src/displayapp/screens/Clock.cpp
@@ -15,45 +15,48 @@
#include "WatchFaceDigital.h"
#include "WatchFaceAnalog.h"
-
using namespace Pinetime::Applications::Screens;
Clock::Clock(DisplayApp* app,
- Controllers::DateTime& dateTimeController,
- Controllers::Battery& batteryController,
- Controllers::Ble& bleController,
- Controllers::NotificationManager& notificatioManager,
- Controllers::Settings &settingsController,
- Controllers::HeartRateController& heartRateController,
- Controllers::MotionController& motionController) : Screen(app),
- dateTimeController{dateTimeController}, batteryController{batteryController},
- bleController{bleController}, notificatioManager{notificatioManager},
- settingsController{settingsController},
- heartRateController{heartRateController},
- motionController{motionController},
- screens{app,
- settingsController.GetClockFace(),
- {
- [this]() -> std::unique_ptr<Screen> { return WatchFaceDigitalScreen(); },
- [this]() -> std::unique_ptr<Screen> { return WatchFaceAnalogScreen(); },
- // Examples for more watch faces
- //[this]() -> std::unique_ptr<Screen> { return WatchFaceMinimalScreen(); },
- //[this]() -> std::unique_ptr<Screen> { return WatchFaceCustomScreen(); }
- },
- Screens::ScreenListModes::LongPress
- } {
-
- settingsController.SetAppMenu(0);
+ Controllers::DateTime& dateTimeController,
+ Controllers::Battery& batteryController,
+ Controllers::Ble& bleController,
+ Controllers::NotificationManager& notificatioManager,
+ Controllers::Settings& settingsController,
+ Controllers::HeartRateController& heartRateController,
+ Controllers::MotionController& motionController)
+ : Screen(app),
+ dateTimeController {dateTimeController},
+ batteryController {batteryController},
+ bleController {bleController},
+ notificatioManager {notificatioManager},
+ settingsController {settingsController},
+ heartRateController {heartRateController},
+ motionController {motionController},
+ screens {app,
+ settingsController.GetClockFace(),
+ {
+ [this]() -> std::unique_ptr<Screen> {
+ return WatchFaceDigitalScreen();
+ },
+ [this]() -> std::unique_ptr<Screen> {
+ return WatchFaceAnalogScreen();
+ },
+ // Examples for more watch faces
+ //[this]() -> std::unique_ptr<Screen> { return WatchFaceMinimalScreen(); },
+ //[this]() -> std::unique_ptr<Screen> { return WatchFaceCustomScreen(); }
+ },
+ Screens::ScreenListModes::LongPress} {
- }
+ settingsController.SetAppMenu(0);
+}
Clock::~Clock() {
lv_obj_clean(lv_scr_act());
}
-
-bool Clock::Refresh() {
- screens.Refresh();
+bool Clock::Refresh() {
+ screens.Refresh();
return running;
}
@@ -61,21 +64,31 @@ bool Clock::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
return screens.OnTouchEvent(event);
}
-std::unique_ptr<Screen> Clock::WatchFaceDigitalScreen() {
- return std::make_unique<Screens::WatchFaceDigital>(app, dateTimeController, batteryController, bleController, notificatioManager, settingsController, heartRateController, motionController);
+std::unique_ptr<Screen> Clock::WatchFaceDigitalScreen() {
+ return std::make_unique<Screens::WatchFaceDigital>(app,
+ dateTimeController,
+ batteryController,
+ bleController,
+ notificatioManager,
+ settingsController,
+ heartRateController,
+ motionController);
}
-std::unique_ptr<Screen> Clock::WatchFaceAnalogScreen() {
- return std::make_unique<Screens::WatchFaceAnalog>(app, dateTimeController, batteryController, bleController, notificatioManager, settingsController);
+std::unique_ptr<Screen> Clock::WatchFaceAnalogScreen() {
+ 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::make_unique<Screens::WatchFaceMinimal>(app, dateTimeController, batteryController, bleController, notificatioManager, settingsController);
+std::unique_ptr<Screen> Clock::WatchFaceMinimalScreen() {
+ return std::make_unique<Screens::WatchFaceMinimal>(app, dateTimeController, batteryController, bleController, notificatioManager,
+settingsController);
}
-std::unique_ptr<Screen> Clock::WatchFaceCustomScreen() {
- return std::make_unique<Screens::WatchFaceCustom>(app, dateTimeController, batteryController, bleController, notificatioManager, settingsController);
+std::unique_ptr<Screen> Clock::WatchFaceCustomScreen() {
+ return std::make_unique<Screens::WatchFaceCustom>(app, dateTimeController, batteryController, bleController, notificatioManager,
+settingsController);
}
*/ \ No newline at end of file