some more widgets

Signed-off-by: Peter Siegmund <developer@mars3142.org>

components/justus/include/common/Common.h

@@ -0,0 +1,7 @@
+#pragma once
+
+#include <functional>
+
+enum class ButtonType { NONE, UP, DOWN, LEFT, RIGHT, SELECT, BACK };
+
+typedef std::function<void(uint8_t, ButtonType)> ButtonCallback;

components/justus/include/common/PSMenu.h

@@ -2,39 +2,40 @@
 
 #include <functional>
 
+#include "Common.h"
 #include "MenuOptions.h"
 #include "Widget.h"
 #include "data/MenuItem.h"
 
-typedef std::function<void(uint8_t)> MenuCallback;
-
 class PSMenu : public Widget
 {
-  public:
+public:
     explicit PSMenu(menu_options_t *options);
     ~PSMenu() override;
 
+    void addText(uint8_t id, const std::string &text, const ButtonCallback &callback);
+    void addSelection(uint8_t id, const std::string &text, std::string &value, const std::vector<std::string>& values,
+                      const ButtonCallback &callback);
+    void addNumber(uint8_t id, const std::string &text, std::string &value, const ButtonCallback &callback);
+    void addToggle(uint8_t id, const std::string &text, bool selected, const ButtonCallback &callback);
+
+private:
     void render() override;
     void onButtonClicked(uint8_t button) override;
 
-    void addText(const std::string &text, const MenuCallback &callback);
-    void addSwitch(const std::string &text, std::string &value, const MenuCallback &callback);
-    void addNumber(const std::string &text, std::string &value, const MenuCallback &callback);
-
-  private:
     void onPressedDown();
     void onPressedUp();
-    void onPressedLeft();
-    void onPressedRight();
+    void onPressedLeft() const;
+    void onPressedRight() const;
     void onPressedSelect() const;
     void onPressedBack() const;
 
     void drawScrollBar() const;
     void drawSelectionBox() const;
 
-    void renderWidget(uint8_t type, const uint8_t *font, int x, int y, const char *text) const;
+    void renderWidget(const MenuItem *item, const uint8_t *font, int x, int y) const;
 
     size_t m_selected_item = 0;
     std::vector<MenuItem> m_items;
     menu_options_t *m_options;
-};
+};

components/justus/include/common/Widget.h

@@ -6,7 +6,7 @@
 
 class Widget
 {
-  public:
+public:
     explicit Widget(u8g2_t *u8g2);
 
     virtual ~Widget() = default;
@@ -17,6 +17,6 @@ class Widget
 
     virtual void onButtonClicked(uint8_t button);
 
-  protected:
+protected:
     u8g2_t *u8g2;
-};
+};

components/justus/include/data/MenuItem.h

@@ -1,24 +1,31 @@
 #pragma once
 
-#include <cstdint>
 #include <functional>
 #include <string>
 
+#include "common/Common.h"
+
 class MenuItem
 {
-  public:
-    MenuItem(uint8_t type, std::string text, std::function<void(uint8_t)> callback);
-    MenuItem(uint8_t type, std::string text, std::string value, std::function<void(uint8_t)> callback);
+public:
+    MenuItem(uint8_t id, uint8_t type, std::string text, ButtonCallback callback);
+    MenuItem(uint8_t id, uint8_t type, std::string text, std::string value, ButtonCallback callback);
+    MenuItem(uint8_t id, uint8_t type, std::string text, std::string value, std::vector<std::string> values,
+             ButtonCallback callback);
+    MenuItem(uint8_t id, uint8_t type, std::string text, bool selected, ButtonCallback callback);
+    [[nodiscard]] uint8_t getId() const;
     [[nodiscard]] uint8_t getType() const;
     [[nodiscard]] const std::string &getText() const;
     [[nodiscard]] const std::string &getValue() const;
     void setValue(const std::string &value);
-    void callback(uint8_t id) const;
+    void onButtonPressed(uint8_t id, ButtonType button) const;
     [[nodiscard]] bool hasCallback() const;
 
-  private:
+private:
+    uint8_t m_id;
     uint8_t m_type;
     std::string m_text;
     std::string m_value;
-    std::function<void(uint8_t)> m_callback;
-};
+    std::vector<std::string> m_values;
+    ButtonCallback m_callback;
+};

components/justus/include/ui/LightMenu.h

@@ -2,8 +2,13 @@
 
 #include "common/PSMenu.h"
 
-class LightMenu : public PSMenu
+class LightMenu final : public PSMenu
 {
   public:
     explicit LightMenu(menu_options_t *options);
+
+private:
+    void onButtonPressed(uint8_t id, ButtonType button) const;
+
+    menu_options_t *m_options;
 };

components/justus/include/ui/MainMenu.h

@@ -4,11 +4,11 @@
 
 class MainMenu final : public PSMenu
 {
-  public:
+public:
     explicit MainMenu(menu_options_t *options);
 
-  private:
-    void onSelect(uint8_t id) const;
+private:
+    void onButtonPressed(uint8_t id, ButtonType button) const;
 
     menu_options_t *m_options;
-};
+};

components/justus/include/ui/SettingsMenu.h

@@ -2,7 +2,7 @@
 
 #include "common/PSMenu.h"
 
-class SettingsMenu : public PSMenu
+class SettingsMenu final : public PSMenu
 {
   public:
     explicit SettingsMenu(menu_options_t *options);