7 files changed, 22 insertions(+), 1 deletions(-)

M products/BellHybrid/apps/application-bell-meditation-timer/presenter/MeditationProgressPresenter.cpp
M products/BellHybrid/apps/application-bell-meditation-timer/presenter/MeditationProgressPresenter.hpp
M products/BellHybrid/apps/application-bell-meditation-timer/windows/MeditationRunningWindow.cpp
M products/BellHybrid/apps/application-bell-powernap/presenter/PowerNapProgressPresenter.cpp
M products/BellHybrid/apps/application-bell-powernap/presenter/PowerNapProgressPresenter.hpp
M products/BellHybrid/apps/application-bell-powernap/windows/PowerNapProgressWindow.cpp
M products/BellHybrid/apps/application-bell-powernap/windows/PowerNapProgressWindow.hpp

@@ 92,4 92,9 @@ namespace app::meditation
             getView()->intervalReached();
         }
     }
+
+    void MeditationProgressPresenter::onBeforeShow()
+    {
+        getView()->setTimeFormat(timeModel->getTimeFormat());
+    }
 } // namespace app::meditation

@@ 51,6 51,7 @@ namespace app::meditation
             virtual void resume()                                                   = 0;
             virtual void abandon()                                                  = 0;
             virtual void finish()                                                   = 0;
+            virtual void onBeforeShow()                                             = 0;
         };
     };
 


@@ 82,5 83,6 @@ namespace app::meditation
         void resume() override;
         void abandon() override;
         void finish() override;
+        void onBeforeShow() override;
     };
 } // namespace app::meditation

@@ 108,7 108,7 @@ namespace gui
     void MeditationRunningWindow::onBeforeShow(ShowMode mode, SwitchData *data)
     {
         AppWindow::onBeforeShow(mode, data);
-
+        presenter->onBeforeShow();
         if (mode == ShowMode::GUI_SHOW_INIT) {
             playGong();
             presenter->start();

@@ 78,4 78,9 @@ namespace app::powernap
         return napFinished;
     }
 
+    void PowerNapProgressPresenter::onBeforeShow()
+    {
+        getView()->setTimeFormat(timeModel->getTimeFormat());
+    }
+
 } // namespace app::powernap

@@ 46,6 46,7 @@ namespace app::powernap
             virtual void setTimer(std::unique_ptr<app::TimerWithCallbacks> &&timer) = 0;
             virtual void handleUpdateTimeEvent()                                    = 0;
             virtual bool isNapFinished()                                            = 0;
+            virtual void onBeforeShow()                                             = 0;
         };
     };
 


@@ 68,6 69,7 @@ namespace app::powernap
 
         void onNapFinished();
         void onNapAlarmFinished();
+        void onBeforeShow() override;
 
       public:
         PowerNapProgressPresenter(app::ApplicationCommon *app,

@@ 141,4 141,9 @@ namespace gui
         }
         return true;
     }
+
+    void PowerNapProgressWindow::onBeforeShow(ShowMode mode, SwitchData *data)
+    {
+        presenter->onBeforeShow();
+    }
 } // namespace gui

@@ 30,6 30,8 @@ namespace gui
 
         void napEnded() override;
 
+        void onBeforeShow(ShowMode mode, SwitchData *data) override;
+
       public:
         PowerNapProgressWindow(app::ApplicationCommon *app,
                                std::shared_ptr<app::powernap::PowerNapProgressContract::Presenter> presenter);