2026-01-19 06:55:35 -05:00
|
|
|
#include "KOReaderSyncActivity.h"
|
|
|
|
|
|
|
|
|
|
#include <GfxRenderer.h>
|
|
|
|
|
#include <WiFi.h>
|
|
|
|
|
#include <esp_sntp.h>
|
|
|
|
|
|
|
|
|
|
#include "KOReaderCredentialStore.h"
|
|
|
|
|
#include "KOReaderDocumentId.h"
|
|
|
|
|
#include "MappedInputManager.h"
|
|
|
|
|
#include "activities/network/WifiSelectionActivity.h"
|
feat: UI themes, Lyra (#528)
## 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>
2026-02-05 17:50:11 +07:00
|
|
|
#include "components/UITheme.h"
|
2026-01-19 06:55:35 -05:00
|
|
|
#include "fontIds.h"
|
|
|
|
|
|
|
|
|
|
namespace {
|
|
|
|
|
void syncTimeWithNTP() {
|
|
|
|
|
// Stop SNTP if already running (can't reconfigure while running)
|
|
|
|
|
if (esp_sntp_enabled()) {
|
|
|
|
|
esp_sntp_stop();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Configure SNTP
|
|
|
|
|
esp_sntp_setoperatingmode(ESP_SNTP_OPMODE_POLL);
|
|
|
|
|
esp_sntp_setservername(0, "pool.ntp.org");
|
|
|
|
|
esp_sntp_init();
|
|
|
|
|
|
|
|
|
|
// Wait for time to sync (with timeout)
|
|
|
|
|
int retry = 0;
|
|
|
|
|
const int maxRetries = 50; // 5 seconds max
|
|
|
|
|
while (sntp_get_sync_status() != SNTP_SYNC_STATUS_COMPLETED && retry < maxRetries) {
|
|
|
|
|
vTaskDelay(100 / portTICK_PERIOD_MS);
|
|
|
|
|
retry++;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (retry < maxRetries) {
|
|
|
|
|
Serial.printf("[%lu] [KOSync] NTP time synced\n", millis());
|
|
|
|
|
} else {
|
|
|
|
|
Serial.printf("[%lu] [KOSync] NTP sync timeout, using fallback\n", millis());
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
} // namespace
|
|
|
|
|
|
|
|
|
|
void KOReaderSyncActivity::taskTrampoline(void* param) {
|
|
|
|
|
auto* self = static_cast<KOReaderSyncActivity*>(param);
|
|
|
|
|
self->displayTaskLoop();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void KOReaderSyncActivity::onWifiSelectionComplete(const bool success) {
|
|
|
|
|
exitActivity();
|
|
|
|
|
|
|
|
|
|
if (!success) {
|
|
|
|
|
Serial.printf("[%lu] [KOSync] WiFi connection failed, exiting\n", millis());
|
|
|
|
|
onCancel();
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Serial.printf("[%lu] [KOSync] WiFi connected, starting sync\n", millis());
|
|
|
|
|
|
|
|
|
|
xSemaphoreTake(renderingMutex, portMAX_DELAY);
|
|
|
|
|
state = SYNCING;
|
|
|
|
|
statusMessage = "Syncing time...";
|
|
|
|
|
xSemaphoreGive(renderingMutex);
|
|
|
|
|
updateRequired = true;
|
|
|
|
|
|
|
|
|
|
// Sync time with NTP before making API requests
|
|
|
|
|
syncTimeWithNTP();
|
|
|
|
|
|
|
|
|
|
xSemaphoreTake(renderingMutex, portMAX_DELAY);
|
|
|
|
|
statusMessage = "Calculating document hash...";
|
|
|
|
|
xSemaphoreGive(renderingMutex);
|
|
|
|
|
updateRequired = true;
|
|
|
|
|
|
|
|
|
|
performSync();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void KOReaderSyncActivity::performSync() {
|
|
|
|
|
// Calculate document hash based on user's preferred method
|
|
|
|
|
if (KOREADER_STORE.getMatchMethod() == DocumentMatchMethod::FILENAME) {
|
|
|
|
|
documentHash = KOReaderDocumentId::calculateFromFilename(epubPath);
|
|
|
|
|
} else {
|
|
|
|
|
documentHash = KOReaderDocumentId::calculate(epubPath);
|
|
|
|
|
}
|
|
|
|
|
if (documentHash.empty()) {
|
|
|
|
|
xSemaphoreTake(renderingMutex, portMAX_DELAY);
|
|
|
|
|
state = SYNC_FAILED;
|
|
|
|
|
statusMessage = "Failed to calculate document hash";
|
|
|
|
|
xSemaphoreGive(renderingMutex);
|
|
|
|
|
updateRequired = true;
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Serial.printf("[%lu] [KOSync] Document hash: %s\n", millis(), documentHash.c_str());
|
|
|
|
|
|
|
|
|
|
xSemaphoreTake(renderingMutex, portMAX_DELAY);
|
|
|
|
|
statusMessage = "Fetching remote progress...";
|
|
|
|
|
xSemaphoreGive(renderingMutex);
|
|
|
|
|
updateRequired = true;
|
|
|
|
|
vTaskDelay(10 / portTICK_PERIOD_MS);
|
|
|
|
|
|
|
|
|
|
// Fetch remote progress
|
|
|
|
|
const auto result = KOReaderSyncClient::getProgress(documentHash, remoteProgress);
|
|
|
|
|
|
|
|
|
|
if (result == KOReaderSyncClient::NOT_FOUND) {
|
|
|
|
|
// No remote progress - offer to upload
|
|
|
|
|
xSemaphoreTake(renderingMutex, portMAX_DELAY);
|
|
|
|
|
state = NO_REMOTE_PROGRESS;
|
|
|
|
|
hasRemoteProgress = false;
|
|
|
|
|
xSemaphoreGive(renderingMutex);
|
|
|
|
|
updateRequired = true;
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (result != KOReaderSyncClient::OK) {
|
|
|
|
|
xSemaphoreTake(renderingMutex, portMAX_DELAY);
|
|
|
|
|
state = SYNC_FAILED;
|
|
|
|
|
statusMessage = KOReaderSyncClient::errorString(result);
|
|
|
|
|
xSemaphoreGive(renderingMutex);
|
|
|
|
|
updateRequired = true;
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Convert remote progress to CrossPoint position
|
|
|
|
|
hasRemoteProgress = true;
|
|
|
|
|
KOReaderPosition koPos = {remoteProgress.progress, remoteProgress.percentage};
|
|
|
|
|
remotePosition = ProgressMapper::toCrossPoint(epub, koPos, totalPagesInSpine);
|
|
|
|
|
|
|
|
|
|
// Calculate local progress in KOReader format (for display)
|
|
|
|
|
CrossPointPosition localPos = {currentSpineIndex, currentPage, totalPagesInSpine};
|
|
|
|
|
localProgress = ProgressMapper::toKOReader(epub, localPos);
|
|
|
|
|
|
|
|
|
|
xSemaphoreTake(renderingMutex, portMAX_DELAY);
|
|
|
|
|
state = SHOWING_RESULT;
|
|
|
|
|
selectedOption = 0; // Default to "Apply"
|
|
|
|
|
xSemaphoreGive(renderingMutex);
|
|
|
|
|
updateRequired = true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void KOReaderSyncActivity::performUpload() {
|
|
|
|
|
xSemaphoreTake(renderingMutex, portMAX_DELAY);
|
|
|
|
|
state = UPLOADING;
|
|
|
|
|
statusMessage = "Uploading progress...";
|
|
|
|
|
xSemaphoreGive(renderingMutex);
|
|
|
|
|
updateRequired = true;
|
|
|
|
|
vTaskDelay(10 / portTICK_PERIOD_MS);
|
|
|
|
|
|
|
|
|
|
// Convert current position to KOReader format
|
|
|
|
|
CrossPointPosition localPos = {currentSpineIndex, currentPage, totalPagesInSpine};
|
|
|
|
|
KOReaderPosition koPos = ProgressMapper::toKOReader(epub, localPos);
|
|
|
|
|
|
|
|
|
|
KOReaderProgress progress;
|
|
|
|
|
progress.document = documentHash;
|
|
|
|
|
progress.progress = koPos.xpath;
|
|
|
|
|
progress.percentage = koPos.percentage;
|
|
|
|
|
|
|
|
|
|
const auto result = KOReaderSyncClient::updateProgress(progress);
|
|
|
|
|
|
|
|
|
|
if (result != KOReaderSyncClient::OK) {
|
|
|
|
|
xSemaphoreTake(renderingMutex, portMAX_DELAY);
|
|
|
|
|
state = SYNC_FAILED;
|
|
|
|
|
statusMessage = KOReaderSyncClient::errorString(result);
|
|
|
|
|
xSemaphoreGive(renderingMutex);
|
|
|
|
|
updateRequired = true;
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
xSemaphoreTake(renderingMutex, portMAX_DELAY);
|
|
|
|
|
state = UPLOAD_COMPLETE;
|
|
|
|
|
xSemaphoreGive(renderingMutex);
|
|
|
|
|
updateRequired = true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void KOReaderSyncActivity::onEnter() {
|
|
|
|
|
ActivityWithSubactivity::onEnter();
|
|
|
|
|
|
|
|
|
|
renderingMutex = xSemaphoreCreateMutex();
|
|
|
|
|
|
|
|
|
|
xTaskCreate(&KOReaderSyncActivity::taskTrampoline, "KOSyncTask",
|
|
|
|
|
4096, // Stack size (larger for network operations)
|
|
|
|
|
this, // Parameters
|
|
|
|
|
1, // Priority
|
|
|
|
|
&displayTaskHandle // Task handle
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
// Check for credentials first
|
|
|
|
|
if (!KOREADER_STORE.hasCredentials()) {
|
|
|
|
|
state = NO_CREDENTIALS;
|
|
|
|
|
updateRequired = true;
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Turn on WiFi
|
|
|
|
|
Serial.printf("[%lu] [KOSync] Turning on WiFi...\n", millis());
|
|
|
|
|
WiFi.mode(WIFI_STA);
|
|
|
|
|
|
|
|
|
|
// Check if already connected
|
|
|
|
|
if (WiFi.status() == WL_CONNECTED) {
|
|
|
|
|
Serial.printf("[%lu] [KOSync] Already connected to WiFi\n", millis());
|
|
|
|
|
state = SYNCING;
|
|
|
|
|
statusMessage = "Syncing time...";
|
|
|
|
|
updateRequired = true;
|
|
|
|
|
|
|
|
|
|
// Perform sync directly (will be handled in loop)
|
|
|
|
|
xTaskCreate(
|
|
|
|
|
[](void* param) {
|
|
|
|
|
auto* self = static_cast<KOReaderSyncActivity*>(param);
|
|
|
|
|
// Sync time first
|
|
|
|
|
syncTimeWithNTP();
|
|
|
|
|
xSemaphoreTake(self->renderingMutex, portMAX_DELAY);
|
|
|
|
|
self->statusMessage = "Calculating document hash...";
|
|
|
|
|
xSemaphoreGive(self->renderingMutex);
|
|
|
|
|
self->updateRequired = true;
|
|
|
|
|
self->performSync();
|
|
|
|
|
vTaskDelete(nullptr);
|
|
|
|
|
},
|
|
|
|
|
"SyncTask", 4096, this, 1, nullptr);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Launch WiFi selection subactivity
|
|
|
|
|
Serial.printf("[%lu] [KOSync] Launching WifiSelectionActivity...\n", millis());
|
|
|
|
|
enterNewActivity(new WifiSelectionActivity(renderer, mappedInput,
|
|
|
|
|
[this](const bool connected) { onWifiSelectionComplete(connected); }));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void KOReaderSyncActivity::onExit() {
|
|
|
|
|
ActivityWithSubactivity::onExit();
|
|
|
|
|
|
|
|
|
|
// Turn off wifi
|
|
|
|
|
WiFi.disconnect(false);
|
|
|
|
|
delay(100);
|
|
|
|
|
WiFi.mode(WIFI_OFF);
|
|
|
|
|
delay(100);
|
|
|
|
|
|
|
|
|
|
// Wait until not rendering to delete task
|
|
|
|
|
xSemaphoreTake(renderingMutex, portMAX_DELAY);
|
|
|
|
|
if (displayTaskHandle) {
|
|
|
|
|
vTaskDelete(displayTaskHandle);
|
|
|
|
|
displayTaskHandle = nullptr;
|
|
|
|
|
}
|
|
|
|
|
vSemaphoreDelete(renderingMutex);
|
|
|
|
|
renderingMutex = nullptr;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void KOReaderSyncActivity::displayTaskLoop() {
|
|
|
|
|
while (true) {
|
|
|
|
|
if (updateRequired) {
|
|
|
|
|
updateRequired = false;
|
|
|
|
|
xSemaphoreTake(renderingMutex, portMAX_DELAY);
|
|
|
|
|
render();
|
|
|
|
|
xSemaphoreGive(renderingMutex);
|
|
|
|
|
}
|
|
|
|
|
vTaskDelay(10 / portTICK_PERIOD_MS);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void KOReaderSyncActivity::render() {
|
|
|
|
|
if (subActivity) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const auto pageWidth = renderer.getScreenWidth();
|
|
|
|
|
|
|
|
|
|
renderer.clearScreen();
|
|
|
|
|
renderer.drawCenteredText(UI_12_FONT_ID, 15, "KOReader Sync", true, EpdFontFamily::BOLD);
|
|
|
|
|
|
|
|
|
|
if (state == NO_CREDENTIALS) {
|
|
|
|
|
renderer.drawCenteredText(UI_10_FONT_ID, 280, "No credentials configured", true, EpdFontFamily::BOLD);
|
|
|
|
|
renderer.drawCenteredText(UI_10_FONT_ID, 320, "Set up KOReader account in Settings");
|
|
|
|
|
|
|
|
|
|
const auto labels = mappedInput.mapLabels("Back", "", "", "");
|
feat: UI themes, Lyra (#528)
## 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>
2026-02-05 17:50:11 +07:00
|
|
|
GUI.drawButtonHints(renderer, labels.btn1, labels.btn2, labels.btn3, labels.btn4);
|
2026-01-19 06:55:35 -05:00
|
|
|
renderer.displayBuffer();
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (state == SYNCING || state == UPLOADING) {
|
|
|
|
|
renderer.drawCenteredText(UI_10_FONT_ID, 300, statusMessage.c_str(), true, EpdFontFamily::BOLD);
|
|
|
|
|
renderer.displayBuffer();
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (state == SHOWING_RESULT) {
|
|
|
|
|
// Show comparison
|
|
|
|
|
renderer.drawCenteredText(UI_10_FONT_ID, 120, "Progress found!", true, EpdFontFamily::BOLD);
|
|
|
|
|
|
|
|
|
|
// Get chapter names from TOC
|
|
|
|
|
const int remoteTocIndex = epub->getTocIndexForSpineIndex(remotePosition.spineIndex);
|
|
|
|
|
const int localTocIndex = epub->getTocIndexForSpineIndex(currentSpineIndex);
|
|
|
|
|
const std::string remoteChapter = (remoteTocIndex >= 0)
|
|
|
|
|
? epub->getTocItem(remoteTocIndex).title
|
|
|
|
|
: ("Section " + std::to_string(remotePosition.spineIndex + 1));
|
|
|
|
|
const std::string localChapter = (localTocIndex >= 0) ? epub->getTocItem(localTocIndex).title
|
|
|
|
|
: ("Section " + std::to_string(currentSpineIndex + 1));
|
|
|
|
|
|
|
|
|
|
// Remote progress - chapter and page
|
|
|
|
|
renderer.drawText(UI_10_FONT_ID, 20, 160, "Remote:", true);
|
|
|
|
|
char remoteChapterStr[128];
|
|
|
|
|
snprintf(remoteChapterStr, sizeof(remoteChapterStr), " %s", remoteChapter.c_str());
|
|
|
|
|
renderer.drawText(UI_10_FONT_ID, 20, 185, remoteChapterStr);
|
|
|
|
|
char remotePageStr[64];
|
|
|
|
|
snprintf(remotePageStr, sizeof(remotePageStr), " Page %d, %.2f%% overall", remotePosition.pageNumber + 1,
|
|
|
|
|
remoteProgress.percentage * 100);
|
|
|
|
|
renderer.drawText(UI_10_FONT_ID, 20, 210, remotePageStr);
|
|
|
|
|
|
|
|
|
|
if (!remoteProgress.device.empty()) {
|
|
|
|
|
char deviceStr[64];
|
|
|
|
|
snprintf(deviceStr, sizeof(deviceStr), " From: %s", remoteProgress.device.c_str());
|
|
|
|
|
renderer.drawText(UI_10_FONT_ID, 20, 235, deviceStr);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Local progress - chapter and page
|
|
|
|
|
renderer.drawText(UI_10_FONT_ID, 20, 270, "Local:", true);
|
|
|
|
|
char localChapterStr[128];
|
|
|
|
|
snprintf(localChapterStr, sizeof(localChapterStr), " %s", localChapter.c_str());
|
|
|
|
|
renderer.drawText(UI_10_FONT_ID, 20, 295, localChapterStr);
|
|
|
|
|
char localPageStr[64];
|
|
|
|
|
snprintf(localPageStr, sizeof(localPageStr), " Page %d/%d, %.2f%% overall", currentPage + 1, totalPagesInSpine,
|
|
|
|
|
localProgress.percentage * 100);
|
|
|
|
|
renderer.drawText(UI_10_FONT_ID, 20, 320, localPageStr);
|
|
|
|
|
|
|
|
|
|
// Options
|
|
|
|
|
const int optionY = 350;
|
|
|
|
|
const int optionHeight = 30;
|
|
|
|
|
|
|
|
|
|
// Apply option
|
|
|
|
|
if (selectedOption == 0) {
|
|
|
|
|
renderer.fillRect(0, optionY - 2, pageWidth - 1, optionHeight);
|
|
|
|
|
}
|
|
|
|
|
renderer.drawText(UI_10_FONT_ID, 20, optionY, "Apply remote progress", selectedOption != 0);
|
|
|
|
|
|
|
|
|
|
// Upload option
|
|
|
|
|
if (selectedOption == 1) {
|
|
|
|
|
renderer.fillRect(0, optionY + optionHeight - 2, pageWidth - 1, optionHeight);
|
|
|
|
|
}
|
|
|
|
|
renderer.drawText(UI_10_FONT_ID, 20, optionY + optionHeight, "Upload local progress", selectedOption != 1);
|
|
|
|
|
|
|
|
|
|
// Cancel option
|
|
|
|
|
if (selectedOption == 2) {
|
|
|
|
|
renderer.fillRect(0, optionY + optionHeight * 2 - 2, pageWidth - 1, optionHeight);
|
|
|
|
|
}
|
|
|
|
|
renderer.drawText(UI_10_FONT_ID, 20, optionY + optionHeight * 2, "Cancel", selectedOption != 2);
|
|
|
|
|
|
|
|
|
|
const auto labels = mappedInput.mapLabels("", "Select", "", "");
|
feat: UI themes, Lyra (#528)
## 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>
2026-02-05 17:50:11 +07:00
|
|
|
GUI.drawButtonHints(renderer, labels.btn1, labels.btn2, labels.btn3, labels.btn4);
|
2026-01-19 06:55:35 -05:00
|
|
|
renderer.displayBuffer();
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (state == NO_REMOTE_PROGRESS) {
|
|
|
|
|
renderer.drawCenteredText(UI_10_FONT_ID, 280, "No remote progress found", true, EpdFontFamily::BOLD);
|
|
|
|
|
renderer.drawCenteredText(UI_10_FONT_ID, 320, "Upload current position?");
|
|
|
|
|
|
|
|
|
|
const auto labels = mappedInput.mapLabels("Cancel", "Upload", "", "");
|
feat: UI themes, Lyra (#528)
## 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>
2026-02-05 17:50:11 +07:00
|
|
|
GUI.drawButtonHints(renderer, labels.btn1, labels.btn2, labels.btn3, labels.btn4);
|
2026-01-19 06:55:35 -05:00
|
|
|
renderer.displayBuffer();
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (state == UPLOAD_COMPLETE) {
|
|
|
|
|
renderer.drawCenteredText(UI_10_FONT_ID, 300, "Progress uploaded!", true, EpdFontFamily::BOLD);
|
|
|
|
|
|
|
|
|
|
const auto labels = mappedInput.mapLabels("Back", "", "", "");
|
feat: UI themes, Lyra (#528)
## 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>
2026-02-05 17:50:11 +07:00
|
|
|
GUI.drawButtonHints(renderer, labels.btn1, labels.btn2, labels.btn3, labels.btn4);
|
2026-01-19 06:55:35 -05:00
|
|
|
renderer.displayBuffer();
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (state == SYNC_FAILED) {
|
|
|
|
|
renderer.drawCenteredText(UI_10_FONT_ID, 280, "Sync failed", true, EpdFontFamily::BOLD);
|
|
|
|
|
renderer.drawCenteredText(UI_10_FONT_ID, 320, statusMessage.c_str());
|
|
|
|
|
|
|
|
|
|
const auto labels = mappedInput.mapLabels("Back", "", "", "");
|
feat: UI themes, Lyra (#528)
## 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>
2026-02-05 17:50:11 +07:00
|
|
|
GUI.drawButtonHints(renderer, labels.btn1, labels.btn2, labels.btn3, labels.btn4);
|
2026-01-19 06:55:35 -05:00
|
|
|
renderer.displayBuffer();
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void KOReaderSyncActivity::loop() {
|
|
|
|
|
if (subActivity) {
|
|
|
|
|
subActivity->loop();
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (state == NO_CREDENTIALS || state == SYNC_FAILED || state == UPLOAD_COMPLETE) {
|
|
|
|
|
if (mappedInput.wasPressed(MappedInputManager::Button::Back)) {
|
|
|
|
|
onCancel();
|
|
|
|
|
}
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (state == SHOWING_RESULT) {
|
|
|
|
|
// Navigate options
|
|
|
|
|
if (mappedInput.wasPressed(MappedInputManager::Button::Up) ||
|
|
|
|
|
mappedInput.wasPressed(MappedInputManager::Button::Left)) {
|
|
|
|
|
selectedOption = (selectedOption + 2) % 3; // Wrap around
|
|
|
|
|
updateRequired = true;
|
|
|
|
|
} else if (mappedInput.wasPressed(MappedInputManager::Button::Down) ||
|
|
|
|
|
mappedInput.wasPressed(MappedInputManager::Button::Right)) {
|
|
|
|
|
selectedOption = (selectedOption + 1) % 3;
|
|
|
|
|
updateRequired = true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (mappedInput.wasPressed(MappedInputManager::Button::Confirm)) {
|
|
|
|
|
if (selectedOption == 0) {
|
|
|
|
|
// Apply remote progress
|
|
|
|
|
onSyncComplete(remotePosition.spineIndex, remotePosition.pageNumber);
|
|
|
|
|
} else if (selectedOption == 1) {
|
|
|
|
|
// Upload local progress
|
|
|
|
|
performUpload();
|
|
|
|
|
} else {
|
|
|
|
|
// Cancel
|
|
|
|
|
onCancel();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (mappedInput.wasPressed(MappedInputManager::Button::Back)) {
|
|
|
|
|
onCancel();
|
|
|
|
|
}
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (state == NO_REMOTE_PROGRESS) {
|
|
|
|
|
if (mappedInput.wasPressed(MappedInputManager::Button::Confirm)) {
|
|
|
|
|
// Calculate hash if not done yet
|
|
|
|
|
if (documentHash.empty()) {
|
|
|
|
|
if (KOREADER_STORE.getMatchMethod() == DocumentMatchMethod::FILENAME) {
|
|
|
|
|
documentHash = KOReaderDocumentId::calculateFromFilename(epubPath);
|
|
|
|
|
} else {
|
|
|
|
|
documentHash = KOReaderDocumentId::calculate(epubPath);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
performUpload();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (mappedInput.wasPressed(MappedInputManager::Button::Back)) {
|
|
|
|
|
onCancel();
|
|
|
|
|
}
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
}
|