Notifications: use motorController object instead of class function
We get the motoroController object, so store and use it.
This commit is contained in:
parent
d5b78ecd66
commit
04eca81a95
|
@ -17,6 +17,7 @@ Notifications::Notifications(DisplayApp* app,
|
|||
: Screen(app),
|
||||
notificationManager {notificationManager},
|
||||
alertNotificationService {alertNotificationService},
|
||||
motorController {motorController},
|
||||
systemTask {systemTask},
|
||||
mode {mode} {
|
||||
notificationManager.ClearNewNotificationFlag();
|
||||
|
@ -29,7 +30,8 @@ Notifications::Notifications(DisplayApp* app,
|
|||
notification.category,
|
||||
notificationManager.NbNotifications(),
|
||||
mode,
|
||||
alertNotificationService);
|
||||
alertNotificationService,
|
||||
motorController);
|
||||
validDisplay = true;
|
||||
} else {
|
||||
currentItem = std::make_unique<NotificationItem>("Notification",
|
||||
|
@ -38,7 +40,8 @@ Notifications::Notifications(DisplayApp* app,
|
|||
notification.category,
|
||||
notificationManager.NbNotifications(),
|
||||
Modes::Preview,
|
||||
alertNotificationService);
|
||||
alertNotificationService,
|
||||
motorController);
|
||||
}
|
||||
|
||||
if (mode == Modes::Preview) {
|
||||
|
@ -66,7 +69,7 @@ Notifications::Notifications(DisplayApp* app,
|
|||
Notifications::~Notifications() {
|
||||
lv_task_del(taskRefresh);
|
||||
// make sure we stop any vibrations before exiting
|
||||
Controllers::MotorController::StopRinging();
|
||||
motorController.StopRinging();
|
||||
systemTask.PushMessage(System::Messages::EnableSleeping);
|
||||
lv_obj_clean(lv_scr_act());
|
||||
}
|
||||
|
@ -87,7 +90,7 @@ void Notifications::Refresh() {
|
|||
|
||||
void Notifications::OnPreviewInteraction() {
|
||||
systemTask.PushMessage(System::Messages::EnableSleeping);
|
||||
Controllers::MotorController::StopRinging();
|
||||
motorController.StopRinging();
|
||||
if (timeoutLine != nullptr) {
|
||||
lv_obj_del(timeoutLine);
|
||||
timeoutLine = nullptr;
|
||||
|
@ -125,7 +128,8 @@ bool Notifications::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
|
|||
previousNotification.category,
|
||||
notificationManager.NbNotifications(),
|
||||
mode,
|
||||
alertNotificationService);
|
||||
alertNotificationService,
|
||||
motorController);
|
||||
}
|
||||
return true;
|
||||
case Pinetime::Applications::TouchEvents::SwipeUp: {
|
||||
|
@ -150,7 +154,8 @@ bool Notifications::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
|
|||
nextNotification.category,
|
||||
notificationManager.NbNotifications(),
|
||||
mode,
|
||||
alertNotificationService);
|
||||
alertNotificationService,
|
||||
motorController);
|
||||
}
|
||||
return true;
|
||||
default:
|
||||
|
@ -171,8 +176,9 @@ Notifications::NotificationItem::NotificationItem(const char* title,
|
|||
Controllers::NotificationManager::Categories category,
|
||||
uint8_t notifNb,
|
||||
Modes mode,
|
||||
Pinetime::Controllers::AlertNotificationService& alertNotificationService)
|
||||
: mode {mode}, alertNotificationService {alertNotificationService} {
|
||||
Pinetime::Controllers::AlertNotificationService& alertNotificationService,
|
||||
Pinetime::Controllers::MotorController& motorController)
|
||||
: mode {mode}, alertNotificationService {alertNotificationService}, motorController {motorController} {
|
||||
lv_obj_t* container1 = lv_cont_create(lv_scr_act(), NULL);
|
||||
|
||||
lv_obj_set_style_local_bg_color(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x222222));
|
||||
|
@ -269,7 +275,7 @@ void Notifications::NotificationItem::OnCallButtonEvent(lv_obj_t* obj, lv_event_
|
|||
return;
|
||||
}
|
||||
|
||||
Controllers::MotorController::StopRinging();
|
||||
motorController.StopRinging();
|
||||
|
||||
if (obj == bt_accept) {
|
||||
alertNotificationService.AcceptIncomingCall();
|
||||
|
|
|
@ -39,7 +39,8 @@ namespace Pinetime {
|
|||
Controllers::NotificationManager::Categories,
|
||||
uint8_t notifNb,
|
||||
Modes mode,
|
||||
Pinetime::Controllers::AlertNotificationService& alertNotificationService);
|
||||
Pinetime::Controllers::AlertNotificationService& alertNotificationService,
|
||||
Pinetime::Controllers::MotorController& motorController);
|
||||
~NotificationItem();
|
||||
bool IsRunning() const {
|
||||
return running;
|
||||
|
@ -56,6 +57,7 @@ namespace Pinetime {
|
|||
lv_obj_t* label_reject;
|
||||
Modes mode;
|
||||
Pinetime::Controllers::AlertNotificationService& alertNotificationService;
|
||||
Pinetime::Controllers::MotorController& motorController;
|
||||
bool running = true;
|
||||
};
|
||||
|
||||
|
@ -66,6 +68,7 @@ namespace Pinetime {
|
|||
};
|
||||
Pinetime::Controllers::NotificationManager& notificationManager;
|
||||
Pinetime::Controllers::AlertNotificationService& alertNotificationService;
|
||||
Pinetime::Controllers::MotorController& motorController;
|
||||
System::SystemTask& systemTask;
|
||||
Modes mode = Modes::Normal;
|
||||
std::unique_ptr<NotificationItem> currentItem;
|
||||
|
|
Loading…
Reference in New Issue
Block a user