From 44818b128704f9f18a7a95a0ed30b319145afaab Mon Sep 17 00:00:00 2001
From: mkamonMdt <michal.kamon@mudita.com>
Date: Sat, 18 Sep 2021 15:14:15 +0200
Subject: [PATCH] [BH-880] Fix of missing minus in PowerNap

The bug could be noticed on the PowerNap's
progress window. The countdown there is supposed
to be increasing in value, that means the minus
sign should be visible at all non-zero values.
---
 .../apps-common/widgets/ProgressTimerImpl.cpp | 23 ++++++++++++++-----
 .../apps-common/widgets/ProgressTimerImpl.hpp |  9 +++++++-
 .../presenter/PowerNapProgressPresenter.cpp   |  3 ++-
 3 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/module-apps/apps-common/widgets/ProgressTimerImpl.cpp b/module-apps/apps-common/widgets/ProgressTimerImpl.cpp
index 52c7975cef6866cd6f08fafec7ea13cf39043f19..954f35f6db9a7b2a2e932d633aa57541d02ece2b 100644
--- a/module-apps/apps-common/widgets/ProgressTimerImpl.cpp
+++ b/module-apps/apps-common/widgets/ProgressTimerImpl.cpp
@@ -8,14 +8,19 @@
 #include <time/time_conversion.hpp>
 #include <gsl/assert>
 
+namespace
+{
+    inline constexpr auto increasingModePrefix = "-";
+}
 namespace app
 {
 
     ProgressTimerImpl::ProgressTimerImpl(app::ApplicationCommon *app,
                                          gui::Item *parent,
                                          std::string timerName,
-                                         std::chrono::milliseconds baseTick)
-        : app{app}, parent{parent}, name{std::move(timerName)}, baseTickInterval{baseTick}
+                                         std::chrono::milliseconds baseTick,
+                                         ProgressCountdownMode countdownMode)
+        : app{app}, parent{parent}, name{std::move(timerName)}, baseTickInterval{baseTick}, countdownMode{countdownMode}
     {}
 
     void ProgressTimerImpl::resetProgress()
@@ -35,11 +40,17 @@ namespace app
     void ProgressTimerImpl::updateText()
     {
         using utils::time::Duration;
-        if (text != nullptr) {
-            const auto secondsRemaining = duration - elapsed;
-            const Duration remainingDuration{std::time_t{secondsRemaining.count()}};
-            text->setText(remainingDuration.str(Duration::DisplayedFormat::Fixed0M0S));
+        if (text == nullptr) {
+            return;
+        }
+        const auto secondsRemaining = duration - elapsed;
+        const Duration remainingDuration{std::time_t{secondsRemaining.count()}};
+        UTF8 timerText;
+        if (countdownMode == ProgressCountdownMode::Increasing && secondsRemaining != std::chrono::seconds::zero()) {
+            timerText += increasingModePrefix;
         }
+        timerText += remainingDuration.str(Duration::DisplayedFormat::Fixed0M0S);
+        text->setText(std::move(timerText));
     }
 
     void ProgressTimerImpl::updateProgress()
diff --git a/module-apps/apps-common/widgets/ProgressTimerImpl.hpp b/module-apps/apps-common/widgets/ProgressTimerImpl.hpp
index eba274ca09147702e5311a0b058d80c7a5e99337..07301a057728b417823a499a2acdaea11f848587 100644
--- a/module-apps/apps-common/widgets/ProgressTimerImpl.hpp
+++ b/module-apps/apps-common/widgets/ProgressTimerImpl.hpp
@@ -21,6 +21,11 @@ namespace gui
 
 namespace app
 {
+    enum class ProgressCountdownMode
+    {
+        Decreasing,
+        Increasing
+    };
 
     class ProgressTimerImpl : public ProgressTimer
     {
@@ -41,6 +46,7 @@ namespace app
 
         std::function<void()> onFinishedCallback = nullptr;
         std::function<void()> onIntervalCallback = nullptr;
+        ProgressCountdownMode countdownMode;
 
         void startTimer();
         void update();
@@ -55,7 +61,8 @@ namespace app
         ProgressTimerImpl(app::ApplicationCommon *app,
                           gui::Item *parent,
                           std::string timerName,
-                          std::chrono::milliseconds baseTick);
+                          std::chrono::milliseconds baseTick,
+                          ProgressCountdownMode countdownMode = ProgressCountdownMode::Decreasing);
         void reset(std::chrono::seconds _duration,
                    std::chrono::seconds _interval = std::chrono::seconds::zero()) override;
         void start() override;
diff --git a/products/BellHybrid/apps/application-bell-powernap/presenter/PowerNapProgressPresenter.cpp b/products/BellHybrid/apps/application-bell-powernap/presenter/PowerNapProgressPresenter.cpp
index 0bdec016f7cc1f0906eba9ec0640c8729d8b24bf..d87c0a6e1df9391c5ffc9d2c1dedb255807e3508 100644
--- a/products/BellHybrid/apps/application-bell-powernap/presenter/PowerNapProgressPresenter.cpp
+++ b/products/BellHybrid/apps/application-bell-powernap/presenter/PowerNapProgressPresenter.cpp
@@ -32,7 +32,8 @@ namespace app::powernap
 
     void PowerNapProgressPresenter::initTimer(gui::Item *parent)
     {
-        timer = std::make_unique<app::ProgressTimerImpl>(app, parent, powernapTimerName, timerTick);
+        timer = std::make_unique<app::ProgressTimerImpl>(
+            app, parent, powernapTimerName, timerTick, app::ProgressCountdownMode::Increasing);
         timer->registerOnFinishedCallback([this]() { onNapFinished(); });
     }
     void PowerNapProgressPresenter::activate()