From 04fd9781ed75f45044aa696dc52b6dc49e79e86b Mon Sep 17 00:00:00 2001
From: Matthew Colvin <Matthew.Colvin@garmin.com>
Date: Wed, 11 Oct 2023 17:13:12 -0500
Subject: [PATCH] Working on making a brightness slider that can be reused
 easily piping around IDS to correct places

---
 .../BasicRefactored/page/DisplaySettings.cpp  | 16 +++------
 .../BasicRefactored/page/DisplaySettings.hpp  |  4 +--
 .../UIs/BasicRefactored/page/SettingsPage.cpp |  4 +--
 .../widget/BrightnessSlider.cpp               | 33 +++++++++++++++++++
 .../widget/BrightnessSlider.hpp               | 21 ++++++++++++
 Platformio/OmoteUI/core/UIElementIds.hpp      |  3 ++
 Platformio/OmoteUI/core/widget/Button.cpp     |  2 +-
 Platformio/OmoteUI/core/widget/Label.cpp      |  2 +-
 Platformio/OmoteUI/core/widget/Slider.cpp     |  2 +-
 Platformio/OmoteUI/core/widget/WidgetBase.cpp |  9 ++++-
 Platformio/OmoteUI/core/widget/WidgetBase.hpp |  3 +-
 11 files changed, 79 insertions(+), 20 deletions(-)
 create mode 100644 Platformio/OmoteUI/UIs/BasicRefactored/widget/BrightnessSlider.cpp
 create mode 100644 Platformio/OmoteUI/UIs/BasicRefactored/widget/BrightnessSlider.hpp

diff --git a/Platformio/OmoteUI/UIs/BasicRefactored/page/DisplaySettings.cpp b/Platformio/OmoteUI/UIs/BasicRefactored/page/DisplaySettings.cpp
index bbb3d57..8f10dd6 100644
--- a/Platformio/OmoteUI/UIs/BasicRefactored/page/DisplaySettings.cpp
+++ b/Platformio/OmoteUI/UIs/BasicRefactored/page/DisplaySettings.cpp
@@ -1,26 +1,20 @@
+#include "BrightnessSlider.hpp"
 #include "DisplaySettings.hpp"
-#include "Slider.hpp"
 
 using namespace UI::Page;
 
 DisplaySettings::DisplaySettings(std::shared_ptr<DisplayAbstract> aDisplay)
     : Base(UI::ID::Pages::DisplaySettings), mDisplay(aDisplay),
