1 files changed, 44 insertions, 29 deletions
diff --git a/src/displayapp/screens/Timer.h b/src/displayapp/screens/Timer.h
index a6e26063..a07c729b 100644
--- a/src/displayapp/screens/Timer.h
+++ b/src/displayapp/screens/Timer.h
@@ -1,45 +1,60 @@
 #pragma once
 
 #include "displayapp/screens/Screen.h"
-#include "components/datetime/DateTimeController.h"
 #include "systemtask/SystemTask.h"
 #include "displayapp/LittleVgl.h"
 #include "displayapp/widgets/Counter.h"
+#include "utility/DirtyValue.h"
 #include <lvgl/lvgl.h>
 
-#include "components/timer/TimerController.h"
+#include "components/timer/Timer.h"
+#include "Symbols.h"
 
-namespace Pinetime::Applications::Screens {
-  class Timer : public Screen {
-  public:
-    Timer(Controllers::TimerController& timerController);
-    ~Timer() override;
-    void Refresh() override;
-    void Reset();
-    void ToggleRunning();
-    void ButtonPressed();
-    void MaskReset();
+namespace Pinetime::Applications {
+  namespace Screens {
+    class Timer : public Screen {
+    public:
+      Timer(Controllers::Timer& timerController);
+      ~Timer() override;
+      void Refresh() override;
+      void Reset();
+      void ToggleRunning();
+      void ButtonPressed();
+      void MaskReset();
 
-  private:
-    void SetTimerRunning();
-    void SetTimerStopped();
-    void UpdateMask();
-    Controllers::TimerController& timerController;
+    private:
+      void SetTimerRunning();
+      void SetTimerStopped();
+      void UpdateMask();
+      void DisplayTime();
+      Pinetime::Controllers::Timer& timer;
 
-    lv_obj_t* btnPlayPause;
-    lv_obj_t* txtPlayPause;
+      lv_obj_t* btnPlayPause;
+      lv_obj_t* txtPlayPause;
 
-    lv_obj_t* btnObjectMask;
-    lv_obj_t* highlightObjectMask;
-    lv_objmask_mask_t* btnMask;
-    lv_objmask_mask_t* highlightMask;
+      lv_obj_t* btnObjectMask;
+      lv_obj_t* highlightObjectMask;
+      lv_objmask_mask_t* btnMask;
+      lv_objmask_mask_t* highlightMask;
 
-    lv_task_t* taskRefresh;
-    Widgets::Counter minuteCounter = Widgets::Counter(0, 59, jetbrains_mono_76);
-    Widgets::Counter secondCounter = Widgets::Counter(0, 59, jetbrains_mono_76);
+      lv_task_t* taskRefresh;
+      Widgets::Counter minuteCounter = Widgets::Counter(0, 59, jetbrains_mono_76);
+      Widgets::Counter secondCounter = Widgets::Counter(0, 59, jetbrains_mono_76);
 
-    bool buttonPressing = false;
-    lv_coord_t maskPosition = 0;
-    TickType_t pressTime = 0;
+      bool buttonPressing = false;
+      lv_coord_t maskPosition = 0;
+      TickType_t pressTime = 0;
+      Utility::DirtyValue<std::chrono::seconds> displaySeconds;
+    };
+  }
+
+  template <>
+  struct AppTraits<Apps::Timer> {
+    static constexpr Apps app = Apps::Timer;
+    static constexpr const char* icon = Screens::Symbols::hourGlass;
+
+    static Screens::Screen* Create(AppControllers& controllers) {
+      return new Screens::Timer(controllers.timer);
+    };
   };
 }