Merge branch 'develop' of JF/PineTime into master

1 files changed, 42 insertions, 0 deletions

diff --git a/src/displayapp/screens/Timer.h b/src/displayapp/screens/Timer.h
new file mode 100644
index 0000000..0d66f2d
--- /dev/null
+++ b/src/displayapp/screens/Timer.h
@@ -0,0 +1,42 @@
+#pragma once
+
+#include "Screen.h"
+#include "components/datetime/DateTimeController.h"
+#include "systemtask/SystemTask.h"
+#include "../LittleVgl.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;
+    
+    bool Refresh() override;
+    
+    void setDone();
+    
+    void OnButtonEvent(lv_obj_t* obj, lv_event_t event);
+  
+  private:
+    
+    bool running;
+    uint8_t secondsToSet = 0;
+    uint8_t minutesToSet = 0;
+    Controllers::TimerController& timerController;
+    
+    void createButtons();
+    
+    lv_obj_t* time, * msecTime, * btnPlayPause, * txtPlayPause, * btnMinutesUp, * btnMinutesDown, * btnSecondsUp, * btnSecondsDown, * txtMUp,
+        * txtMDown, * txtSUp, * txtSDown;
+  };
+}
\ No newline at end of file