diff options
| author | Michele Bini <michele.bini@gmail.com> | 2022-03-25 02:56:04 (GMT) |
|---|---|---|
| committer | Michele Bini <michele.bini@gmail.com> | 2022-03-25 03:20:18 (GMT) |
| commit | ac8bc2a0a0662b19ee6c286f105dac20a375a9f4 (patch) | |
| tree | 55b6d51236a65d7be871cb369f0c1d373bde3dae /src/displayapp/DisplayApp.cpp | |
| parent | 0dcdc37ab00fbc73932df94ec67f39421c266a6d (diff) | |
Remove stopwatch and countdown timer
Diffstat (limited to 'src/displayapp/DisplayApp.cpp')
| -rw-r--r-- | src/displayapp/DisplayApp.cpp | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/src/displayapp/DisplayApp.cpp b/src/displayapp/DisplayApp.cpp index 229ed79..077154d 100644 --- a/src/displayapp/DisplayApp.cpp +++ b/src/displayapp/DisplayApp.cpp @@ -2,7 +2,6 @@ #include <libraries/log/nrf_log.h> #include "displayapp/screens/HeartRate.h" #include "displayapp/screens/Motion.h" -#include "displayapp/screens/Timer.h" #include "displayapp/screens/Alarm.h" #include "components/battery/BatteryController.h" #include "components/ble/BleController.h" @@ -16,7 +15,6 @@ #include "displayapp/screens/FirmwareUpdate.h" #include "displayapp/screens/FirmwareValidation.h" #include "displayapp/screens/InfiniPaint.h" -#include "displayapp/screens/StopWatch.h" #include "displayapp/screens/Meter.h" #include "displayapp/screens/Notifications.h" #include "displayapp/screens/SystemInfo.h" @@ -87,7 +85,6 @@ DisplayApp::DisplayApp(Drivers::St7789& lcd, Controllers::Settings& settingsController, Pinetime::Controllers::MotorController& motorController, Pinetime::Controllers::MotionController& motionController, - Pinetime::Controllers::TimerController& timerController, Pinetime::Controllers::AlarmController& alarmController, Pinetime::Controllers::BrightnessController& brightnessController, Pinetime::Controllers::TouchHandler& touchHandler) @@ -103,7 +100,6 @@ DisplayApp::DisplayApp(Drivers::St7789& lcd, settingsController {settingsController}, motorController {motorController}, motionController {motionController}, - timerController {timerController}, alarmController {alarmController}, brightnessController {brightnessController}, touchHandler {touchHandler} { @@ -195,14 +191,6 @@ void DisplayApp::Refresh() { case Messages::NewNotification: LoadApp(Apps::NotificationsPreview, DisplayApp::FullRefreshDirections::Down); break; - case Messages::TimerDone: - if (currentApp == Apps::Timer) { - auto* timer = static_cast<Screens::Timer*>(currentScreen.get()); - timer->setDone(); - } else { - LoadApp(Apps::Timer, DisplayApp::FullRefreshDirections::Down); - } - break; case Messages::AlarmTriggered: if (currentApp == Apps::Alarm) { auto* alarm = static_cast<Screens::Alarm*>(currentScreen.get()); @@ -363,9 +351,6 @@ void DisplayApp::LoadApp(Apps app, DisplayApp::FullRefreshDirections direction) this, notificationManager, systemTask->nimble().alertService(), motorController, *systemTask, Screens::Notifications::Modes::Preview); ReturnApp(Apps::Clock, FullRefreshDirections::Up, TouchEvents::SwipeUp); break; - case Apps::Timer: - currentScreen = std::make_unique<Screens::Timer>(this, timerController); - break; case Apps::Alarm: currentScreen = std::make_unique<Screens::Alarm>(this, alarmController, settingsController, *systemTask); break; @@ -421,9 +406,6 @@ void DisplayApp::LoadApp(Apps app, DisplayApp::FullRefreshDirections direction) currentScreen = std::make_unique<Screens::FlashLight>(this, *systemTask, brightnessController); ReturnApp(Apps::QuickSettings, FullRefreshDirections::Down, TouchEvents::SwipeDown); break; - case Apps::StopWatch: - currentScreen = std::make_unique<Screens::StopWatch>(this, *systemTask); - break; case Apps::Paint: currentScreen = std::make_unique<Screens::InfiniPaint>(this, lvgl, motorController); break; |
