will/InfiniTime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Put common code into DismissToBlack helper function

Browse Source
This commit is contained in:
Tomas Groth 2022-09-21 07:33:20 +02:00 committed by JF
parent bef65bcd55
commit 861ed3584c
2 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/displayapp/screens/Notifications.cpp
View File

@ -129,20 +129,24 @@ void Notifications::OnPreviewInteraction() {
} }
} }
void Notifications::DismissToBlack()
{
currentItem.reset(nullptr);
app->SetFullRefresh(DisplayApp::FullRefreshDirections::RightAnim);
// create black transition screen to let the notification dismiss to blackness
lv_obj_t* blackBox = lv_obj_create(lv_scr_act(), nullptr);
lv_obj_set_size(blackBox, LV_HOR_RES, LV_VER_RES);
lv_obj_set_style_local_bg_color(blackBox, LV_OBJ_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_BLACK);
dismissingNotification = true;
}
void Notifications::OnPreviewDismiss() { void Notifications::OnPreviewDismiss() {
notificationManager.Dismiss(currentId); notificationManager.Dismiss(currentId);
if (timeoutLine != nullptr) { if (timeoutLine != nullptr) {
lv_obj_del(timeoutLine); lv_obj_del(timeoutLine);
timeoutLine = nullptr; timeoutLine = nullptr;
} }
currentItem.reset(nullptr); DismissToBlack();
dismissingNotification = true;
afterDismissNextMessageFromAbove = true; // show next message coming from below
app->SetFullRefresh(DisplayApp::FullRefreshDirections::RightAnim);
// create black transition screen to let the notification dismiss to blackness
lv_obj_t* blackBox = lv_obj_create(lv_scr_act(), nullptr);
lv_obj_set_size(blackBox, LV_HOR_RES, LV_VER_RES);
lv_obj_set_style_local_bg_color(blackBox, LV_OBJ_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_BLACK);
} }
bool Notifications::OnTouchEvent(Pinetime::Applications::TouchEvents event) { bool Notifications::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
@ -172,13 +176,7 @@ bool Notifications::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
} 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, won't be found be refresh and try to load latest message or no message box
} }
currentItem.reset(nullptr); DismissToBlack();
app->SetFullRefresh(DisplayApp::FullRefreshDirections::RightAnim);
// create black transition screen to let the notification dismiss to blackness
lv_obj_t* blackBox = lv_obj_create(lv_scr_act(), nullptr);
lv_obj_set_size(blackBox, LV_HOR_RES, LV_VER_RES);
lv_obj_set_style_local_bg_color(blackBox, LV_OBJ_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_BLACK);
dismissingNotification = true;
return true; return true;
} }
return false; return false;

1
src/displayapp/screens/Notifications.h
View File

@ -29,6 +29,7 @@ namespace Pinetime {
void Refresh() override; void Refresh() override;
bool OnTouchEvent(Pinetime::Applications::TouchEvents event) override; bool OnTouchEvent(Pinetime::Applications::TouchEvents event) override;
void DismissToBlack();
void OnPreviewInteraction(); void OnPreviewInteraction();
void OnPreviewDismiss(); void OnPreviewDismiss();