1 files changed, 9 insertions, 13 deletions
diff --git a/src/displayapp/screens/Timer.h b/src/displayapp/screens/Timer.h
index 2f74fb4..9b1431e 100644
--- a/src/displayapp/screens/Timer.h
+++ b/src/displayapp/screens/Timer.h
@@ -8,12 +8,15 @@
 #include "components/timer/TimerController.h"
 
 namespace Pinetime::Applications::Screens {
+
   class Timer : public Screen {
   public:
     enum class Modes { Normal, Done };
 
     Timer(DisplayApp* app, Controllers::TimerController& timerController);
+
     ~Timer() override;
+
     void Refresh() override;
     void RefreshRunning();
     inline void SetDone() {
@@ -29,7 +32,7 @@ namespace Pinetime::Applications::Screens {
       if (event == LV_EVENT_CLICKED) {
         if (obj == btnPlayPause) {
           if (timerController.IsRunning()) {
-            uint32_t seconds = timerController.GetTimeRemaining() / 1000;
+            uint32_t seconds = timerController.GetSecondsRemaining();
             minutesToSet = seconds / 60;
             secondsToSet = seconds % 60;
             timerController.StopTimer();
@@ -92,19 +95,12 @@ namespace Pinetime::Applications::Screens {
     uint8_t secondsToSet = 0;
     uint8_t minutesToSet = 0;
     Controllers::TimerController& timerController;
+
+    void Stop();
+
     lv_obj_t* backgroundLabel;
-    lv_obj_t* time;
-    lv_obj_t* msecTime;
-    lv_obj_t* btnPlayPause;
-    lv_obj_t* txtPlayPause;
-    lv_obj_t* btnMinutesUp;
-    lv_obj_t* btnMinutesDown;
-    lv_obj_t* btnSecondsUp;
-    lv_obj_t* btnSecondsDown;
-    lv_obj_t* txtMUp;
-    lv_obj_t* txtMDown;
-    lv_obj_t* txtSUp;
-    lv_obj_t* txtSDown;
     lv_task_t* taskRefresh;
+    lv_obj_t *time, *btnPlayPause, *txtPlayPause, *btnMinutesUp = nullptr, *btnMinutesDown, *btnSecondsUp, *btnSecondsDown, *txtMUp,
+      *txtMDown, *txtSUp, *txtSDown;
   };
 }