5 files changed, 8 insertions(+), 65 deletions(-)

M products/BellHybrid/apps/application-bell-meditation-timer/ApplicationBellMeditationTimer.cpp
M products/BellHybrid/apps/application-bell-meditation-timer/CMakeLists.txt
M products/BellHybrid/apps/application-bell-meditation-timer/presenter/MeditationProgressPresenter.cpp
D products/BellHybrid/apps/application-bell-meditation-timer/windows/SessionEndWindow.cpp
D products/BellHybrid/apps/application-bell-meditation-timer/windows/SessionEndWindow.hpp

@@ 6,10 6,10 @@
 #include "windows/MeditationRunningWindow.hpp"
 #include "windows/MeditationTimerWindow.hpp"
 #include "windows/ReadyGoingWindow.hpp"
-#include "windows/SessionEndWindow.hpp"
 #include "windows/SessionPausedWindow.hpp"
 
 #include <common/models/TimeModel.hpp>
+#include <common/windows/BellFinishedWindow.hpp>
 
 namespace app
 {


@@ 60,10 60,10 @@ namespace app
         windowsFactory.attach(gui::name::window::sessionPaused, [](ApplicationCommon *app, const std::string &name) {
             return std::make_unique<gui::SessionPausedWindow>(app);
         });
-        windowsFactory.attach(gui::name::window::sessionEnded, [](ApplicationCommon *app, const std::string &name) {
-            auto presenter = std::make_unique<app::meditation::SessionEndedPresenter>(app);
-            return std::make_unique<gui::SessionEndWindow>(app, std::move(presenter));
-        });
+        windowsFactory.attach(gui::window::bell_finished::defaultName,
+                              [](ApplicationCommon *app, const std::string &name) {
+                                  return std::make_unique<gui::BellFinishedWindow>(app);
+                              });
 
         attachPopups({gui::popup::ID::AlarmActivated,
                       gui::popup::ID::AlarmDeactivated,

@@ 28,7 28,6 @@ target_sources(application-bell-meditation-timer
         windows/MeditationRunningWindow.cpp
         windows/MeditationTimerWindow.cpp
         windows/ReadyGoingWindow.cpp
-        windows/SessionEndWindow.cpp
         windows/SessionPausedWindow.cpp
     PUBLIC
         include/application-bell-meditation-timer/ApplicationBellMeditationTimer.hpp

@@ 6,6 6,7 @@
 #include "MeditationProgressPresenter.hpp"
 
 #include <common/models/TimeModel.hpp>
+#include <common/windows/BellFinishedWindow.hpp>
 #include <service-appmgr/Controller.hpp>
 #include <service-db/Settings.hpp>
 


@@ 75,7 76,8 @@ namespace app::meditation
     void MeditationProgressPresenter::finish()
     {
         timer->stop();
-        app->switchWindow(gui::name::window::sessionEnded);
+        app->switchWindow(gui::window::bell_finished::defaultName,
+                          gui::BellFinishedWindowData::Factory::create("big_namaste_W_G", "", "", true));
     }
 
     void MeditationProgressPresenter::onProgressFinished()

@@ 1,32 0,0 @@
-// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
-// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
-
-#include "ApplicationBellMeditationTimer.hpp"
-#include "SessionEndWindow.hpp"
-
-namespace gui
-{
-    SessionEndWindow::SessionEndWindow(
-        app::ApplicationCommon *app,
-        std::shared_ptr<app::meditation::SessionEndedPresenterContract::Presenter> winPresenter)
-        : BellFinishedWindow(app, gui::name::window::sessionEnded), presenter{std::move(winPresenter)}
-    {
-        timerCallback = [this](Item &, sys::Timer &) {
-            presenter->activate();
-            return true;
-        };
-    }
-
-    bool SessionEndWindow::onInput(const InputEvent &inputEvent)
-    {
-        return true;
-    }
-
-    void SessionEndWindow::onBeforeShow(ShowMode mode, SwitchData *data)
-    {
-        BellFinishedWindow::onBeforeShow(mode, data);
-
-        icon->image->set("big_namaste", ImageTypeSpecifier::W_G);
-        icon->text->setRichText(utils::translate("app_bell_meditation_thank_you_for_session"));
-    }
-} // namespace gui

@@ 1,26 0,0 @@
-// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
-// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
-
-#pragma once
-
-#include "SessionEndedPresenter.hpp"
-
-#include <common/windows/BellFinishedWindow.hpp>
-#include <gui/widgets/Icon.hpp>
-
-namespace gui
-{
-    class SessionEndWindow : public BellFinishedWindow
-    {
-      private:
-        std::shared_ptr<app::meditation::SessionEndedPresenterContract::Presenter> presenter;
-
-      public:
-        SessionEndWindow(app::ApplicationCommon *app,
-                         std::shared_ptr<app::meditation::SessionEndedPresenterContract::Presenter> winPresenter);
-
-        // virtual methods
-        bool onInput(const InputEvent &inputEvent) override;
-        void onBeforeShow(ShowMode mode, SwitchData *data) override;
-    };
-} // namespace gui