Subscreen instead of conditional visibility

src/activities/settings/KOReaderSettingsActivity.cpp

@@ -0,0 +1,179 @@
+#include "KOReaderSettingsActivity.h"
+
+#include <GfxRenderer.h>
+#include <cstring>
+
+#include "KOReaderAuthActivity.h"
+#include "KOReaderCredentialStore.h"
+#include "MappedInputManager.h"
+#include "activities/util/KeyboardEntryActivity.h"
+#include "fontIds.h"
+
+namespace {
+constexpr int MENU_ITEMS = 3;
+const char* menuNames[MENU_ITEMS] = {"Username", "Password", "Authenticate"};
+}  // namespace
+
+void KOReaderSettingsActivity::taskTrampoline(void* param) {
+  auto* self = static_cast<KOReaderSettingsActivity*>(param);
+  self->displayTaskLoop();
+}
+
+void KOReaderSettingsActivity::onEnter() {
+  ActivityWithSubactivity::onEnter();
+
+  renderingMutex = xSemaphoreCreateMutex();
+  selectedIndex = 0;
+  updateRequired = true;
+
+  xTaskCreate(&KOReaderSettingsActivity::taskTrampoline, "KOReaderSettingsTask",
+              4096,               // Stack size
+              this,               // Parameters
+              1,                  // Priority
+              &displayTaskHandle  // Task handle
+  );
+}
+
+void KOReaderSettingsActivity::onExit() {
+  ActivityWithSubactivity::onExit();
+
+  xSemaphoreTake(renderingMutex, portMAX_DELAY);
+  if (displayTaskHandle) {
+    vTaskDelete(displayTaskHandle);
+    displayTaskHandle = nullptr;
+  }
+  vSemaphoreDelete(renderingMutex);
+  renderingMutex = nullptr;
+}
+
+void KOReaderSettingsActivity::loop() {
+  if (subActivity) {
+    subActivity->loop();
+    return;
+  }
+
+  if (mappedInput.wasPressed(MappedInputManager::Button::Back)) {
+    onBack();
+    return;
+  }
+
+  if (mappedInput.wasPressed(MappedInputManager::Button::Confirm)) {
+    handleSelection();
+    return;
+  }
+
+  if (mappedInput.wasPressed(MappedInputManager::Button::Up) ||
+      mappedInput.wasPressed(MappedInputManager::Button::Left)) {
+    selectedIndex = (selectedIndex + MENU_ITEMS - 1) % MENU_ITEMS;
+    updateRequired = true;
+  } else if (mappedInput.wasPressed(MappedInputManager::Button::Down) ||
+             mappedInput.wasPressed(MappedInputManager::Button::Right)) {
+    selectedIndex = (selectedIndex + 1) % MENU_ITEMS;
+    updateRequired = true;
+  }
+}
+
+void KOReaderSettingsActivity::handleSelection() {
+  xSemaphoreTake(renderingMutex, portMAX_DELAY);
+
+  if (selectedIndex == 0) {
+    // Username
+    exitActivity();
+    enterNewActivity(new KeyboardEntryActivity(
+        renderer, mappedInput, "KOReader Username", KOREADER_STORE.getUsername(), 10,
+        64,     // maxLength
+        false,  // not password
+        [this](const std::string& username) {
+          KOREADER_STORE.setCredentials(username, KOREADER_STORE.getPassword());
+          KOREADER_STORE.saveToFile();
+          exitActivity();
+          updateRequired = true;
+        },
+        [this]() {
+          exitActivity();
+          updateRequired = true;
+        }));
+  } else if (selectedIndex == 1) {
+    // Password
+    exitActivity();
+    enterNewActivity(new KeyboardEntryActivity(
+        renderer, mappedInput, "KOReader Password", KOREADER_STORE.getPassword(), 10,
+        64,     // maxLength
+        false,  // show characters
+        [this](const std::string& password) {
+          KOREADER_STORE.setCredentials(KOREADER_STORE.getUsername(), password);
+          KOREADER_STORE.saveToFile();
+          exitActivity();
+          updateRequired = true;
+        },
+        [this]() {
+          exitActivity();
+          updateRequired = true;
+        }));
+  } else if (selectedIndex == 2) {
+    // Authenticate
+    if (!KOREADER_STORE.hasCredentials()) {
+      // Can't authenticate without credentials - just show message briefly
+      xSemaphoreGive(renderingMutex);
+      return;
+    }
+    exitActivity();
+    enterNewActivity(new KOReaderAuthActivity(renderer, mappedInput, [this] {
+      exitActivity();
+      updateRequired = true;
+    }));
+  }
+
+  xSemaphoreGive(renderingMutex);
+}
+
+void KOReaderSettingsActivity::displayTaskLoop() {
+  while (true) {
+    if (updateRequired && !subActivity) {
+      updateRequired = false;
+      xSemaphoreTake(renderingMutex, portMAX_DELAY);
+      render();
+      xSemaphoreGive(renderingMutex);
+    }
+    vTaskDelay(10 / portTICK_PERIOD_MS);
+  }
+}
+
+void KOReaderSettingsActivity::render() {
+  renderer.clearScreen();
+
+  const auto pageWidth = renderer.getScreenWidth();
+
+  // Draw header
+  renderer.drawCenteredText(UI_12_FONT_ID, 15, "KOReader Sync", true, EpdFontFamily::BOLD);
+
+  // Draw selection highlight
+  renderer.fillRect(0, 60 + selectedIndex * 30 - 2, pageWidth - 1, 30);
+
+  // Draw menu items
+  for (int i = 0; i < MENU_ITEMS; i++) {
+    const int settingY = 60 + i * 30;
+    const bool isSelected = (i == selectedIndex);
+
+    renderer.drawText(UI_10_FONT_ID, 20, settingY, menuNames[i], !isSelected);
+
+    // Draw status for username/password
+    const char* status = "";
+    if (i == 0) {
+      status = KOREADER_STORE.getUsername().empty() ? "[Not Set]" : "[Set]";
+    } else if (i == 1) {
+      status = KOREADER_STORE.getPassword().empty() ? "[Not Set]" : "[Set]";
+    } else if (i == 2) {
+      status = KOREADER_STORE.hasCredentials() ? "" : "[Set credentials first]";
+    }
+
+    const auto width = renderer.getTextWidth(UI_10_FONT_ID, status);
+    renderer.drawText(UI_10_FONT_ID, pageWidth - 20 - width, settingY, status, !isSelected);
+  }
+
+  // Draw button hints
+  const auto labels = mappedInput.mapLabels("« Back", "Select", "", "");
+  renderer.drawButtonHints(UI_10_FONT_ID, labels.btn1, labels.btn2, labels.btn3, labels.btn4);
+
+  renderer.displayBuffer();
+}

