2025-12-17 23:32:18 +11:00
|
|
|
#include "FileSelectionActivity.h"
|
2025-12-04 00:07:25 +11:00
|
|
|
|
2025-12-08 22:06:09 +11:00
|
|
|
#include <GfxRenderer.h>
|
2025-12-22 00:31:25 +11:00
|
|
|
#include <InputManager.h>
|
2025-12-04 00:07:25 +11:00
|
|
|
#include <SD.h>
|
|
|
|
|
|
2025-12-08 22:06:09 +11:00
|
|
|
#include "config.h"
|
|
|
|
|
|
2025-12-21 17:12:53 +11:00
|
|
|
namespace {
|
|
|
|
|
constexpr int PAGE_ITEMS = 23;
|
|
|
|
|
constexpr int SKIP_PAGE_MS = 700;
|
2025-12-26 09:55:23 +09:00
|
|
|
constexpr unsigned long GO_HOME_MS = 1000;
|
2025-12-21 17:12:53 +11:00
|
|
|
} // namespace
|
|
|
|
|
|
2025-12-07 19:17:43 +11:00
|
|
|
void sortFileList(std::vector<std::string>& strs) {
|
2025-12-06 13:01:16 +11:00
|
|
|
std::sort(begin(strs), end(strs), [](const std::string& str1, const std::string& str2) {
|
2025-12-07 19:17:43 +11:00
|
|
|
if (str1.back() == '/' && str2.back() != '/') return true;
|
|
|
|
|
if (str1.back() != '/' && str2.back() == '/') return false;
|
2025-12-06 13:01:16 +11:00
|
|
|
return lexicographical_compare(
|
|
|
|
|
begin(str1), end(str1), begin(str2), end(str2),
|
|
|
|
|
[](const char& char1, const char& char2) { return tolower(char1) < tolower(char2); });
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
|
2025-12-17 23:32:18 +11:00
|
|
|
void FileSelectionActivity::taskTrampoline(void* param) {
|
|
|
|
|
auto* self = static_cast<FileSelectionActivity*>(param);
|
2025-12-04 00:07:25 +11:00
|
|
|
self->displayTaskLoop();
|
|
|
|
|
}
|
|
|
|
|
|
2025-12-17 23:32:18 +11:00
|
|
|
void FileSelectionActivity::loadFiles() {
|
2025-12-04 00:07:25 +11:00
|
|
|
files.clear();
|
2025-12-05 22:12:28 +11:00
|
|
|
selectorIndex = 0;
|
|
|
|
|
auto root = SD.open(basepath.c_str());
|
|
|
|
|
for (File file = root.openNextFile(); file; file = root.openNextFile()) {
|
2025-12-04 00:07:25 +11:00
|
|
|
auto filename = std::string(file.name());
|
2025-12-05 22:12:28 +11:00
|
|
|
if (filename[0] == '.') {
|
2025-12-04 00:07:25 +11:00
|
|
|
file.close();
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
2025-12-05 22:12:28 +11:00
|
|
|
if (file.isDirectory()) {
|
|
|
|
|
files.emplace_back(filename + "/");
|
|
|
|
|
} else if (filename.substr(filename.length() - 5) == ".epub") {
|
|
|
|
|
files.emplace_back(filename);
|
|
|
|
|
}
|
2025-12-04 00:07:25 +11:00
|
|
|
file.close();
|
|
|
|
|
}
|
|
|
|
|
root.close();
|
2025-12-07 19:17:43 +11:00
|
|
|
sortFileList(files);
|
2025-12-05 22:12:28 +11:00
|
|
|
}
|
|
|
|
|
|
2025-12-17 23:32:18 +11:00
|
|
|
void FileSelectionActivity::onEnter() {
|
2025-12-21 21:17:00 +11:00
|
|
|
Activity::onEnter();
|
|
|
|
|
|
2025-12-06 03:02:52 +11:00
|
|
|
renderingMutex = xSemaphoreCreateMutex();
|
|
|
|
|
|
2025-12-26 09:55:23 +09:00
|
|
|
// basepath is set via constructor parameter (defaults to "/" if not specified)
|
2025-12-05 22:12:28 +11:00
|
|
|
loadFiles();
|
2025-12-06 02:49:10 +11:00
|
|
|
selectorIndex = 0;
|
2025-12-04 00:07:25 +11:00
|
|
|
|
|
|
|
|
// Trigger first update
|
|
|
|
|
updateRequired = true;
|
|
|
|
|
|
2025-12-17 23:32:18 +11:00
|
|
|
xTaskCreate(&FileSelectionActivity::taskTrampoline, "FileSelectionActivityTask",
|
2025-12-08 19:48:49 +11:00
|
|
|
2048, // Stack size
|
2025-12-04 00:07:25 +11:00
|
|
|
this, // Parameters
|
|
|
|
|
1, // Priority
|
|
|
|
|
&displayTaskHandle // Task handle
|
|
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
|
2025-12-17 23:32:18 +11:00
|
|
|
void FileSelectionActivity::onExit() {
|
2025-12-21 21:17:00 +11:00
|
|
|
Activity::onExit();
|
|
|
|
|
|
2025-12-06 03:02:52 +11:00
|
|
|
// Wait until not rendering to delete task to avoid killing mid-instruction to EPD
|
|
|
|
|
xSemaphoreTake(renderingMutex, portMAX_DELAY);
|
2025-12-06 02:49:10 +11:00
|
|
|
if (displayTaskHandle) {
|
|
|
|
|
vTaskDelete(displayTaskHandle);
|
|
|
|
|
displayTaskHandle = nullptr;
|
|
|
|
|
}
|
2025-12-06 03:02:52 +11:00
|
|
|
vSemaphoreDelete(renderingMutex);
|
|
|
|
|
renderingMutex = nullptr;
|
2025-12-06 02:49:10 +11:00
|
|
|
files.clear();
|
2025-12-04 00:07:25 +11:00
|
|
|
}
|
|
|
|
|
|
2025-12-17 23:32:18 +11:00
|
|
|
void FileSelectionActivity::loop() {
|
2025-12-26 09:55:23 +09:00
|
|
|
// Long press BACK (1s+) goes to root folder
|
|
|
|
|
if (inputManager.isPressed(InputManager::BTN_BACK) && inputManager.getHeldTime() >= GO_HOME_MS) {
|
|
|
|
|
if (basepath != "/") {
|
|
|
|
|
basepath = "/";
|
|
|
|
|
loadFiles();
|
|
|
|
|
updateRequired = true;
|
|
|
|
|
}
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
2025-12-21 17:12:53 +11:00
|
|
|
const bool prevReleased =
|
|
|
|
|
inputManager.wasReleased(InputManager::BTN_UP) || inputManager.wasReleased(InputManager::BTN_LEFT);
|
|
|
|
|
const bool nextReleased =
|
|
|
|
|
inputManager.wasReleased(InputManager::BTN_DOWN) || inputManager.wasReleased(InputManager::BTN_RIGHT);
|
|
|
|
|
|
|
|
|
|
const bool skipPage = inputManager.getHeldTime() > SKIP_PAGE_MS;
|
2025-12-06 12:35:41 +11:00
|
|
|
|
|
|
|
|
if (inputManager.wasPressed(InputManager::BTN_CONFIRM)) {
|
2025-12-05 22:12:28 +11:00
|
|
|
if (files.empty()) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
2025-12-06 12:57:17 +11:00
|
|
|
if (basepath.back() != '/') basepath += "/";
|
2025-12-05 22:12:28 +11:00
|
|
|
if (files[selectorIndex].back() == '/') {
|
|
|
|
|
basepath += files[selectorIndex].substr(0, files[selectorIndex].length() - 1);
|
|
|
|
|
loadFiles();
|
|
|
|
|
updateRequired = true;
|
|
|
|
|
} else {
|
|
|
|
|
onSelect(basepath + files[selectorIndex]);
|
|
|
|
|
}
|
2025-12-26 09:55:23 +09:00
|
|
|
} else if (inputManager.wasReleased(InputManager::BTN_BACK)) {
|
|
|
|
|
// Short press: go up one directory, or go home if at root
|
|
|
|
|
if (inputManager.getHeldTime() < GO_HOME_MS) {
|
|
|
|
|
if (basepath != "/") {
|
|
|
|
|
basepath.replace(basepath.find_last_of('/'), std::string::npos, "");
|
|
|
|
|
if (basepath.empty()) basepath = "/";
|
|
|
|
|
loadFiles();
|
|
|
|
|
updateRequired = true;
|
|
|
|
|
} else {
|
|
|
|
|
onGoHome();
|
|
|
|
|
}
|
2025-12-15 13:16:46 +01:00
|
|
|
}
|
2025-12-21 17:12:53 +11:00
|
|
|
} else if (prevReleased) {
|
|
|
|
|
if (skipPage) {
|
|
|
|
|
selectorIndex = ((selectorIndex / PAGE_ITEMS - 1) * PAGE_ITEMS + files.size()) % files.size();
|
|
|
|
|
} else {
|
|
|
|
|
selectorIndex = (selectorIndex + files.size() - 1) % files.size();
|
|
|
|
|
}
|
2025-12-06 12:35:41 +11:00
|
|
|
updateRequired = true;
|
2025-12-21 17:12:53 +11:00
|
|
|
} else if (nextReleased) {
|
|
|
|
|
if (skipPage) {
|
|
|
|
|
selectorIndex = ((selectorIndex / PAGE_ITEMS + 1) * PAGE_ITEMS) % files.size();
|
|
|
|
|
} else {
|
|
|
|
|
selectorIndex = (selectorIndex + 1) % files.size();
|
|
|
|
|
}
|
2025-12-06 12:35:41 +11:00
|
|
|
updateRequired = true;
|
2025-12-04 00:07:25 +11:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2025-12-17 23:32:18 +11:00
|
|
|
void FileSelectionActivity::displayTaskLoop() {
|
2025-12-04 00:07:25 +11:00
|
|
|
while (true) {
|
|
|
|
|
if (updateRequired) {
|
|
|
|
|
updateRequired = false;
|
2025-12-06 03:02:52 +11:00
|
|
|
xSemaphoreTake(renderingMutex, portMAX_DELAY);
|
2025-12-04 00:07:25 +11:00
|
|
|
render();
|
2025-12-06 03:02:52 +11:00
|
|
|
xSemaphoreGive(renderingMutex);
|
2025-12-04 00:07:25 +11:00
|
|
|
}
|
|
|
|
|
vTaskDelay(10 / portTICK_PERIOD_MS);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2025-12-17 23:32:18 +11:00
|
|
|
void FileSelectionActivity::render() const {
|
2025-12-06 12:56:39 +11:00
|
|
|
renderer.clearScreen();
|
2025-12-04 00:07:25 +11:00
|
|
|
|
Rotation Support (#77)
• What is the goal of this PR?
Implement a horizontal EPUB reading mode so books can be read in
landscape orientation (both 90° and 270°), while keeping the rest of the
UI in portrait.
• What changes are included?
◦ Rendering / Display
▪ Added an orientation model to GfxRenderer (Portrait, LandscapeNormal,
LandscapeFlipped) and made:
▪ drawPixel, drawImage, displayWindow map logical coordinates
differently depending on orientation.
▪ getScreenWidth() / getScreenHeight() return orientation‑aware logical
dimensions (480×800 in portrait, 800×480 in landscape).
◦ Settings / Configuration
▪ Extended CrossPointSettings with:
▪ landscapeReading (toggle for portrait vs. landscape EPUB reading).
▪ landscapeFlipped (toggle to flip landscape 180° so both horizontal
holding directions are supported).
▪ Updated settings serialization/deserialization to persist these fields
while remaining backward‑compatible with existing settings files.
▪ Updated SettingsActivity to expose two new toggles:
▪ “Landscape Reading”
▪ “Flip Landscape (swap top/bottom)”
◦ EPUB Reader
▪ In EpubReaderActivity:
▪ On onEnter, set GfxRenderer orientation based on the new settings
(Portrait, LandscapeNormal, or LandscapeFlipped).
▪ On onExit, reset orientation back to Portrait so Home, WiFi, Settings,
etc. continue to render as before.
▪ Adjusted renderStatusBar to position the status bar and battery
indicator relative to GfxRenderer::getScreenHeight() instead of
hard‑coded Y coordinates, so it stays correctly at the bottom in both
portrait and landscape.
◦ EPUB Caching / Layout
▪ Extended Section cache metadata (section.bin) to include the logical
screenWidth and screenHeight used when pages were generated; bumped
SECTION_FILE_VERSION.
▪ Updated loadCacheMetadata to compare:
▪ font/margins/line compression/extraParagraphSpacing and screen
dimensions; mismatches now invalidate and clear the cache.
▪ Updated persistPageDataToSD and all call sites in EpubReaderActivity
to pass the current GfxRenderer::getScreenWidth() / getScreenHeight() so
portrait and landscape caches are kept separate and correctly sized.
Additional Context
• Cache behavior / migration
◦ Existing section.bin files (old SECTION_FILE_VERSION) will be detected
as incompatible and their caches cleared and rebuilt once per chapter
when first opened after this change.
◦ Within a given orientation, caches will be reused as before. Switching
orientation (portrait ↔ landscape) will cause a one‑time re‑index of
each chapter in the new orientation.
• Scope and risks
◦ Orientation changes are scoped to the EPUB reader; the Home screen,
Settings, WiFi selection, sleep screens, and web server UI continue to
assume portrait orientation.
◦ The renderer’s orientation is a static/global setting; if future code
uses GfxRenderer outside the reader while a reader instance is active,
it should be aware that orientation is no longer implicitly fixed.
◦ All drawing primitives now go through orientation‑aware coordinate
transforms; any code that previously relied on edge‑case behavior or
out‑of‑bounds writes might surface as logged “Outside range” warnings
instead.
• Testing suggestions / areas to focus on
◦ Verify in hardware:
▪ Portrait mode still renders correctly (boot, home, settings, WiFi,
reader).
▪ Landscape reading in both directions:
▪ Landscape Reading = ON, Flip Landscape = OFF.
▪ Landscape Reading = ON, Flip Landscape = ON.
▪ Status bar (page X/Y, % progress, battery icon) is fully visible and
aligned at the bottom in all three combinations.
◦ Open the same book:
▪ In portrait first, then switch to landscape and reopen it.
▪ Confirm that:
▪ Old portrait caches are rebuilt once for landscape (you should see the
“Indexing…” page).
▪ Progress save/restore still works (resume opens to the correct page in
the current orientation).
◦ Ensure grayscale rendering (the secondary pass in
EpubReaderActivity::renderContents) still looks correct in both
orientations.
---------
Co-authored-by: Dave Allie <dave@daveallie.com>
2025-12-28 05:33:20 -05:00
|
|
|
const auto pageWidth = renderer.getScreenWidth();
|
2025-12-21 17:12:53 +11:00
|
|
|
renderer.drawCenteredText(READER_FONT_ID, 10, "Books", true, BOLD);
|
2025-12-04 00:07:25 +11:00
|
|
|
|
2025-12-15 13:16:46 +01:00
|
|
|
// Help text
|
2025-12-27 18:36:26 -05:00
|
|
|
renderer.drawButtonHints(UI_FONT_ID, "« Home", "Open", "", "");
|
2025-12-15 13:16:46 +01:00
|
|
|
|
2025-12-05 22:12:28 +11:00
|
|
|
if (files.empty()) {
|
2025-12-08 22:06:09 +11:00
|
|
|
renderer.drawText(UI_FONT_ID, 20, 60, "No EPUBs found");
|
2025-12-21 17:12:53 +11:00
|
|
|
renderer.displayBuffer();
|
|
|
|
|
return;
|
|
|
|
|
}
|
2025-12-04 00:07:25 +11:00
|
|
|
|
2025-12-21 17:12:53 +11:00
|
|
|
const auto pageStartIndex = selectorIndex / PAGE_ITEMS * PAGE_ITEMS;
|
2025-12-28 21:30:01 +10:00
|
|
|
renderer.fillRect(0, 60 + (selectorIndex % PAGE_ITEMS) * 30 - 2, pageWidth - 1, 30);
|
2025-12-21 17:12:53 +11:00
|
|
|
for (int i = pageStartIndex; i < files.size() && i < pageStartIndex + PAGE_ITEMS; i++) {
|
|
|
|
|
auto item = files[i];
|
|
|
|
|
int itemWidth = renderer.getTextWidth(UI_FONT_ID, item.c_str());
|
|
|
|
|
while (itemWidth > renderer.getScreenWidth() - 40 && item.length() > 8) {
|
|
|
|
|
item.replace(item.length() - 5, 5, "...");
|
|
|
|
|
itemWidth = renderer.getTextWidth(UI_FONT_ID, item.c_str());
|
2025-12-05 22:12:28 +11:00
|
|
|
}
|
2025-12-21 17:12:53 +11:00
|
|
|
renderer.drawText(UI_FONT_ID, 20, 60 + (i % PAGE_ITEMS) * 30, item.c_str(), i != selectorIndex);
|
2025-12-04 00:07:25 +11:00
|
|
|
}
|
|
|
|
|
|
2025-12-08 22:06:09 +11:00
|
|
|
renderer.displayBuffer();
|
2025-12-04 00:07:25 +11:00
|
|
|
}
|