Add initial counter widget

4 files changed, 147 insertions, 1 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 904260ba..df4ca7f9 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -404,6 +404,7 @@ list(APPEND SOURCE_FILES
         displayapp/screens/Alarm.cpp
         displayapp/screens/Styles.cpp
         displayapp/Colors.cpp
+        displayapp/widgets/Counter.cpp
 
         ## Settings
         displayapp/screens/settings/QuickSettings.cpp
@@ -607,6 +608,7 @@ set(INCLUDE_FILES
         displayapp/screens/Timer.h
         displayapp/screens/Alarm.h
         displayapp/Colors.h
+        displayapp/widgets/Counter.h
         drivers/St7789.h
         drivers/SpiNorFlash.h
         drivers/SpiMaster.h
diff --git a/src/displayapp/fonts/fonts.json b/src/displayapp/fonts/fonts.json
index 5e911277..7a194845 100644
--- a/src/displayapp/fonts/fonts.json
+++ b/src/displayapp/fonts/fonts.json
@@ -18,7 +18,7 @@
       "sources": [
          {
             "file": "JetBrainsMono-Regular.ttf",
-            "range": "0x25, 0x30-0x3a"
+            "range": "0x25, 0x2b, 0x2d, 0x30-0x3a"
          }
       ],
       "bpp": 1,
diff --git a/src/displayapp/widgets/Counter.cpp b/src/displayapp/widgets/Counter.cpp
new file mode 100644
index 00000000..89869239
--- /dev/null
+++ b/src/displayapp/widgets/Counter.cpp
@@ -0,0 +1,105 @@
+#include "displayapp/widgets/Counter.h"
+
+using namespace Pinetime::Applications::Widgets;
+
+Counter::Counter(int min, int max) : min {min}, max {max} {
+}
+
+void Counter::upBtnEventHandler(lv_obj_t* obj, lv_event_t event) {
+  auto* widget = static_cast<Counter*>(obj->user_data);
+  if (event == LV_EVENT_SHORT_CLICKED || event == LV_EVENT_LONG_PRESSED_REPEAT) {
+    widget->Increment();
+  }
+}
+
+void Counter::downBtnEventHandler(lv_obj_t* obj, lv_event_t event) {
+  auto* widget = static_cast<Counter*>(obj->user_data);
+  if (event == LV_EVENT_SHORT_CLICKED || event == LV_EVENT_LONG_PRESSED_REPEAT) {
+    widget->Decrement();
+  }
+}
+
+void Counter::Increment() {
+  value++;
+  if (value > max) {
+    value = min;
+  }
+  UpdateLabel();
+};
+
+void Counter::Decrement() {
+  value--;
+  if (value < min) {
+    value = max;
+  }
+  UpdateLabel();
+};
+
+void Counter::SetValue(int newValue) {
+  value = newValue;
+  UpdateLabel();
+}
+
+void Counter::UpdateLabel() {
+  lv_label_set_text_fmt(number, "%.2i", value);
+}
+
+void Counter::Create() {
+  counterContainer = lv_obj_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_bg_color(counterContainer, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_MAKE(0x38, 0x38, 0x38));
+
+  number = lv_label_create(counterContainer, nullptr);
+  lv_obj_set_style_local_text_font(number, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_76);
+  lv_obj_align(number, nullptr, LV_ALIGN_CENTER, 0, 0);
+  lv_obj_set_auto_realign(number, true);
+  lv_label_set_text_static(number, "00");
+
+  static const uint8_t padding = 5;
+  const uint8_t width = lv_obj_get_width(number) + padding * 2;
+  static const uint8_t btnHeight = 50;
+  const uint8_t containerHeight = btnHeight * 2 + lv_obj_get_height(number) + padding * 2;
+
+  lv_obj_set_size(counterContainer, width, containerHeight);
+
+  UpdateLabel();
+
+  upBtn = lv_btn_create(counterContainer, nullptr);
+  lv_obj_set_style_local_bg_color(upBtn, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_MAKE(0x38, 0x38, 0x38));
+  lv_obj_set_size(upBtn, width, btnHeight);
+  lv_obj_align(upBtn, nullptr, LV_ALIGN_IN_TOP_MID, 0, 0);
+  upBtn->user_data = this;
+  lv_obj_set_event_cb(upBtn, upBtnEventHandler);
+
+  lv_obj_t* upLabel = lv_label_create(upBtn, nullptr);
+  lv_obj_set_style_local_text_font(upLabel, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_42);
+  lv_label_set_text_static(upLabel, "+");
+  lv_obj_align(upLabel, nullptr, LV_ALIGN_CENTER, 0, 0);
+
+  downBtn = lv_btn_create(counterContainer, nullptr);
+  lv_obj_set_style_local_bg_color(downBtn, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_MAKE(0x38, 0x38, 0x38));
+  lv_obj_set_size(downBtn, width, btnHeight);
+  lv_obj_align(downBtn, nullptr, LV_ALIGN_IN_BOTTOM_MID, 0, 0);
+  downBtn->user_data = this;
+  lv_obj_set_event_cb(downBtn, downBtnEventHandler);
+
+  lv_obj_t* downLabel = lv_label_create(downBtn, nullptr);
+  lv_obj_set_style_local_text_font(downLabel, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_42);
+  lv_label_set_text_static(downLabel, "-");
+  lv_obj_align(downLabel, nullptr, LV_ALIGN_CENTER, 0, 0);
+
+  static lv_point_t line_points[] = {{0, 0}, {width, 0}};
+
+  lv_obj_t* upperLine = lv_line_create(counterContainer, nullptr);
+  lv_line_set_points(upperLine, line_points, 2);
+  lv_obj_set_style_local_line_width(upperLine, LV_LINE_PART_MAIN, LV_STATE_DEFAULT, 1);
+  lv_obj_set_style_local_line_color(upperLine, LV_LINE_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_WHITE);
+  lv_obj_set_style_local_line_opa(upperLine, LV_LINE_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_20);
+  lv_obj_align(upperLine, upBtn, LV_ALIGN_OUT_BOTTOM_MID, 0, 0);
+
+  lv_obj_t* lowerLine = lv_line_create(counterContainer, nullptr);
+  lv_line_set_points(lowerLine, line_points, 2);
+  lv_obj_set_style_local_line_width(lowerLine, LV_LINE_PART_MAIN, LV_STATE_DEFAULT, 1);
+  lv_obj_set_style_local_line_color(lowerLine, LV_LINE_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_WHITE);
+  lv_obj_set_style_local_line_opa(lowerLine, LV_LINE_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_20);
+  lv_obj_align(lowerLine, downBtn, LV_ALIGN_OUT_TOP_MID, 0, -1);
+}
diff --git a/src/displayapp/widgets/Counter.h b/src/displayapp/widgets/Counter.h
new file mode 100644
index 00000000..a25635e2
--- /dev/null
+++ b/src/displayapp/widgets/Counter.h
@@ -0,0 +1,39 @@
+#pragma once
+#include <lvgl/lvgl.h>
+
+namespace Pinetime {
+  namespace Applications {
+    namespace Widgets {
+      class Counter {
+      public:
+        Counter(int min, int max);
+
+        void Create();
+        static void upBtnEventHandler(lv_obj_t* obj, lv_event_t event);
+        static void downBtnEventHandler(lv_obj_t* obj, lv_event_t event);
+        void Increment();
+        void Decrement();
+        void SetValue(int newValue);
+
+        int GetValue() const {
+          return value;
+        }
+
+        lv_obj_t* GetObject() const {
+          return counterContainer;
+        };
+
+      private:
+        void UpdateLabel();
+
+        lv_obj_t* counterContainer;
+        lv_obj_t* upBtn;
+        lv_obj_t* downBtn;
+        lv_obj_t* number;
+        int value = 0;
+        int min;
+        int max;
+      };
+    }
+  }
+}