src/activities/settings/KOReaderSettingsActivity.h

@@ -0,0 +1,36 @@
+#pragma once
+#include <freertos/FreeRTOS.h>
+#include <freertos/semphr.h>
+#include <freertos/task.h>
+
+#include <functional>
+
+#include "activities/ActivityWithSubactivity.h"
+
+/**
+ * Submenu for KOReader Sync settings.
+ * Shows username, password, and authenticate options.
+ */
+class KOReaderSettingsActivity final : public ActivityWithSubactivity {
+ public:
+  explicit KOReaderSettingsActivity(GfxRenderer& renderer, MappedInputManager& mappedInput,
+                                    const std::function<void()>& onBack)
+      : ActivityWithSubactivity("KOReaderSettings", renderer, mappedInput), onBack(onBack) {}
+
+  void onEnter() override;
+  void onExit() override;
+  void loop() override;
+
+ private:
+  TaskHandle_t displayTaskHandle = nullptr;
+  SemaphoreHandle_t renderingMutex = nullptr;
+  bool updateRequired = false;
+
+  int selectedIndex = 0;
+  const std::function<void()> onBack;
+
+  static void taskTrampoline(void* param);
+  [[noreturn]] void displayTaskLoop();
+  void render();
+  void handleSelection();
+};

src/activities/settings/SettingsActivity.cpp

@@ -1,18 +1,17 @@
 #include "SettingsActivity.h"
 
 #include <GfxRenderer.h>
+#include <cstring>
 
 #include "CrossPointSettings.h"
-#include "KOReaderAuthActivity.h"
-#include "KOReaderCredentialStore.h"
+#include "KOReaderSettingsActivity.h"
 #include "MappedInputManager.h"
 #include "OtaUpdateActivity.h"
