## 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>
191 lines
5.8 KiB
C++
191 lines
5.8 KiB
C++
#include "CalibreSettingsActivity.h"
|
|
|
|
#include <GfxRenderer.h>
|
|
|
|
#include <cstring>
|
|
|
|
#include "CrossPointSettings.h"
|
|
#include "MappedInputManager.h"
|
|
#include "activities/util/KeyboardEntryActivity.h"
|
|
#include "components/UITheme.h"
|
|
#include "fontIds.h"
|
|
|
|
namespace {
|
|
constexpr int MENU_ITEMS = 3;
|
|
const char* menuNames[MENU_ITEMS] = {"OPDS Server URL", "Username", "Password"};
|
|
} // namespace
|
|
|
|
void CalibreSettingsActivity::taskTrampoline(void* param) {
|
|
auto* self = static_cast<CalibreSettingsActivity*>(param);
|
|
self->displayTaskLoop();
|
|
}
|
|
|
|
void CalibreSettingsActivity::onEnter() {
|
|
ActivityWithSubactivity::onEnter();
|
|
|
|
renderingMutex = xSemaphoreCreateMutex();
|
|
selectedIndex = 0;
|
|
updateRequired = true;
|
|
|
|
xTaskCreate(&CalibreSettingsActivity::taskTrampoline, "CalibreSettingsTask",
|
|
4096, // Stack size
|
|
this, // Parameters
|
|
1, // Priority
|
|
&displayTaskHandle // Task handle
|
|
);
|
|
}
|
|
|
|
void CalibreSettingsActivity::onExit() {
|
|
ActivityWithSubactivity::onExit();
|
|
|
|
xSemaphoreTake(renderingMutex, portMAX_DELAY);
|
|
if (displayTaskHandle) {
|
|
vTaskDelete(displayTaskHandle);
|
|
displayTaskHandle = nullptr;
|
|
}
|
|
vSemaphoreDelete(renderingMutex);
|
|
renderingMutex = nullptr;
|
|
}
|
|
|
|
void CalibreSettingsActivity::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 CalibreSettingsActivity::handleSelection() {
|
|
xSemaphoreTake(renderingMutex, portMAX_DELAY);
|
|
|
|
if (selectedIndex == 0) {
|
|
// OPDS Server URL
|
|
exitActivity();
|
|
enterNewActivity(new KeyboardEntryActivity(
|
|
renderer, mappedInput, "OPDS Server URL", SETTINGS.opdsServerUrl, 10,
|
|
127, // maxLength
|
|
false, // not password
|
|
[this](const std::string& url) {
|
|
strncpy(SETTINGS.opdsServerUrl, url.c_str(), sizeof(SETTINGS.opdsServerUrl) - 1);
|
|
SETTINGS.opdsServerUrl[sizeof(SETTINGS.opdsServerUrl) - 1] = '\0';
|
|
SETTINGS.saveToFile();
|
|
exitActivity();
|
|
updateRequired = true;
|
|
},
|
|
[this]() {
|
|
exitActivity();
|
|
updateRequired = true;
|
|
}));
|
|
} else if (selectedIndex == 1) {
|
|
// Username
|
|
exitActivity();
|
|
enterNewActivity(new KeyboardEntryActivity(
|
|
renderer, mappedInput, "Username", SETTINGS.opdsUsername, 10,
|
|
63, // maxLength
|
|
false, // not password
|
|
[this](const std::string& username) {
|
|
strncpy(SETTINGS.opdsUsername, username.c_str(), sizeof(SETTINGS.opdsUsername) - 1);
|
|
SETTINGS.opdsUsername[sizeof(SETTINGS.opdsUsername) - 1] = '\0';
|
|
SETTINGS.saveToFile();
|
|
exitActivity();
|
|
updateRequired = true;
|
|
},
|
|
[this]() {
|
|
exitActivity();
|
|
updateRequired = true;
|
|
}));
|
|
} else if (selectedIndex == 2) {
|
|
// Password
|
|
exitActivity();
|
|
enterNewActivity(new KeyboardEntryActivity(
|
|
renderer, mappedInput, "Password", SETTINGS.opdsPassword, 10,
|
|
63, // maxLength
|
|
false, // not password mode
|
|
[this](const std::string& password) {
|
|
strncpy(SETTINGS.opdsPassword, password.c_str(), sizeof(SETTINGS.opdsPassword) - 1);
|
|
SETTINGS.opdsPassword[sizeof(SETTINGS.opdsPassword) - 1] = '\0';
|
|
SETTINGS.saveToFile();
|
|
exitActivity();
|
|
updateRequired = true;
|
|
},
|
|
[this]() {
|
|
exitActivity();
|
|
updateRequired = true;
|
|
}));
|
|
}
|
|
|
|
xSemaphoreGive(renderingMutex);
|
|
}
|
|
|
|
void CalibreSettingsActivity::displayTaskLoop() {
|
|
while (true) {
|
|
if (updateRequired && !subActivity) {
|
|
updateRequired = false;
|
|
xSemaphoreTake(renderingMutex, portMAX_DELAY);
|
|
render();
|
|
xSemaphoreGive(renderingMutex);
|
|
}
|
|
vTaskDelay(10 / portTICK_PERIOD_MS);
|
|
}
|
|
}
|
|
|
|
void CalibreSettingsActivity::render() {
|
|
renderer.clearScreen();
|
|
|
|
const auto pageWidth = renderer.getScreenWidth();
|
|
|
|
// Draw header
|
|
renderer.drawCenteredText(UI_12_FONT_ID, 15, "OPDS Browser", true, EpdFontFamily::BOLD);
|
|
|
|
// Draw info text about Calibre
|
|
renderer.drawCenteredText(UI_10_FONT_ID, 40, "For Calibre, add /opds to your URL");
|
|
|
|
// Draw selection highlight
|
|
renderer.fillRect(0, 70 + selectedIndex * 30 - 2, pageWidth - 1, 30);
|
|
|
|
// Draw menu items
|
|
for (int i = 0; i < MENU_ITEMS; i++) {
|
|
const int settingY = 70 + i * 30;
|
|
const bool isSelected = (i == selectedIndex);
|
|
|
|
renderer.drawText(UI_10_FONT_ID, 20, settingY, menuNames[i], !isSelected);
|
|
|
|
// Draw status for each setting
|
|
const char* status = "[Not Set]";
|
|
if (i == 0) {
|
|
status = (strlen(SETTINGS.opdsServerUrl) > 0) ? "[Set]" : "[Not Set]";
|
|
} else if (i == 1) {
|
|
status = (strlen(SETTINGS.opdsUsername) > 0) ? "[Set]" : "[Not Set]";
|
|
} else if (i == 2) {
|
|
status = (strlen(SETTINGS.opdsPassword) > 0) ? "[Set]" : "[Not Set]";
|
|
}
|
|
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();
|
|
}
|