3 files changed, 135 insertions, 1 deletions

diff --git a/src/displayapp/screens/settings/SettingSteps.cpp b/src/displayapp/screens/settings/SettingSteps.cpp
new file mode 100644
index 00000000..8bd94fc6
--- /dev/null
+++ b/src/displayapp/screens/settings/SettingSteps.cpp
@@ -0,0 +1,102 @@
+#include "SettingSteps.h"
+#include <lvgl/lvgl.h>
+#include "displayapp/DisplayApp.h"
+#include "displayapp/screens/Symbols.h"
+
+using namespace Pinetime::Applications::Screens;
+
+namespace {
+  static void event_handler(lv_obj_t * obj, lv_event_t event) {
+    SettingSteps* screen = static_cast<SettingSteps *>(obj->user_data);
+    screen->UpdateSelected(obj, event);
+  }
+}
+
+SettingSteps::SettingSteps(
+  Pinetime::Applications::DisplayApp *app, Pinetime::Controllers::Settings &settingsController) :
+  Screen(app),
+  settingsController{settingsController}
+{
+
+  lv_obj_t * container1 = lv_cont_create(lv_scr_act(), nullptr);
+
+  //lv_obj_set_style_local_bg_color(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x111111));
+  lv_obj_set_style_local_bg_opa(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_TRANSP);
+  lv_obj_set_style_local_pad_all(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, 10);
+  lv_obj_set_style_local_pad_inner(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, 5);
+  lv_obj_set_style_local_border_width(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, 0);
+  lv_obj_set_pos(container1, 30, 60);
+  lv_obj_set_width(container1, LV_HOR_RES - 50);
+  lv_obj_set_height(container1, LV_VER_RES - 60);
+  //lv_obj_set_auto_realign(container1, true);                  
+  //lv_obj_align_origo(container1, NULL, LV_ALIGN_CENTER, 0, 0);
+  //lv_cont_set_fit(container1, LV_FIT_MAX);
+  lv_cont_set_layout(container1, LV_LAYOUT_COLUMN_LEFT);
+
+  lv_obj_t * title = lv_label_create(lv_scr_act(), NULL);  
+  lv_label_set_text_static(title,"Daily steps goal");
+  lv_label_set_align(title, LV_LABEL_ALIGN_CENTER);
+  lv_obj_align(title, lv_scr_act(), LV_ALIGN_IN_TOP_MID, 15, 15);
+
+  lv_obj_t * icon = lv_label_create(lv_scr_act(), NULL);
+  lv_obj_set_style_local_text_color(icon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_ORANGE);
+  
+  lv_label_set_text_static(icon, Symbols::shoe);
+  lv_label_set_align(icon, LV_LABEL_ALIGN_CENTER);
+  lv_obj_align(icon, title, LV_ALIGN_OUT_LEFT_MID, -10, 0);
+
+
+  stepValue = lv_label_create(lv_scr_act(), NULL);
+  lv_obj_set_style_local_text_font(stepValue, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_42);
+  lv_label_set_text_fmt(stepValue,"%i", settingsController.GetStepsGoal());
+  lv_label_set_align(stepValue, LV_LABEL_ALIGN_CENTER);
+  lv_obj_align(stepValue, lv_scr_act(), LV_ALIGN_CENTER, 0, 0);
+
+  btnPlus = lv_btn_create(lv_scr_act(), NULL);
+  btnPlus->user_data = this;
+  lv_obj_set_size(btnPlus, 60, 40);
+  lv_obj_align(btnPlus, lv_scr_act(), LV_ALIGN_CENTER, 50, 80);
+  lv_obj_set_style_local_value_str(btnPlus, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, "+");
+  lv_obj_set_event_cb(btnPlus, event_handler);
+
+  btnMinus = lv_btn_create(lv_scr_act(), NULL);
+  btnMinus->user_data = this;
+  lv_obj_set_size(btnMinus, 60, 40);
+  lv_obj_set_event_cb(btnMinus, event_handler);
+  lv_obj_align(btnMinus, lv_scr_act(), LV_ALIGN_CENTER, -50, 80);
+  lv_obj_set_style_local_value_str(btnMinus, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, "-");
+
+
+}
+
+SettingSteps::~SettingSteps() {
+  lv_obj_clean(lv_scr_act());
+  settingsController.SaveSettings();
+}
+
+bool SettingSteps::Refresh() {
+  return running;
+}
+
+
+void SettingSteps::UpdateSelected(lv_obj_t *object, lv_event_t event) {
+  uint32_t value = settingsController.GetStepsGoal();
+  if(object == btnPlus && (event == LV_EVENT_PRESSED)) {
+    value += 1000;
+    if ( value <= 500000 ) {
+      settingsController.SetStepsGoal(value);
+      lv_label_set_text_fmt(stepValue,"%i", settingsController.GetStepsGoal());
+      lv_obj_align(stepValue, lv_scr_act(), LV_ALIGN_CENTER, 0, 0);
+    }
+  }
+
+  if(object == btnMinus && (event == LV_EVENT_PRESSED)) {
+    value -= 1000;
+    if ( value >= 1000 ) {
+      settingsController.SetStepsGoal(value);
+      lv_label_set_text_fmt(stepValue,"%i", settingsController.GetStepsGoal());
+      lv_obj_align(stepValue, lv_scr_act(), LV_ALIGN_CENTER, 0, 0);
+    }
+  }
+
+}
\ No newline at end of file
diff --git a/src/displayapp/screens/settings/SettingSteps.h b/src/displayapp/screens/settings/SettingSteps.h
new file mode 100644
index 00000000..0a4c2056
--- /dev/null
+++ b/src/displayapp/screens/settings/SettingSteps.h
@@ -0,0 +1,32 @@
+#pragma once
+
+#include <cstdint>
+#include <lvgl/lvgl.h>
+#include "components/settings/Settings.h"
+#include "displayapp/screens/Screen.h"
+
+namespace Pinetime {
+
+  namespace Applications {
+    namespace Screens {
+
+      class SettingSteps : public Screen{
+        public:
+          SettingSteps(DisplayApp* app, Pinetime::Controllers::Settings &settingsController);
+          ~SettingSteps() override;
+
+          bool Refresh() override;
+          void UpdateSelected(lv_obj_t *object, lv_event_t event);
+         
+        private:          
+
+          Controllers::Settings& settingsController;
+
+          lv_obj_t * stepValue;
+          lv_obj_t * btnPlus;
+          lv_obj_t * btnMinus;
+          
+      };
+    }
+  }
+}
diff --git a/src/displayapp/screens/settings/Settings.cpp b/src/displayapp/screens/settings/Settings.cpp
index b2825915..06776525 100644
--- a/src/displayapp/screens/settings/Settings.cpp
+++ b/src/displayapp/screens/settings/Settings.cpp
@@ -57,10 +57,10 @@ std::unique_ptr<Screen> Settings::CreateScreen2() {
 
   std::array<Screens::List::Applications, 4> applications {
           {
+            {Symbols::shoe,         "Steps",     Apps::SettingSteps},
             {Symbols::batteryHalf,  "Battery",   Apps::BatteryInfo},
             {Symbols::check,        "Firmware",  Apps::FirmwareValidation},
             {Symbols::list,         "About",     Apps::SysInfo},
-            {"",   "",     Apps::None},
           }
 
   };