-#include "activities/util/KeyboardEntryActivity.h"
 #include "fontIds.h"
 
 // Define the static settings list
 namespace {
-constexpr int settingsCount = 18;
+constexpr int settingsCount = 15;
 const SettingInfo settingsList[settingsCount] = {
     // Should match with SLEEP_SCREEN_MODE
     {"Sleep Screen", SettingType::ENUM, &CrossPointSettings::sleepScreen, {"Dark", "Light", "Custom", "Cover"}},
@@ -49,56 +48,9 @@ const SettingInfo settingsList[settingsCount] = {
      SettingType::ENUM,
      &CrossPointSettings::refreshFrequency,
      {"1 page", "5 pages", "10 pages", "15 pages", "30 pages"}},
-    {"KOReader Username", SettingType::ACTION, nullptr, {}},
-    {"KOReader Password", SettingType::ACTION, nullptr, {}},
-    {"Authenticate KOReader", SettingType::ACTION, nullptr, {}},
+    {"KOReader Sync", SettingType::ACTION, nullptr, {}},
     {"Check for updates", SettingType::ACTION, nullptr, {}},
 };
-
-// Check if a setting should be visible
-bool isSettingVisible(int index) {
-  // Hide "Authenticate KOReader" if credentials are not set
-  if (std::string(settingsList[index].name) == "Authenticate KOReader") {
-    return KOREADER_STORE.hasCredentials();
-  }
-  return true;
-}
-
-// Get visible settings count
-int getVisibleSettingsCount() {
-  int count = 0;
-  for (int i = 0; i < settingsCount; i++) {
-    if (isSettingVisible(i)) {
-      count++;
-    }
-  }
-  return count;
-}
-
-// Convert visible index to actual settings index
-int visibleToActualIndex(int visibleIndex) {
-  int count = 0;
-  for (int i = 0; i < settingsCount; i++) {
-    if (isSettingVisible(i)) {
-      if (count == visibleIndex) {
-        return i;
-      }
-      count++;
-    }
-  }
-  return -1;
-}
-
-// Convert actual index to visible index
-int actualToVisibleIndex(int actualIndex) {
-  int count = 0;
-  for (int i = 0; i < actualIndex; i++) {
-    if (isSettingVisible(i)) {
-      count++;
-    }
-  }
-  return count;
-}
 }  // namespace
 
 void SettingsActivity::taskTrampoline(void* param) {
@@ -157,17 +109,16 @@ void SettingsActivity::loop() {
     return;
   }
 
-  // Handle navigation (using visible settings count)
-  const int visibleCount = getVisibleSettingsCount();
+  // Handle navigation
   if (mappedInput.wasPressed(MappedInputManager::Button::Up) ||
       mappedInput.wasPressed(MappedInputManager::Button::Left)) {
     // Move selection up (with wrap-around)
-    selectedSettingIndex = (selectedSettingIndex > 0) ? (selectedSettingIndex - 1) : (visibleCount - 1);
+    selectedSettingIndex = (selectedSettingIndex > 0) ? (selectedSettingIndex - 1) : (settingsCount - 1);
     updateRequired = true;
   } else if (mappedInput.wasPressed(MappedInputManager::Button::Down) ||
              mappedInput.wasPressed(MappedInputManager::Button::Right)) {
     // Move selection down
-    if (selectedSettingIndex < visibleCount - 1) {
+    if (selectedSettingIndex < settingsCount - 1) {
       selectedSettingIndex++;
       updateRequired = true;
     }
@@ -175,13 +126,11 @@ void SettingsActivity::loop() {
 }
 
 void SettingsActivity::toggleCurrentSetting() {
-  // Convert visible index to actual index
-  const int actualIndex = visibleToActualIndex(selectedSettingIndex);
-  if (actualIndex < 0 || actualIndex >= settingsCount) {
+  if (selectedSettingIndex < 0 || selectedSettingIndex >= settingsCount) {
     return;
   }
 
-  const auto& setting = settingsList[actualIndex];
+  const auto& setting = settingsList[selectedSettingIndex];
 
   if (setting.type == SettingType::TOGGLE && setting.valuePtr != nullptr) {
     // Toggle the boolean value using the member pointer
@@ -191,7 +140,7 @@ void SettingsActivity::toggleCurrentSetting() {
     const uint8_t currentValue = SETTINGS.*(setting.valuePtr);
     SETTINGS.*(setting.valuePtr) = (currentValue + 1) % static_cast<uint8_t>(setting.enumValues.size());
   } else if (setting.type == SettingType::ACTION) {
-    if (std::string(setting.name) == "Check for updates") {
+    if (strcmp(setting.name, "Check for updates") == 0) {
       xSemaphoreTake(renderingMutex, portMAX_DELAY);
       exitActivity();
       enterNewActivity(new OtaUpdateActivity(renderer, mappedInput, [this] {
@@ -199,50 +148,10 @@ void SettingsActivity::toggleCurrentSetting() {
         updateRequired = true;
       }));
       xSemaphoreGive(renderingMutex);
-    } else if (std::string(setting.name) == "KOReader Username") {
+    } else if (strcmp(setting.name, "KOReader Sync") == 0) {
       xSemaphoreTake(renderingMutex, portMAX_DELAY);
       exitActivity();
-      enterNewActivity(new KeyboardEntryActivity(
-          renderer, mappedInput, "KOReader Username", KOREADER_STORE.getUsername(), 10,
-          64,     // maxLength
-          false,  // not password
-          [this](const std::string& username) {
-            KOREADER_STORE.setCredentials(username, KOREADER_STORE.getPassword());
-            KOREADER_STORE.saveToFile();
-            exitActivity();
-            updateRequired = true;
-          },
-          [this]() {
-            exitActivity();
-            updateRequired = true;
-          }));
-      xSemaphoreGive(renderingMutex);
-    } else if (std::string(setting.name) == "KOReader Password") {
-      xSemaphoreTake(renderingMutex, portMAX_DELAY);
-      exitActivity();
-      enterNewActivity(new KeyboardEntryActivity(
-          renderer, mappedInput, "KOReader Password", KOREADER_STORE.getPassword(), 10,
-          64,     // maxLength
-          false,  // not password mode - show characters
-          [this](const std::string& password) {
-            KOREADER_STORE.setCredentials(KOREADER_STORE.getUsername(), password);
-            KOREADER_STORE.saveToFile();
-            exitActivity();
-            updateRequired = true;
-          },
-          [this]() {
-            exitActivity();
-            updateRequired = true;
-          }));
-      xSemaphoreGive(renderingMutex);
-    } else if (std::string(setting.name) == "Authenticate KOReader") {
-      // Only allow if credentials are set
-      if (!KOREADER_STORE.hasCredentials()) {
-        return;
-      }
-      xSemaphoreTake(renderingMutex, portMAX_DELAY);
-      exitActivity();
-      enterNewActivity(new KOReaderAuthActivity(renderer, mappedInput, [this] {
+      enterNewActivity(new KOReaderSettingsActivity(renderer, mappedInput, [this] {
         exitActivity();
         updateRequired = true;
       }));
@@ -281,39 +190,27 @@ void SettingsActivity::render() const {
   // Draw selection highlight
   renderer.fillRect(0, 60 + selectedSettingIndex * 30 - 2, pageWidth - 1, 30);
 
-  // Draw only visible settings
-  int visibleIndex = 0;
+  // Draw all settings
   for (int i = 0; i < settingsCount; i++) {
-    if (!isSettingVisible(i)) {
-      continue;
-    }
-
-    const int settingY = 60 + visibleIndex * 30;  // 30 pixels between settings
-    const bool isSelected = (visibleIndex == selectedSettingIndex);
+    const int settingY = 60 + i * 30;  // 30 pixels between settings
+    const bool isSelected = (i == selectedSettingIndex);
 
     // Draw setting name
     renderer.drawText(UI_10_FONT_ID, 20, settingY, settingsList[i].name, !isSelected);
 
     // Draw value based on setting type
-    std::string valueText = "";
+    std::string valueText;
     if (settingsList[i].type == SettingType::TOGGLE && settingsList[i].valuePtr != nullptr) {
       const bool value = SETTINGS.*(settingsList[i].valuePtr);
       valueText = value ? "ON" : "OFF";
     } else if (settingsList[i].type == SettingType::ENUM && settingsList[i].valuePtr != nullptr) {
       const uint8_t value = SETTINGS.*(settingsList[i].valuePtr);
       valueText = settingsList[i].enumValues[value];
-    } else if (settingsList[i].type == SettingType::ACTION) {
-      // Show status for KOReader settings
-      if (std::string(settingsList[i].name) == "KOReader Username") {
-        valueText = KOREADER_STORE.getUsername().empty() ? "[Not Set]" : "[Set]";
-      } else if (std::string(settingsList[i].name) == "KOReader Password") {
-        valueText = KOREADER_STORE.getPassword().empty() ? "[Not Set]" : "[Set]";
-      }
     }
-    const auto width = renderer.getTextWidth(UI_10_FONT_ID, valueText.c_str());
-    renderer.drawText(UI_10_FONT_ID, pageWidth - 20 - width, settingY, valueText.c_str(), !isSelected);
-
-    visibleIndex++;
+    if (!valueText.empty()) {
+      const auto width = renderer.getTextWidth(UI_10_FONT_ID, valueText.c_str());
+      renderer.drawText(UI_10_FONT_ID, pageWidth - 20 - width, settingY, valueText.c_str(), !isSelected);
+    }
   }
 
   // Draw version text above button hints