mirror of
https://github.com/daveallie/crosspoint-reader.git
synced 2026-02-05 23:27:38 +03:00
## Summary ### What is the goal of this PR? - Visual UI overhaul - UI theme selection ### What changes are included? - Added a setting "UI Theme": Classic, Lyra - The classic theme is the current Crosspoint theme - The Lyra theme implements these mockups: https://www.figma.com/design/UhxoV4DgUnfrDQgMPPTXog/Lyra-Theme?node-id=2003-7596&t=4CSOZqf0n9uQMxDt-0 by Discord users yagofarias, ruby and gan_shu - New functions in GFXRenderer to render rounded rectangles, greyscale fills (using dithering) and thick lines - Basic UI components are factored into BaseTheme methods which can be overridden by each additional theme. Methods that are not overridden will fallback to BaseTheme behavior. This means any new features/components in CrossPoint only need to be developed for the "Classic" BaseTheme. - Additional themes can easily be developed by the community using this foundation    ## Additional Context - Only the Home, Library and main Settings screens have been implemented so far, this will be extended to the transfer screens and chapter selection screen later on, but we need to get the ball rolling somehow :) - Loading extra covers on the home screen in the Lyra theme takes a little more time (about 2 seconds), I added a loading bar popup (reusing the Indexing progress bar from the reader view, factored into a neat UI component) but the popup adds ~400ms to the loading time. - ~~Home screen thumbnails will need to be generated separately for each theme, because they are displayed in different sizes. Because we're using dithering, displaying a thumb with the wrong size causes the picture to look janky or dark as it does on the screenshots above. No worries this will be fixed in a future PR.~~ Thumbs are now generated with a size parameter - UI Icons will need to be implemented in a future PR. --- ### AI Usage While CrossPoint doesn't have restrictions on AI tools in contributing, please be transparent about their usage as it helps set the right context for reviewers. Did you use AI tools to help write this code? _**PARTIALLY**_ This is not a vibe coded PR. Copilot was used for autocompletion to save time but I reviewed, understood and edited all generated code. --------- Co-authored-by: Dave Allie <dave@daveallie.com>
215 lines
6.9 KiB
C++
215 lines
6.9 KiB
C++
#include "KOReaderSettingsActivity.h"
|
|
|
|
#include <GfxRenderer.h>
|
|
|
|
#include <cstring>
|
|
|
|
#include "KOReaderAuthActivity.h"
|
|
#include "KOReaderCredentialStore.h"
|
|
#include "MappedInputManager.h"
|
|
#include "activities/util/KeyboardEntryActivity.h"
|
|
#include "components/UITheme.h"
|
|
#include "fontIds.h"
|
|
|
|
namespace {
|
|
constexpr int MENU_ITEMS = 5;
|
|
const char* menuNames[MENU_ITEMS] = {"Username", "Password", "Sync Server URL", "Document Matching", "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) {
|
|
// Sync Server URL - prefill with https:// if empty to save typing
|
|
const std::string currentUrl = KOREADER_STORE.getServerUrl();
|
|
const std::string prefillUrl = currentUrl.empty() ? "https://" : currentUrl;
|
|
exitActivity();
|
|
enterNewActivity(new KeyboardEntryActivity(
|
|
renderer, mappedInput, "Sync Server URL", prefillUrl, 10,
|
|
128, // maxLength - URLs can be long
|
|
false, // not password
|
|
[this](const std::string& url) {
|
|
// Clear if user just left the prefilled https://
|
|
const std::string urlToSave = (url == "https://" || url == "http://") ? "" : url;
|
|
KOREADER_STORE.setServerUrl(urlToSave);
|
|
KOREADER_STORE.saveToFile();
|
|
exitActivity();
|
|
updateRequired = true;
|
|
},
|
|
[this]() {
|
|
exitActivity();
|
|
updateRequired = true;
|
|
}));
|
|
} else if (selectedIndex == 3) {
|
|
// Document Matching - toggle between Filename and Binary
|
|
const auto current = KOREADER_STORE.getMatchMethod();
|
|
const auto newMethod =
|
|
(current == DocumentMatchMethod::FILENAME) ? DocumentMatchMethod::BINARY : DocumentMatchMethod::FILENAME;
|
|
KOREADER_STORE.setMatchMethod(newMethod);
|
|
KOREADER_STORE.saveToFile();
|
|
updateRequired = true;
|
|
} else if (selectedIndex == 4) {
|
|
// 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 each item
|
|
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.getServerUrl().empty() ? "[Default]" : "[Custom]";
|
|
} else if (i == 3) {
|
|
status = KOREADER_STORE.getMatchMethod() == DocumentMatchMethod::FILENAME ? "[Filename]" : "[Binary]";
|
|
} else if (i == 4) {
|
|
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", "", "");
|
|
GUI.drawButtonHints(renderer, labels.btn1, labels.btn2, labels.btn3, labels.btn4);
|
|
|
|
renderer.displayBuffer();
|
|
}
|