From 861ed3584ce911d03d21960b55d98b624a8e0831 Mon Sep 17 00:00:00 2001
From: Tomas Groth <second@tgc.dk>
Date: Wed, 21 Sep 2022 07:33:20 +0200
Subject: [PATCH] Put common code into DismissToBlack helper function

---
 src/displayapp/screens/Notifications.cpp | 28 +++++++++++-------------
 src/displayapp/screens/Notifications.h   |  1 +
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/src/displayapp/screens/Notifications.cpp b/src/displayapp/screens/Notifications.cpp
index 9d126a16..9fa07993 100644
--- a/src/displayapp/screens/Notifications.cpp
+++ b/src/displayapp/screens/Notifications.cpp
@@ -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() {
   notificationManager.Dismiss(currentId);
   if (timeoutLine != nullptr) {
     lv_obj_del(timeoutLine);
     timeoutLine = nullptr;
   }
-  currentItem.reset(nullptr);
-  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);
+  DismissToBlack();
 }
 
 bool Notifications::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
@@ -172,13 +176,7 @@ bool Notifications::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
         } else {
           // don't update id, won't be found be refresh and try to load latest message or no message box
         }
-        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;
+        DismissToBlack();
         return true;
       }
       return false;
diff --git a/src/displayapp/screens/Notifications.h b/src/displayapp/screens/Notifications.h
index 58644553..bdaac7bb 100644
--- a/src/displayapp/screens/Notifications.h
+++ b/src/displayapp/screens/Notifications.h
@@ -29,6 +29,7 @@ namespace Pinetime {
 
         void Refresh() override;
         bool OnTouchEvent(Pinetime::Applications::TouchEvents event) override;
+        void DismissToBlack();
         void OnPreviewInteraction();
         void OnPreviewDismiss();