From 68e8c9ea4a21a6f0252fe13f34fcf721f5f20642 Mon Sep 17 00:00:00 2001
From: 0xFEEDC0DE64 <daniel@brunner.ninja>
Date: Wed, 29 Dec 2021 22:54:44 +0100
Subject: [PATCH] Added string inputs for ap ssid and key

---
 components/esp-gui-lib                     |  2 +-
 main/accessors/wifiapconfigaccessors.h     |  2 +-
 main/displays/menus/wifiapsettingsmenu.cpp | 21 +++++++++++++++++++--
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/components/esp-gui-lib b/components/esp-gui-lib
index ec002d6..c593315 160000
--- a/components/esp-gui-lib
+++ b/components/esp-gui-lib
@@ -1 +1 @@
-Subproject commit ec002d60587626080f593b8551bfef582d9308f5
+Subproject commit c5933152e1b34e0c33e2db4a8b255f3306fe03fa
diff --git a/main/accessors/wifiapconfigaccessors.h b/main/accessors/wifiapconfigaccessors.h
index 607ae1c..c7d8b2c 100644
--- a/main/accessors/wifiapconfigaccessors.h
+++ b/main/accessors/wifiapconfigaccessors.h
@@ -6,7 +6,7 @@
 
 struct WifiApEnabledAccessor : public NewSettingsAccessor<bool> { ConfigWrapper<bool> &getConfig() const override { return configs.wifiApEnabled; } };
 //struct WifiApDisableWhenOnlineAccessor : public NewSettingsAccessor<bool> { ConfigWrapper<bool> &getConfig() const override { return configs.wifiDisableApWhenOnline; } };
-struct WifiApNameAccessor : public NewSettingsAccessor<std::string> { ConfigWrapper<std::string> &getConfig() const override { return configs.wifiApName; } };
+struct WifiApSsidAccessor : public NewSettingsAccessor<std::string> { ConfigWrapper<std::string> &getConfig() const override { return configs.wifiApName; } };
 struct WifiApKeyAccessor : public NewSettingsAccessor<std::string> { ConfigWrapper<std::string> &getConfig() const override { return configs.wifiApKey; } };
 struct WifiApIpAccessor : public NewSettingsAccessor<wifi_stack::ip_address_t> { ConfigWrapper<wifi_stack::ip_address_t> &getConfig() const override { return configs.wifiApIp; } };
 struct WifiApMaskAccessor : public NewSettingsAccessor<wifi_stack::ip_address_t> { ConfigWrapper<wifi_stack::ip_address_t> &getConfig() const override { return configs.wifiApMask; } };
diff --git a/main/displays/menus/wifiapsettingsmenu.cpp b/main/displays/menus/wifiapsettingsmenu.cpp
index ecf91ff..1d7c1b0 100644
--- a/main/displays/menus/wifiapsettingsmenu.cpp
+++ b/main/displays/menus/wifiapsettingsmenu.cpp
@@ -17,6 +17,7 @@
 // local includes
 #include "displays/bobbychangevaluedisplay.h"
 #include "changevaluedisplay.h"
+#include "changevaluedisplay_string.h"
 #include "changevaluedisplay_wifi_auth_mode_t.h"
 #include "wifiapclientsmenu.h"
 #include "networksettingsmenu.h"
@@ -51,6 +52,22 @@ public:
     void triggered() override;
 };
 
+using ApSsidChangeScreen = espgui::makeComponent<
+    BobbyChangeValueDisplay<std::string>,
+    espgui::StaticText<TEXT_SSID>,
+    WifiApSsidAccessor,
+    espgui::ConfirmActionInterface<espgui::SwitchScreenAction<WifiApSettingsMenu>>,
+    espgui::BackActionInterface<espgui::SwitchScreenAction<WifiApSettingsMenu>>
+>;
+
+using ApKeyChangeScreen = espgui::makeComponent<
+    BobbyChangeValueDisplay<std::string>,
+    espgui::StaticText<TEXT_KEY>,
+    WifiApKeyAccessor,
+    espgui::ConfirmActionInterface<espgui::SwitchScreenAction<WifiApSettingsMenu>>,
+    espgui::BackActionInterface<espgui::SwitchScreenAction<WifiApSettingsMenu>>
+>;
+
 using ApChannelChangeScreen = espgui::makeComponent<
     BobbyChangeValueDisplay<uint8_t>,
     espgui::StaticText<TEXT_CHANNEL>,
@@ -72,8 +89,8 @@ WifiApSettingsMenu::WifiApSettingsMenu()
 {
     constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_ENABLED>,            ToggleBoolAction, CheckboxIcon, WifiApEnabledAccessor>>();
     //constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_DISABLEWHENONLINE>,  ToggleBoolAction, CheckboxIcon, WifiApDisableWhenOnlineAccessor>>();
-    constructMenuItem<makeComponent<MenuItem, TextWithValueHelper<TEXT_SSID_FORMATTED, WifiApNameAccessor>, DummyAction>>();
-    constructMenuItem<makeComponent<MenuItem, TextWithValueHelper<TEXT_KEY_FORMATTED, WifiApKeyAccessor>, DummyAction>>();
+    constructMenuItem<makeComponent<MenuItem, TextWithValueHelper<TEXT_SSID_FORMATTED, WifiApSsidAccessor>, SwitchScreenAction<ApSsidChangeScreen>>>();
+    constructMenuItem<makeComponent<MenuItem, TextWithValueHelper<TEXT_KEY_FORMATTED, WifiApKeyAccessor>, SwitchScreenAction<ApKeyChangeScreen>>>();
     constructMenuItem<makeComponent<MenuItem, WifiApMacText,                       DummyAction>>();
     constructMenuItem<makeComponent<MenuItem, TextWithValueHelper<TEXT_IP_FORMATTED, WifiApIpAccessor>, DummyAction>>();
     constructMenuItem<makeComponent<MenuItem, TextWithValueHelper<TEXT_MASK_FORMATTED, WifiApMaskAccessor>, DummyAction>>();