From 26e43bdfd743318b28087d152b02557b16b6aca2 Mon Sep 17 00:00:00 2001
From: Lefucjusz <marcin.lyda@mudita.com>
Date: Fri, 27 Sep 2024 11:36:17 +0200
Subject: [PATCH] [BH-2073] Fix invalid accusative form in Meditation

Fix of the issue that abandoning meditation
by clicking back will result in displaying
meditation session summary with invalid
accusative form in Polish.
---
 harmony_changelog.md                          |  1 +
 .../presenter/MeditationProgressPresenter.cpp | 49 ++++++++-----------
 .../presenter/MeditationProgressPresenter.hpp |  2 +
 3 files changed, 23 insertions(+), 29 deletions(-)

diff --git a/harmony_changelog.md b/harmony_changelog.md
index 496ce0f02cb87a7ef5ae608e55089f78b11d5c34..e56033c2c45d5e736d4655a6c8438afe4cd66689 100644
--- a/harmony_changelog.md
+++ b/harmony_changelog.md
@@ -4,6 +4,7 @@
 
 ### Fixed
 * Fixed message shown when entering alarm sound list after deleting selected alarm file
+* Fixed invalid accusative form in meditation summary in Polish
 
 ### Added
 * Added label with the name of the application on the countdown screens
diff --git a/products/BellHybrid/apps/application-bell-meditation-timer/presenter/MeditationProgressPresenter.cpp b/products/BellHybrid/apps/application-bell-meditation-timer/presenter/MeditationProgressPresenter.cpp
index d7c706071a4ce68839cfd28bb9d5373342504458..18c5a016748772cfae2985f8bcaffd2ad5621566 100644
--- a/products/BellHybrid/apps/application-bell-meditation-timer/presenter/MeditationProgressPresenter.cpp
+++ b/products/BellHybrid/apps/application-bell-meditation-timer/presenter/MeditationProgressPresenter.cpp
@@ -4,11 +4,11 @@
 #include "MeditationTimer.hpp"
 #include "MeditationCommon.hpp"
 #include "MeditationProgressPresenter.hpp"
+#include "MeditationTimerWindow.hpp"
 #include "models/ChimeInterval.hpp"
 #include "models/Statistics.hpp"
 
 #include <common/models/TimeModel.hpp>
-#include <common/windows/BellFinishedWindow.hpp>
 #include <audio/AudioMessage.hpp>
 #include <service-db/Settings.hpp>
 #include <LanguageUtils.hpp>
@@ -86,38 +86,12 @@ namespace app::meditation
 
     void MeditationProgressPresenter::abandon()
     {
-        timer->stop();
-        const auto elapsed     = std::chrono::duration_cast<std::chrono::minutes>(timer->getElapsed());
-        const auto summaryText = utils::translate("app_meditation_summary") + std::to_string(elapsed.count()) + " " +
-                                 utils::language::getCorrectMinutesNumeralForm(elapsed.count());
-
-        addMeditationEntry(elapsed);
-
-        app->switchWindow(
-            gui::window::bell_finished::defaultName,
-            gui::BellFinishedWindowData::Factory::create("big_namaste_W_G",
-                                                         "MeditationTimerWindow",
-                                                         summaryText,
-                                                         gui::BellFinishedWindowData::ExitBehaviour::SwitchWindow,
-                                                         endWindowTimeout));
+        onMeditationEnd(gui::BellFinishedWindowData::ExitBehaviour::SwitchWindow);
     }
 
     void MeditationProgressPresenter::finish()
     {
-        timer->stop();
-        const auto elapsed     = std::chrono::duration_cast<std::chrono::minutes>(timer->getElapsed());
-        const auto summaryText = utils::translate("app_meditation_summary") + std::to_string(elapsed.count()) + " " +
-                                 utils::language::getCorrectMinutesAccusativeForm(elapsed.count());
-
-        addMeditationEntry(elapsed);
-
-        app->switchWindow(
-            gui::window::bell_finished::defaultName,
-            gui::BellFinishedWindowData::Factory::create("big_namaste_W_G",
-                                                         "",
-                                                         summaryText,
-                                                         gui::BellFinishedWindowData::ExitBehaviour::ReturnToHomescreen,
-                                                         endWindowTimeout));
+        onMeditationEnd(gui::BellFinishedWindowData::ExitBehaviour::ReturnToHomescreen);
     }
 
     void MeditationProgressPresenter::onBeforeShow()
@@ -158,4 +132,21 @@ namespace app::meditation
             statisticsModel.addEntry(elapsed);
         }
     }
+
+    void MeditationProgressPresenter::onMeditationEnd(gui::BellFinishedWindowData::ExitBehaviour exitBehaviour)
+    {
+        using ExitBehaviour = gui::BellFinishedWindowData::ExitBehaviour;
+
+        timer->stop();
+        const auto elapsed      = std::chrono::duration_cast<std::chrono::minutes>(timer->getElapsed());
+        const auto &summaryText = utils::translate("app_meditation_summary") + std::to_string(elapsed.count()) + " " +
+                                  utils::language::getCorrectMinutesAccusativeForm(elapsed.count());
+
+        addMeditationEntry(elapsed);
+
+        const auto &windowToReturn = (exitBehaviour == ExitBehaviour::SwitchWindow) ? MeditationTimerWindow::name : "";
+        app->switchWindow(gui::window::bell_finished::defaultName,
+                          gui::BellFinishedWindowData::Factory::create(
+                              "big_namaste_W_G", windowToReturn, summaryText, exitBehaviour, endWindowTimeout));
+    }
 } // namespace app::meditation
diff --git a/products/BellHybrid/apps/application-bell-meditation-timer/presenter/MeditationProgressPresenter.hpp b/products/BellHybrid/apps/application-bell-meditation-timer/presenter/MeditationProgressPresenter.hpp
index 62cbfab518079d6890a9b9030dbe63a3256a4e10..7e9b9125eda202059554fedb4eea4232a85390db 100644
--- a/products/BellHybrid/apps/application-bell-meditation-timer/presenter/MeditationProgressPresenter.hpp
+++ b/products/BellHybrid/apps/application-bell-meditation-timer/presenter/MeditationProgressPresenter.hpp
@@ -6,6 +6,7 @@
 #include <apps-common/ApplicationCommon.hpp>
 #include <apps-common/BasePresenter.hpp>
 #include <apps-common/widgets/TimerWithCallbacks.hpp>
+#include <common/windows/BellFinishedWindow.hpp>
 #include <time/time_locale.hpp>
 
 #include <memory>
@@ -103,5 +104,6 @@ namespace app::meditation
         void onIntervalReached();
 
         void addMeditationEntry(std::chrono::minutes elapsed);
+        void onMeditationEnd(gui::BellFinishedWindowData::ExitBehaviour exitBehaviour);
     };
 } // namespace app::meditation