diff --git a/src/activities/network/CrossPointWebServerActivity.cpp b/src/activities/network/CrossPointWebServerActivity.cpp index f5b6f8b..b9c911e 100644 --- a/src/activities/network/CrossPointWebServerActivity.cpp +++ b/src/activities/network/CrossPointWebServerActivity.cpp @@ -1,10 +1,10 @@ #include "CrossPointWebServerActivity.h" #include +#include #include #include #include -#include #include "NetworkModeSelectionActivity.h" #include "WifiSelectionActivity.h" @@ -54,10 +54,9 @@ void CrossPointWebServerActivity::onEnter() { // Launch network mode selection subactivity Serial.printf("[%lu] [WEBACT] Launching NetworkModeSelectionActivity...\n", millis()); enterNewActivity(new NetworkModeSelectionActivity( - renderer, inputManager, - [this](const NetworkMode mode) { onNetworkModeSelected(mode); }, + renderer, inputManager, [this](const NetworkMode mode) { onNetworkModeSelected(mode); }, [this]() { onGoBack(); } // Cancel goes back to home - )); + )); } void CrossPointWebServerActivity::onExit() { @@ -172,10 +171,8 @@ void CrossPointWebServerActivity::onWifiSelectionComplete(const bool connected) exitActivity(); state = WebServerActivityState::MODE_SELECTION; enterNewActivity(new NetworkModeSelectionActivity( - renderer, inputManager, - [this](const NetworkMode mode) { onNetworkModeSelected(mode); }, - [this]() { onGoBack(); } - )); + renderer, inputManager, [this](const NetworkMode mode) { onNetworkModeSelected(mode); }, + [this]() { onGoBack(); })); } } @@ -356,8 +353,8 @@ void CrossPointWebServerActivity::renderServerRunning() const { std::string ssidInfo = "Network: " + connectedSSID; renderer.drawCenteredText(UI_FONT_ID, startY + LINE_SPACING, ssidInfo.c_str(), true, REGULAR); - renderer.drawCenteredText(SMALL_FONT_ID, startY + LINE_SPACING * 2, "Connect your device to this WiFi network", true, - REGULAR); + renderer.drawCenteredText(SMALL_FONT_ID, startY + LINE_SPACING * 2, "Connect your device to this WiFi network", + true, REGULAR); // Show primary URL (hostname) std::string hostnameUrl = std::string("http://") + AP_HOSTNAME + ".local/"; diff --git a/src/activities/network/CrossPointWebServerActivity.h b/src/activities/network/CrossPointWebServerActivity.h index 70834e6..038a0c4 100644 --- a/src/activities/network/CrossPointWebServerActivity.h +++ b/src/activities/network/CrossPointWebServerActivity.h @@ -7,17 +7,17 @@ #include #include +#include "NetworkModeSelectionActivity.h" #include "activities/ActivityWithSubactivity.h" #include "network/CrossPointWebServer.h" -#include "NetworkModeSelectionActivity.h" // Web server activity states enum class WebServerActivityState { - MODE_SELECTION, // Choosing between Join Network and Create Hotspot - WIFI_SELECTION, // WiFi selection subactivity is active (for Join Network mode) - AP_STARTING, // Starting Access Point mode - SERVER_RUNNING, // Web server is running and handling requests - SHUTTING_DOWN // Shutting down server and WiFi + MODE_SELECTION, // Choosing between Join Network and Create Hotspot + WIFI_SELECTION, // WiFi selection subactivity is active (for Join Network mode) + AP_STARTING, // Starting Access Point mode + SERVER_RUNNING, // Web server is running and handling requests + SHUTTING_DOWN // Shutting down server and WiFi }; /** diff --git a/src/activities/network/NetworkModeSelectionActivity.cpp b/src/activities/network/NetworkModeSelectionActivity.cpp index 3c4c77c..637d82d 100644 --- a/src/activities/network/NetworkModeSelectionActivity.cpp +++ b/src/activities/network/NetworkModeSelectionActivity.cpp @@ -9,7 +9,7 @@ namespace { constexpr int MENU_ITEM_COUNT = 2; const char* MENU_ITEMS[MENU_ITEM_COUNT] = {"Join a Network", "Create Hotspot"}; const char* MENU_DESCRIPTIONS[MENU_ITEM_COUNT] = {"Connect to an existing WiFi network", - "Create a WiFi network others can join"}; + "Create a WiFi network others can join"}; } // namespace void NetworkModeSelectionActivity::taskTrampoline(void* param) { diff --git a/src/activities/network/NetworkModeSelectionActivity.h b/src/activities/network/NetworkModeSelectionActivity.h index e81415d..90f4282 100644 --- a/src/activities/network/NetworkModeSelectionActivity.h +++ b/src/activities/network/NetworkModeSelectionActivity.h @@ -34,9 +34,7 @@ class NetworkModeSelectionActivity final : public Activity { explicit NetworkModeSelectionActivity(GfxRenderer& renderer, InputManager& inputManager, const std::function& onModeSelected, const std::function& onCancel) - : Activity("NetworkModeSelection", renderer, inputManager), - onModeSelected(onModeSelected), - onCancel(onCancel) {} + : Activity("NetworkModeSelection", renderer, inputManager), onModeSelected(onModeSelected), onCancel(onCancel) {} void onEnter() override; void onExit() override; void loop() override;