mirror of
https://github.com/InfiniTimeOrg/InfiniTime.git
synced 2024-10-22 23:21:53 +02:00
Merge 4dbec96973
into 3a0d673df4
This commit is contained in:
commit
a97fad0eee
|
@ -82,7 +82,6 @@ void Notifications::Refresh() {
|
||||||
|
|
||||||
} else if (mode == Modes::Preview && dismissingNotification) {
|
} else if (mode == Modes::Preview && dismissingNotification) {
|
||||||
running = false;
|
running = false;
|
||||||
currentItem = std::make_unique<NotificationItem>(alertNotificationService, motorController);
|
|
||||||
|
|
||||||
} else if (dismissingNotification) {
|
} else if (dismissingNotification) {
|
||||||
dismissingNotification = false;
|
dismissingNotification = false;
|
||||||
|
@ -113,11 +112,11 @@ void Notifications::Refresh() {
|
||||||
alertNotificationService,
|
alertNotificationService,
|
||||||
motorController);
|
motorController);
|
||||||
} else {
|
} else {
|
||||||
currentItem = std::make_unique<NotificationItem>(alertNotificationService, motorController);
|
running = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
running = currentItem->IsRunning() && running;
|
running = running && currentItem->IsRunning();
|
||||||
}
|
}
|
||||||
|
|
||||||
void Notifications::OnPreviewInteraction() {
|
void Notifications::OnPreviewInteraction() {
|
||||||
|
@ -173,7 +172,9 @@ bool Notifications::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
|
||||||
} else if (nextMessage.valid) {
|
} else if (nextMessage.valid) {
|
||||||
currentId = nextMessage.id;
|
currentId = nextMessage.id;
|
||||||
} else {
|
} else {
|
||||||
// don't update id, won't be found be refresh and try to load latest message or no message box
|
// don't update id, notification manager will try to fetch
|
||||||
|
// but not find it. Refresh will try to load latest message
|
||||||
|
// or dismiss to watchface
|
||||||
}
|
}
|
||||||
DismissToBlack();
|
DismissToBlack();
|
||||||
return true;
|
return true;
|
||||||
|
|
Loading…
Reference in a new issue