Merge branch 'develop' into infineat-external-resources

# Conflicts:
#	src/displayapp/screens/Symbols.h
#	src/displayapp/screens/settings/SettingWatchFace.cpp
#	src/displayapp/screens/settings/SettingWatchFace.h

1 files changed, 19 insertions, 6 deletions

diff --git a/src/displayapp/screens/Timer.h b/src/displayapp/screens/Timer.h
index 2797a4fa..a6b60a17 100644
--- a/src/displayapp/screens/Timer.h
+++ b/src/displayapp/screens/Timer.h
@@ -5,29 +5,42 @@
 #include "systemtask/SystemTask.h"
 #include "displayapp/LittleVgl.h"
 #include "displayapp/widgets/Counter.h"
+#include <lvgl/lvgl.h>
 
 #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 SetDone();
-    void OnButtonEvent(lv_obj_t* obj, lv_event_t event);
+    void Reset();
+    void ToggleRunning();
+    void ButtonPressed();
+    void MaskReset();
 
   private:
     void SetTimerRunning();
     void SetTimerStopped();
+    void UpdateMask();
     Controllers::TimerController& timerController;
+
     lv_obj_t* msecTime;
     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_task_t* taskRefresh;
-    Widgets::Counter minuteCounter = Widgets::Counter(0, 59);
-    Widgets::Counter secondCounter = Widgets::Counter(0, 59);
+    Widgets::Counter minuteCounter = Widgets::Counter(0, 59, jetbrains_mono_76);
+    Widgets::Counter secondCounter = Widgets::Counter(0, 59, jetbrains_mono_76);
+
+    bool buttonPressing = false;
+    int maskPosition = 0;
+    TickType_t pressTime;
   };
 }