-      mBrightnessSlider(
-          AddElement<Widget::Slider>(std::make_unique<Widget::Slider>(
-              [this](auto aNewBrightness) {
-                mDisplay->setBrightness(aNewBrightness);
-              },
-              0, 255))) {
+      mBrightnessSlider(AddElement<Widget::BrightnessSlider>(std::make_unique<Widget::BrightnessSlider>(mDisplay))) {
   SetBgColor(Color::GREY);
-  auto usableWidth = GetContentWidth();
 
-  mBrightnessSlider->SetWidth(usableWidth - (usableWidth * 0.20f));
-  mBrightnessSlider->SetHeight(lv_pct(10));
+  mBrightnessSlider->SetWidth(GetContentWidth());
+  mBrightnessSlider->SetHeight(50);
   mBrightnessSlider->AlignTo(this, LV_ALIGN_TOP_MID);
 }
 
 void DisplaySettings::OnShow() {
-  mBrightnessSlider->SetValue(mDisplay->getBrightness());
+
 };
 
 void DisplaySettings::OnHide(){
diff --git a/Platformio/OmoteUI/UIs/BasicRefactored/page/DisplaySettings.hpp b/Platformio/OmoteUI/UIs/BasicRefactored/page/DisplaySettings.hpp
index 7d73962..4467292 100644
--- a/Platformio/OmoteUI/UIs/BasicRefactored/page/DisplaySettings.hpp
+++ b/Platformio/OmoteUI/UIs/BasicRefactored/page/DisplaySettings.hpp
@@ -3,7 +3,7 @@
 #include "PageBase.hpp"
 
 namespace UI::Widget {
-class Slider;
+class BrightnessSlider;
 }
 
 namespace UI::Page {
@@ -18,6 +18,6 @@ public:
 
 private:
   std::shared_ptr<DisplayAbstract> mDisplay;
-  Widget::Slider *mBrightnessSlider;
+  Widget::BrightnessSlider *mBrightnessSlider;
 };
 } // namespace UI::Page
diff --git a/Platformio/OmoteUI/UIs/BasicRefactored/page/SettingsPage.cpp b/Platformio/OmoteUI/UIs/BasicRefactored/page/SettingsPage.cpp
index d617110..086d6a2 100644
--- a/Platformio/OmoteUI/UIs/BasicRefactored/page/SettingsPage.cpp
+++ b/Platformio/OmoteUI/UIs/BasicRefactored/page/SettingsPage.cpp
@@ -1,6 +1,7 @@
 #include "SettingsPage.hpp"
 #include "BackgroundScreen.hpp"
 #include "Button.hpp"
+#include "Slider.hpp"
 #include "Colors.hpp"
 #include "DisplaySettings.hpp"
 #include "PopUpScreen.hpp"
@@ -30,8 +31,7 @@ void SettingsPage::PushDisplaySettings() {
 }
 
 void SettingsPage::AddSlider() {
-  auto fakeSlider = std::make_unique<UI::Widget::Base>(
-      lv_slider_create(UI::Screen::BackgroundScreen::getLvInstance()));
+  auto fakeSlider = std::make_unique<Widget::Slider>([](auto data){});
   fakeSlider->SetHeight(lv_pct(10));
   fakeSlider->SetWidth(GetContentWidth());
   if (sliders.empty()) {
diff --git a/Platformio/OmoteUI/UIs/BasicRefactored/widget/BrightnessSlider.cpp b/Platformio/OmoteUI/UIs/BasicRefactored/widget/BrightnessSlider.cpp
new file mode 100644
index 0000000..72e9003
--- /dev/null
+++ b/Platformio/OmoteUI/UIs/BasicRefactored/widget/BrightnessSlider.cpp
@@ -0,0 +1,33 @@
+#include "BrightnessSlider.hpp"
+#include "Label.hpp"
+#include "Slider.hpp"
+
+using namespace UI::Widget;
+
+
+BrightnessSlider::BrightnessSlider(std::shared_ptr<DisplayAbstract> aDisplay): Base(ID::Widgets::BrightnessSlider),
+  mDisplay(aDisplay),
+  mSlider(AddElement<Widget::Slider>(std::make_unique<Slider>(
+    [this](auto aNewBrightness){
+        mDisplay->setBrightness(aNewBrightness);
+    },0,255))),
+  mLabel(AddElement<Widget::Label>(std::make_unique<Label>("Brightness")))
+{
+    mLabel->AlignTo(this,LV_ALIGN_TOP_MID);
+    mSlider->AlignTo(mLabel,LV_ALIGN_OUT_BOTTOM_MID);
+    mSlider->SetWidth(GetContentWidth() - 20);
+}
+
+void BrightnessSlider::OnShow(){
+    mSlider->SetValue(mDisplay->getBrightness());
+}
+
+void BrightnessSlider::SetHeight(lv_coord_t aHeight){
+    Base::SetHeight(aHeight);
+    auto labelHeight = GetContentHeight() * 0.25f;
+    auto sliderHeight = aHeight - labelHeight;
+    mLabel->SetHeight(labelHeight);
+    mSlider->SetHeight(sliderHeight);
+    mLabel->AlignTo(this,LV_ALIGN_TOP_MID);
+    mSlider->AlignTo(mLabel,LV_ALIGN_OUT_BOTTOM_MID);
+}
\ No newline at end of file
diff --git a/Platformio/OmoteUI/UIs/BasicRefactored/widget/BrightnessSlider.hpp b/Platformio/OmoteUI/UIs/BasicRefactored/widget/BrightnessSlider.hpp
new file mode 100644
index 0000000..46e1af2
--- /dev/null
+++ b/Platformio/OmoteUI/UIs/BasicRefactored/widget/BrightnessSlider.hpp
@@ -0,0 +1,21 @@
+#pragma once
+#include "WidgetBase.hpp"
+#include "DisplayAbstract.h"
+
+namespace UI::Widget{
+class Slider;
+class Label;
+
+class BrightnessSlider : public Base{
+public:
+    BrightnessSlider(std::shared_ptr<DisplayAbstract> aDisplay);
+
+    void OnShow() override;
+    void SetHeight(lv_coord_t aHeight) override;
+private:
+    std::shared_ptr<DisplayAbstract> mDisplay;
+    Slider* mSlider;
+    Label* mLabel;
+};
+
+}
\ No newline at end of file
diff --git a/Platformio/OmoteUI/core/UIElementIds.hpp b/Platformio/OmoteUI/core/UIElementIds.hpp
index 9edb87c..6fd8c0f 100644
--- a/Platformio/OmoteUI/core/UIElementIds.hpp
+++ b/Platformio/OmoteUI/core/UIElementIds.hpp
@@ -15,6 +15,9 @@ public:
 
   enum class Widgets {
     Slider = static_cast<int>(Screens::INVALID_SCREEN_ID) + 1,
+    Button,
+    Label,
+    BrightnessSlider,
     INVALID_WIDGET_ID
   };
 
diff --git a/Platformio/OmoteUI/core/widget/Button.cpp b/Platformio/OmoteUI/core/widget/Button.cpp
index d901d8b..9d6b811 100644
--- a/Platformio/OmoteUI/core/widget/Button.cpp
+++ b/Platformio/OmoteUI/core/widget/Button.cpp
@@ -4,7 +4,7 @@
 using namespace UI::Widget;
 
 Button::Button(std::function<void()> aOnPressHandler)
-    : Base(lv_btn_create(UI::Screen::BackgroundScreen::getLvInstance())),
+    : Base(lv_btn_create(UI::Screen::BackgroundScreen::getLvInstance()),ID::Widgets::Button),
       mOnPress(aOnPressHandler) {}
 
 void Button::OnLvglEvent(lv_event_t *anEvent) {
diff --git a/Platformio/OmoteUI/core/widget/Label.cpp b/Platformio/OmoteUI/core/widget/Label.cpp
index 15021dd..07345a4 100644
--- a/Platformio/OmoteUI/core/widget/Label.cpp
+++ b/Platformio/OmoteUI/core/widget/Label.cpp
@@ -5,6 +5,6 @@
 using namespace UI::Widget;
 
 Label::Label(std::string aText)
-    : Base(lv_label_create(UI::Screen::BackgroundScreen::getLvInstance())) {
+    : Base(lv_label_create(UI::Screen::BackgroundScreen::getLvInstance()), ID::Widgets::Label) {
   lv_label_set_text(LvglSelf(), aText.c_str());
 }
\ No newline at end of file
diff --git a/Platformio/OmoteUI/core/widget/Slider.cpp b/Platformio/OmoteUI/core/widget/Slider.cpp
index 4b341b6..b646471 100644
--- a/Platformio/OmoteUI/core/widget/Slider.cpp
+++ b/Platformio/OmoteUI/core/widget/Slider.cpp
@@ -6,7 +6,7 @@ using namespace UI::Widget;
 
 Slider::Slider(std::function<void(int32_t)> aOnSliderValueChange,
                int32_t aMinVal, int32_t aMaxVal)
-    : Base(lv_slider_create(UI::Screen::BackgroundScreen::getLvInstance())),
+    : Base(lv_slider_create(UI::Screen::BackgroundScreen::getLvInstance()),ID::Widgets::Slider),
       mOnSliderChange(std::move(aOnSliderValueChange)) {
   auto lock = LvglResourceManager::GetInstance().scopeLock();
   lv_slider_set_range(LvglSelf(), aMinVal, aMaxVal);
diff --git a/Platformio/OmoteUI/core/widget/WidgetBase.cpp b/Platformio/OmoteUI/core/widget/WidgetBase.cpp
index 4a69ed4..b4f8c58 100644
--- a/Platformio/OmoteUI/core/widget/WidgetBase.cpp
+++ b/Platformio/OmoteUI/core/widget/WidgetBase.cpp
@@ -1,8 +1,15 @@
 #include "WidgetBase.hpp"
+#include "BackgroundScreen.hpp"
 
+using namespace UI;
 using namespace UI::Widget;
 
-Base::Base(lv_obj_t *aLvglSelf) : UIElement(aLvglSelf) {
+Base::Base(ID anId): UIElement(lv_obj_create(Screen::BackgroundScreen::getLvInstance()),anId){
+  SetWidth(lv_pct(100));
+  SetHeight(lv_pct(100));
+}
+
+Base::Base(lv_obj_t *aLvglSelf, ID anId) : UIElement(aLvglSelf,anId) {
   SetWidth(lv_pct(100));
   SetHeight(lv_pct(100));
 }
diff --git a/Platformio/OmoteUI/core/widget/WidgetBase.hpp b/Platformio/OmoteUI/core/widget/WidgetBase.hpp
index 6b25d19..3ba1ab5 100644
--- a/Platformio/OmoteUI/core/widget/WidgetBase.hpp
+++ b/Platformio/OmoteUI/core/widget/WidgetBase.hpp
@@ -19,7 +19,8 @@ class Base : public UIElement {
 public:
   typedef std::unique_ptr<Base> Ptr;
 
-  Base(lv_obj_t *aLvglSelf);
+  Base(ID anId);
+  Base(lv_obj_t *aLvglSelf, ID anId);
   virtual ~Base() override = default;
 
 protected: