2025-12-17 23:32:18 +11:00
|
|
|
#include "SleepActivity.h"
|
2025-12-06 04:20:03 +11:00
|
|
|
|
2026-02-09 11:52:55 -05:00
|
|
|
#include <BitmapHelpers.h>
|
2025-12-21 18:42:06 +11:00
|
|
|
#include <Epub.h>
|
2025-12-08 22:06:09 +11:00
|
|
|
#include <GfxRenderer.h>
|
2026-02-08 21:29:14 +01:00
|
|
|
#include <HalStorage.h>
|
2026-02-09 11:52:55 -05:00
|
|
|
#include <Serialization.h>
|
2026-01-14 19:36:40 +09:00
|
|
|
#include <Txt.h>
|
2025-12-28 23:56:05 +09:00
|
|
|
#include <Xtc.h>
|
2025-12-06 04:20:03 +11:00
|
|
|
|
2026-02-09 11:52:55 -05:00
|
|
|
#include <algorithm>
|
|
|
|
|
|
2025-12-15 23:17:23 +11:00
|
|
|
#include "CrossPointSettings.h"
|
2025-12-21 18:42:06 +11:00
|
|
|
#include "CrossPointState.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"
|
Aleo, Noto Sans, Open Dyslexic fonts (#163)
## Summary
* Swap out Bookerly font due to licensing issues, replace default font
with Aleo
* I did a bunch of searching around for a nice replacement font, and
this trumped several other like Literata, Merriwether, Vollkorn, etc
* Add Noto Sans, and Open Dyslexic as font options
* They can be selected in the settings screen
* Add font size options (Small, Medium, Large, Extra Large)
* Adjustable in settings
* Swap out uses of reader font in headings and replaced with slightly
larger Ubuntu font
* Replaced PixelArial14 font as it was difficult to track down, replace
with Space Grotesk
* Remove auto formatting on generated font files
* Massively speeds up formatting step now that there is a lot more CPP
font source
* Include fonts with their licenses in the repo
## Additional Context
Line compression setting will follow
| Font | Small | Medium | Large | X Large |
| --- | --- | --- | --- | --- |
| Aleo |

|

|

|

|
| Noto Sans |

|

|

|

|
| Open Dyslexic |

|

|

|

|
2025-12-30 18:21:47 +10:00
|
|
|
#include "fontIds.h"
|
2026-02-06 02:50:01 +11:00
|
|
|
#include "images/Logo120.h"
|
2026-01-07 20:07:23 +10:00
|
|
|
#include "util/StringUtils.h"
|
2025-12-28 23:56:05 +09:00
|
|
|
|
2026-02-09 11:52:55 -05:00
|
|
|
namespace {
|
|
|
|
|
|
|
|
|
|
// Number of source pixels along the image edge to average for the gradient color
|
|
|
|
|
constexpr int EDGE_SAMPLE_DEPTH = 20;
|
|
|
|
|
|
|
|
|
|
// Map a 2-bit quantized pixel value to an 8-bit grayscale value
|
|
|
|
|
constexpr uint8_t val2bitToGray(uint8_t val2bit) { return val2bit * 85; }
|
|
|
|
|
|
|
|
|
|
// Edge gradient data produced by sampleBitmapEdges and consumed by drawLetterboxGradients.
|
|
|
|
|
// edgeA is the "first" edge (top or left), edgeB is the "second" edge (bottom or right).
|
|
|
|
|
struct LetterboxGradientData {
|
|
|
|
|
uint8_t* edgeA = nullptr;
|
|
|
|
|
uint8_t* edgeB = nullptr;
|
|
|
|
|
int edgeCount = 0;
|
|
|
|
|
int letterboxA = 0; // pixel size of the first letterbox area (top or left)
|
|
|
|
|
int letterboxB = 0; // pixel size of the second letterbox area (bottom or right)
|
|
|
|
|
bool horizontal = false; // true = top/bottom letterbox, false = left/right
|
|
|
|
|
|
|
|
|
|
void free() {
|
|
|
|
|
::free(edgeA);
|
|
|
|
|
::free(edgeB);
|
|
|
|
|
edgeA = nullptr;
|
|
|
|
|
edgeB = nullptr;
|
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
// Binary cache version for edge data files
|
|
|
|
|
constexpr uint8_t EDGE_CACHE_VERSION = 1;
|
|
|
|
|
|
|
|
|
|
// Load cached edge data from a binary file. Returns true if the cache was valid and loaded successfully.
|
|
|
|
|
// Validates cache version and screen dimensions to detect stale data.
|
|
|
|
|
bool loadEdgeCache(const std::string& path, int screenWidth, int screenHeight, LetterboxGradientData& data) {
|
|
|
|
|
FsFile file;
|
|
|
|
|
if (!Storage.openFileForRead("SLP", path, file)) return false;
|
|
|
|
|
|
|
|
|
|
uint8_t version;
|
|
|
|
|
serialization::readPod(file, version);
|
|
|
|
|
if (version != EDGE_CACHE_VERSION) {
|
|
|
|
|
file.close();
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
uint16_t cachedW, cachedH;
|
|
|
|
|
serialization::readPod(file, cachedW);
|
|
|
|
|
serialization::readPod(file, cachedH);
|
|
|
|
|
if (cachedW != static_cast<uint16_t>(screenWidth) || cachedH != static_cast<uint16_t>(screenHeight)) {
|
|
|
|
|
file.close();
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
uint8_t horizontal;
|
|
|
|
|
serialization::readPod(file, horizontal);
|
|
|
|
|
data.horizontal = (horizontal != 0);
|
|
|
|
|
|
|
|
|
|
uint16_t edgeCount;
|
|
|
|
|
serialization::readPod(file, edgeCount);
|
|
|
|
|
data.edgeCount = edgeCount;
|
|
|
|
|
|
|
|
|
|
int16_t lbA, lbB;
|
|
|
|
|
serialization::readPod(file, lbA);
|
|
|
|
|
serialization::readPod(file, lbB);
|
|
|
|
|
data.letterboxA = lbA;
|
|
|
|
|
data.letterboxB = lbB;
|
|
|
|
|
|
|
|
|
|
if (edgeCount == 0 || edgeCount > 2048) {
|
|
|
|
|
file.close();
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
data.edgeA = static_cast<uint8_t*>(malloc(edgeCount));
|
|
|
|
|
data.edgeB = static_cast<uint8_t*>(malloc(edgeCount));
|
|
|
|
|
if (!data.edgeA || !data.edgeB) {
|
|
|
|
|
data.free();
|
|
|
|
|
file.close();
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (file.read(data.edgeA, edgeCount) != static_cast<int>(edgeCount) ||
|
|
|
|
|
file.read(data.edgeB, edgeCount) != static_cast<int>(edgeCount)) {
|
|
|
|
|
data.free();
|
|
|
|
|
file.close();
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
file.close();
|
|
|
|
|
Serial.printf("[%lu] [SLP] Loaded edge cache from %s (%d edges)\n", millis(), path.c_str(), edgeCount);
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Save edge data to a binary cache file for reuse on subsequent sleep screens.
|
|
|
|
|
bool saveEdgeCache(const std::string& path, int screenWidth, int screenHeight, const LetterboxGradientData& data) {
|
|
|
|
|
if (!data.edgeA || !data.edgeB || data.edgeCount <= 0) return false;
|
|
|
|
|
|
|
|
|
|
FsFile file;
|
|
|
|
|
if (!Storage.openFileForWrite("SLP", path, file)) return false;
|
|
|
|
|
|
|
|
|
|
serialization::writePod(file, EDGE_CACHE_VERSION);
|
|
|
|
|
serialization::writePod(file, static_cast<uint16_t>(screenWidth));
|
|
|
|
|
serialization::writePod(file, static_cast<uint16_t>(screenHeight));
|
|
|
|
|
serialization::writePod(file, static_cast<uint8_t>(data.horizontal ? 1 : 0));
|
|
|
|
|
serialization::writePod(file, static_cast<uint16_t>(data.edgeCount));
|
|
|
|
|
serialization::writePod(file, static_cast<int16_t>(data.letterboxA));
|
|
|
|
|
serialization::writePod(file, static_cast<int16_t>(data.letterboxB));
|
|
|
|
|
file.write(data.edgeA, data.edgeCount);
|
|
|
|
|
file.write(data.edgeB, data.edgeCount);
|
|
|
|
|
file.close();
|
|
|
|
|
|
|
|
|
|
Serial.printf("[%lu] [SLP] Saved edge cache to %s (%d edges)\n", millis(), path.c_str(), data.edgeCount);
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Read the bitmap once to sample the first/last EDGE_SAMPLE_DEPTH rows or columns.
|
|
|
|
|
// Returns edge color arrays in source pixel resolution. Caller must call data.free() when done.
|
|
|
|
|
// After sampling the bitmap is rewound via rewindToData().
|
|
|
|
|
LetterboxGradientData sampleBitmapEdges(const Bitmap& bitmap, int imgX, int imgY, int pageWidth, int pageHeight,
|
|
|
|
|
float scale, float cropX, float cropY) {
|
|
|
|
|
LetterboxGradientData data;
|
|
|
|
|
|
|
|
|
|
const int cropPixX = static_cast<int>(std::floor(bitmap.getWidth() * cropX / 2.0f));
|
|
|
|
|
const int cropPixY = static_cast<int>(std::floor(bitmap.getHeight() * cropY / 2.0f));
|
|
|
|
|
const int visibleWidth = bitmap.getWidth() - 2 * cropPixX;
|
|
|
|
|
const int visibleHeight = bitmap.getHeight() - 2 * cropPixY;
|
|
|
|
|
|
|
|
|
|
if (visibleWidth <= 0 || visibleHeight <= 0) return data;
|
|
|
|
|
|
|
|
|
|
const int outputRowSize = (bitmap.getWidth() + 3) / 4;
|
|
|
|
|
auto* outputRow = static_cast<uint8_t*>(malloc(outputRowSize));
|
|
|
|
|
auto* rowBytes = static_cast<uint8_t*>(malloc(bitmap.getRowBytes()));
|
|
|
|
|
if (!outputRow || !rowBytes) {
|
|
|
|
|
::free(outputRow);
|
|
|
|
|
::free(rowBytes);
|
|
|
|
|
return data;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (imgY > 0) {
|
|
|
|
|
// Top/bottom letterboxing -- sample per-column averages of first/last N rows
|
|
|
|
|
data.horizontal = true;
|
|
|
|
|
data.edgeCount = visibleWidth;
|
|
|
|
|
const int scaledHeight = static_cast<int>(std::round(static_cast<float>(visibleHeight) * scale));
|
|
|
|
|
data.letterboxA = imgY;
|
|
|
|
|
data.letterboxB = pageHeight - imgY - scaledHeight;
|
|
|
|
|
if (data.letterboxB < 0) data.letterboxB = 0;
|
|
|
|
|
|
|
|
|
|
const int sampleRows = std::min(EDGE_SAMPLE_DEPTH, visibleHeight);
|
|
|
|
|
|
|
|
|
|
auto* accumTop = static_cast<uint32_t*>(calloc(visibleWidth, sizeof(uint32_t)));
|
|
|
|
|
auto* accumBot = static_cast<uint32_t*>(calloc(visibleWidth, sizeof(uint32_t)));
|
|
|
|
|
data.edgeA = static_cast<uint8_t*>(malloc(visibleWidth));
|
|
|
|
|
data.edgeB = static_cast<uint8_t*>(malloc(visibleWidth));
|
|
|
|
|
|
|
|
|
|
if (!accumTop || !accumBot || !data.edgeA || !data.edgeB) {
|
|
|
|
|
::free(accumTop);
|
|
|
|
|
::free(accumBot);
|
|
|
|
|
data.free();
|
|
|
|
|
::free(outputRow);
|
|
|
|
|
::free(rowBytes);
|
|
|
|
|
return data;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
for (int bmpY = 0; bmpY < bitmap.getHeight(); bmpY++) {
|
|
|
|
|
if (bitmap.readNextRow(outputRow, rowBytes) != BmpReaderError::Ok) break;
|
|
|
|
|
const int logicalY = bitmap.isTopDown() ? bmpY : bitmap.getHeight() - 1 - bmpY;
|
|
|
|
|
if (logicalY < cropPixY || logicalY >= bitmap.getHeight() - cropPixY) continue;
|
|
|
|
|
const int outY = logicalY - cropPixY;
|
|
|
|
|
|
|
|
|
|
const bool inTop = (outY < sampleRows);
|
|
|
|
|
const bool inBot = (outY >= visibleHeight - sampleRows);
|
|
|
|
|
if (!inTop && !inBot) continue;
|
|
|
|
|
|
|
|
|
|
for (int bmpX = cropPixX; bmpX < bitmap.getWidth() - cropPixX; bmpX++) {
|
|
|
|
|
const int outX = bmpX - cropPixX;
|
|
|
|
|
const uint8_t val = (outputRow[bmpX / 4] >> (6 - ((bmpX * 2) % 8))) & 0x3;
|
|
|
|
|
const uint8_t gray = val2bitToGray(val);
|
|
|
|
|
if (inTop) accumTop[outX] += gray;
|
|
|
|
|
if (inBot) accumBot[outX] += gray;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
for (int i = 0; i < visibleWidth; i++) {
|
|
|
|
|
data.edgeA[i] = static_cast<uint8_t>(accumTop[i] / sampleRows);
|
|
|
|
|
data.edgeB[i] = static_cast<uint8_t>(accumBot[i] / sampleRows);
|
|
|
|
|
}
|
|
|
|
|
::free(accumTop);
|
|
|
|
|
::free(accumBot);
|
|
|
|
|
|
|
|
|
|
} else if (imgX > 0) {
|
|
|
|
|
// Left/right letterboxing -- sample per-row averages of first/last N columns
|
|
|
|
|
data.horizontal = false;
|
|
|
|
|
data.edgeCount = visibleHeight;
|
|
|
|
|
const int scaledWidth = static_cast<int>(std::round(static_cast<float>(visibleWidth) * scale));
|
|
|
|
|
data.letterboxA = imgX;
|
|
|
|
|
data.letterboxB = pageWidth - imgX - scaledWidth;
|
|
|
|
|
if (data.letterboxB < 0) data.letterboxB = 0;
|
|
|
|
|
|
|
|
|
|
const int sampleCols = std::min(EDGE_SAMPLE_DEPTH, visibleWidth);
|
|
|
|
|
|
|
|
|
|
auto* accumLeft = static_cast<uint32_t*>(calloc(visibleHeight, sizeof(uint32_t)));
|
|
|
|
|
auto* accumRight = static_cast<uint32_t*>(calloc(visibleHeight, sizeof(uint32_t)));
|
|
|
|
|
data.edgeA = static_cast<uint8_t*>(malloc(visibleHeight));
|
|
|
|
|
data.edgeB = static_cast<uint8_t*>(malloc(visibleHeight));
|
|
|
|
|
|
|
|
|
|
if (!accumLeft || !accumRight || !data.edgeA || !data.edgeB) {
|
|
|
|
|
::free(accumLeft);
|
|
|
|
|
::free(accumRight);
|
|
|
|
|
data.free();
|
|
|
|
|
::free(outputRow);
|
|
|
|
|
::free(rowBytes);
|
|
|
|
|
return data;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
for (int bmpY = 0; bmpY < bitmap.getHeight(); bmpY++) {
|
|
|
|
|
if (bitmap.readNextRow(outputRow, rowBytes) != BmpReaderError::Ok) break;
|
|
|
|
|
const int logicalY = bitmap.isTopDown() ? bmpY : bitmap.getHeight() - 1 - bmpY;
|
|
|
|
|
if (logicalY < cropPixY || logicalY >= bitmap.getHeight() - cropPixY) continue;
|
|
|
|
|
const int outY = logicalY - cropPixY;
|
|
|
|
|
|
|
|
|
|
// Sample left edge columns
|
|
|
|
|
for (int bmpX = cropPixX; bmpX < cropPixX + sampleCols; bmpX++) {
|
|
|
|
|
const uint8_t val = (outputRow[bmpX / 4] >> (6 - ((bmpX * 2) % 8))) & 0x3;
|
|
|
|
|
accumLeft[outY] += val2bitToGray(val);
|
|
|
|
|
}
|
|
|
|
|
// Sample right edge columns
|
|
|
|
|
for (int bmpX = bitmap.getWidth() - cropPixX - sampleCols; bmpX < bitmap.getWidth() - cropPixX; bmpX++) {
|
|
|
|
|
const uint8_t val = (outputRow[bmpX / 4] >> (6 - ((bmpX * 2) % 8))) & 0x3;
|
|
|
|
|
accumRight[outY] += val2bitToGray(val);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
for (int i = 0; i < visibleHeight; i++) {
|
|
|
|
|
data.edgeA[i] = static_cast<uint8_t>(accumLeft[i] / sampleCols);
|
|
|
|
|
data.edgeB[i] = static_cast<uint8_t>(accumRight[i] / sampleCols);
|
|
|
|
|
}
|
|
|
|
|
::free(accumLeft);
|
|
|
|
|
::free(accumRight);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
::free(outputRow);
|
|
|
|
|
::free(rowBytes);
|
|
|
|
|
bitmap.rewindToData();
|
|
|
|
|
return data;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Draw dithered fills in the letterbox areas using the sampled edge colors.
|
|
|
|
|
// fillMode selects the fill algorithm: SOLID (single dominant shade), BLENDED (per-pixel edge color),
|
|
|
|
|
// or GRADIENT (per-pixel edge color interpolated toward targetColor).
|
|
|
|
|
// targetColor is the color the gradient fades toward (255=white, 0=black); only used in GRADIENT mode.
|
|
|
|
|
// Must be called once per render pass (BW, GRAYSCALE_LSB, GRAYSCALE_MSB).
|
|
|
|
|
void drawLetterboxFill(GfxRenderer& renderer, const LetterboxGradientData& data, float scale, uint8_t fillMode,
|
|
|
|
|
int targetColor) {
|
|
|
|
|
if (!data.edgeA || !data.edgeB || data.edgeCount <= 0) return;
|
|
|
|
|
|
|
|
|
|
const bool isSolid = (fillMode == CrossPointSettings::SLEEP_SCREEN_LETTERBOX_FILL::LETTERBOX_SOLID);
|
|
|
|
|
const bool isGradient = (fillMode == CrossPointSettings::SLEEP_SCREEN_LETTERBOX_FILL::LETTERBOX_GRADIENT);
|
|
|
|
|
|
|
|
|
|
// For SOLID mode, compute the dominant (average) shade for each edge once
|
|
|
|
|
uint8_t solidColorA = 0, solidColorB = 0;
|
|
|
|
|
if (isSolid) {
|
|
|
|
|
uint32_t sumA = 0, sumB = 0;
|
|
|
|
|
for (int i = 0; i < data.edgeCount; i++) {
|
|
|
|
|
sumA += data.edgeA[i];
|
|
|
|
|
sumB += data.edgeB[i];
|
|
|
|
|
}
|
|
|
|
|
solidColorA = static_cast<uint8_t>(sumA / data.edgeCount);
|
|
|
|
|
solidColorB = static_cast<uint8_t>(sumB / data.edgeCount);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Helper: compute gray value for a pixel given the edge color and interpolation factor t (0..1)
|
|
|
|
|
// GRADIENT interpolates from edgeColor toward targetColor; SOLID and BLENDED return edgeColor directly.
|
|
|
|
|
auto computeGray = [&](int edgeColor, float t) -> int {
|
|
|
|
|
if (isGradient) return edgeColor + static_cast<int>(static_cast<float>(targetColor - edgeColor) * t);
|
|
|
|
|
return edgeColor;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
if (data.horizontal) {
|
|
|
|
|
// Top letterbox
|
|
|
|
|
if (data.letterboxA > 0) {
|
|
|
|
|
const int imgTopY = data.letterboxA;
|
|
|
|
|
for (int screenY = 0; screenY < imgTopY; screenY++) {
|
|
|
|
|
const float t = static_cast<float>(imgTopY - screenY) / static_cast<float>(imgTopY);
|
|
|
|
|
for (int screenX = 0; screenX < renderer.getScreenWidth(); screenX++) {
|
|
|
|
|
int edgeColor;
|
|
|
|
|
if (isSolid) {
|
|
|
|
|
edgeColor = solidColorA;
|
|
|
|
|
} else {
|
|
|
|
|
int srcCol = static_cast<int>(screenX / scale);
|
|
|
|
|
srcCol = std::max(0, std::min(srcCol, data.edgeCount - 1));
|
|
|
|
|
edgeColor = data.edgeA[srcCol];
|
|
|
|
|
}
|
|
|
|
|
const int gray = computeGray(edgeColor, t);
|
|
|
|
|
renderer.drawPixelGray(screenX, screenY, quantizeNoiseDither(gray, screenX, screenY));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Bottom letterbox
|
|
|
|
|
if (data.letterboxB > 0) {
|
|
|
|
|
const int imgBottomY = renderer.getScreenHeight() - data.letterboxB;
|
|
|
|
|
for (int screenY = imgBottomY; screenY < renderer.getScreenHeight(); screenY++) {
|
|
|
|
|
const float t = static_cast<float>(screenY - imgBottomY + 1) / static_cast<float>(data.letterboxB);
|
|
|
|
|
for (int screenX = 0; screenX < renderer.getScreenWidth(); screenX++) {
|
|
|
|
|
int edgeColor;
|
|
|
|
|
if (isSolid) {
|
|
|
|
|
edgeColor = solidColorB;
|
|
|
|
|
} else {
|
|
|
|
|
int srcCol = static_cast<int>(screenX / scale);
|
|
|
|
|
srcCol = std::max(0, std::min(srcCol, data.edgeCount - 1));
|
|
|
|
|
edgeColor = data.edgeB[srcCol];
|
|
|
|
|
}
|
|
|
|
|
const int gray = computeGray(edgeColor, t);
|
|
|
|
|
renderer.drawPixelGray(screenX, screenY, quantizeNoiseDither(gray, screenX, screenY));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
// Left letterbox
|
|
|
|
|
if (data.letterboxA > 0) {
|
|
|
|
|
const int imgLeftX = data.letterboxA;
|
|
|
|
|
for (int screenX = 0; screenX < imgLeftX; screenX++) {
|
|
|
|
|
const float t = static_cast<float>(imgLeftX - screenX) / static_cast<float>(imgLeftX);
|
|
|
|
|
for (int screenY = 0; screenY < renderer.getScreenHeight(); screenY++) {
|
|
|
|
|
int edgeColor;
|
|
|
|
|
if (isSolid) {
|
|
|
|
|
edgeColor = solidColorA;
|
|
|
|
|
} else {
|
|
|
|
|
int srcRow = static_cast<int>(screenY / scale);
|
|
|
|
|
srcRow = std::max(0, std::min(srcRow, data.edgeCount - 1));
|
|
|
|
|
edgeColor = data.edgeA[srcRow];
|
|
|
|
|
}
|
|
|
|
|
const int gray = computeGray(edgeColor, t);
|
|
|
|
|
renderer.drawPixelGray(screenX, screenY, quantizeNoiseDither(gray, screenX, screenY));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Right letterbox
|
|
|
|
|
if (data.letterboxB > 0) {
|
|
|
|
|
const int imgRightX = renderer.getScreenWidth() - data.letterboxB;
|
|
|
|
|
for (int screenX = imgRightX; screenX < renderer.getScreenWidth(); screenX++) {
|
|
|
|
|
const float t = static_cast<float>(screenX - imgRightX + 1) / static_cast<float>(data.letterboxB);
|
|
|
|
|
for (int screenY = 0; screenY < renderer.getScreenHeight(); screenY++) {
|
|
|
|
|
int edgeColor;
|
|
|
|
|
if (isSolid) {
|
|
|
|
|
edgeColor = solidColorB;
|
|
|
|
|
} else {
|
|
|
|
|
int srcRow = static_cast<int>(screenY / scale);
|
|
|
|
|
srcRow = std::max(0, std::min(srcRow, data.edgeCount - 1));
|
|
|
|
|
edgeColor = data.edgeB[srcRow];
|
|
|
|
|
}
|
|
|
|
|
const int gray = computeGray(edgeColor, t);
|
|
|
|
|
renderer.drawPixelGray(screenX, screenY, quantizeNoiseDither(gray, screenX, screenY));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
} // namespace
|
|
|
|
|
|
2025-12-17 23:32:18 +11:00
|
|
|
void SleepActivity::onEnter() {
|
2025-12-21 21:17:00 +11:00
|
|
|
Activity::onEnter();
|
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.drawPopup(renderer, "Entering Sleep...");
|
2025-12-21 18:42:06 +11:00
|
|
|
|
2026-02-05 18:46:14 +07:00
|
|
|
switch (SETTINGS.sleepScreen) {
|
|
|
|
|
case (CrossPointSettings::SLEEP_SCREEN_MODE::BLANK):
|
|
|
|
|
return renderBlankSleepScreen();
|
|
|
|
|
case (CrossPointSettings::SLEEP_SCREEN_MODE::CUSTOM):
|
|
|
|
|
return renderCustomSleepScreen();
|
|
|
|
|
case (CrossPointSettings::SLEEP_SCREEN_MODE::COVER):
|
|
|
|
|
case (CrossPointSettings::SLEEP_SCREEN_MODE::COVER_CUSTOM):
|
|
|
|
|
return renderCoverSleepScreen();
|
|
|
|
|
default:
|
|
|
|
|
return renderDefaultSleepScreen();
|
2025-12-21 18:42:06 +11:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void SleepActivity::renderCustomSleepScreen() const {
|
2025-12-19 14:17:26 +01:00
|
|
|
// Check if we have a /sleep directory
|
2026-02-08 21:29:14 +01:00
|
|
|
auto dir = Storage.open("/sleep");
|
2025-12-19 14:17:26 +01:00
|
|
|
if (dir && dir.isDirectory()) {
|
|
|
|
|
std::vector<std::string> files;
|
2026-01-07 22:43:19 +10:00
|
|
|
char name[500];
|
2025-12-19 14:17:26 +01:00
|
|
|
// collect all valid BMP files
|
2025-12-30 15:09:30 +10:00
|
|
|
for (auto file = dir.openNextFile(); file; file = dir.openNextFile()) {
|
2025-12-19 14:17:26 +01:00
|
|
|
if (file.isDirectory()) {
|
|
|
|
|
file.close();
|
|
|
|
|
continue;
|
|
|
|
|
}
|
2025-12-30 15:09:30 +10:00
|
|
|
file.getName(name, sizeof(name));
|
|
|
|
|
auto filename = std::string(name);
|
2025-12-19 14:17:26 +01:00
|
|
|
if (filename[0] == '.') {
|
|
|
|
|
file.close();
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (filename.substr(filename.length() - 4) != ".bmp") {
|
2025-12-30 15:09:30 +10:00
|
|
|
Serial.printf("[%lu] [SLP] Skipping non-.bmp file name: %s\n", millis(), name);
|
2025-12-19 14:17:26 +01:00
|
|
|
file.close();
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
Bitmap bitmap(file);
|
|
|
|
|
if (bitmap.parseHeaders() != BmpReaderError::Ok) {
|
2025-12-30 15:09:30 +10:00
|
|
|
Serial.printf("[%lu] [SLP] Skipping invalid BMP file: %s\n", millis(), name);
|
2025-12-19 14:17:26 +01:00
|
|
|
file.close();
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
files.emplace_back(filename);
|
|
|
|
|
file.close();
|
|
|
|
|
}
|
2025-12-21 18:42:06 +11:00
|
|
|
const auto numFiles = files.size();
|
2025-12-19 14:17:26 +01:00
|
|
|
if (numFiles > 0) {
|
|
|
|
|
// Generate a random number between 1 and numFiles
|
2026-01-14 05:05:08 -05:00
|
|
|
auto randomFileIndex = random(numFiles);
|
|
|
|
|
// If we picked the same image as last time, reroll
|
|
|
|
|
while (numFiles > 1 && randomFileIndex == APP_STATE.lastSleepImage) {
|
|
|
|
|
randomFileIndex = random(numFiles);
|
|
|
|
|
}
|
|
|
|
|
APP_STATE.lastSleepImage = randomFileIndex;
|
|
|
|
|
APP_STATE.saveToFile();
|
2025-12-21 18:42:06 +11:00
|
|
|
const auto filename = "/sleep/" + files[randomFileIndex];
|
2025-12-30 15:09:30 +10:00
|
|
|
FsFile file;
|
2026-02-08 21:29:14 +01:00
|
|
|
if (Storage.openFileForRead("SLP", filename, file)) {
|
2025-12-21 18:42:06 +11:00
|
|
|
Serial.printf("[%lu] [SLP] Randomly loading: /sleep/%s\n", millis(), files[randomFileIndex].c_str());
|
2025-12-19 14:17:26 +01:00
|
|
|
delay(100);
|
2026-01-12 12:36:19 +01:00
|
|
|
Bitmap bitmap(file, true);
|
2025-12-19 14:17:26 +01:00
|
|
|
if (bitmap.parseHeaders() == BmpReaderError::Ok) {
|
2025-12-21 18:42:06 +11:00
|
|
|
renderBitmapSleepScreen(bitmap);
|
2025-12-19 14:17:26 +01:00
|
|
|
dir.close();
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (dir) dir.close();
|
|
|
|
|
|
2025-12-19 08:45:14 +11:00
|
|
|
// Look for sleep.bmp on the root of the sd card to determine if we should
|
|
|
|
|
// render a custom sleep screen instead of the default.
|
2025-12-30 15:09:30 +10:00
|
|
|
FsFile file;
|
2026-02-08 21:29:14 +01:00
|
|
|
if (Storage.openFileForRead("SLP", "/sleep.bmp", file)) {
|
2026-01-12 12:36:19 +01:00
|
|
|
Bitmap bitmap(file, true);
|
2025-12-19 08:45:14 +11:00
|
|
|
if (bitmap.parseHeaders() == BmpReaderError::Ok) {
|
2025-12-21 18:42:06 +11:00
|
|
|
Serial.printf("[%lu] [SLP] Loading: /sleep.bmp\n", millis());
|
|
|
|
|
renderBitmapSleepScreen(bitmap);
|
2025-12-19 08:45:14 +11:00
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
renderDefaultSleepScreen();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void SleepActivity::renderDefaultSleepScreen() const {
|
2025-12-21 18:42:06 +11:00
|
|
|
const auto pageWidth = renderer.getScreenWidth();
|
|
|
|
|
const auto pageHeight = renderer.getScreenHeight();
|
2025-12-08 19:48:49 +11:00
|
|
|
|
|
|
|
|
renderer.clearScreen();
|
2026-02-06 02:50:01 +11:00
|
|
|
renderer.drawImage(Logo120, (pageWidth - 120) / 2, (pageHeight - 120) / 2, 120, 120);
|
2025-12-31 12:11:36 +10:00
|
|
|
renderer.drawCenteredText(UI_10_FONT_ID, pageHeight / 2 + 70, "CrossPoint", true, EpdFontFamily::BOLD);
|
2025-12-08 22:52:19 +11:00
|
|
|
renderer.drawCenteredText(SMALL_FONT_ID, pageHeight / 2 + 95, "SLEEPING");
|
2025-12-15 13:16:46 +01:00
|
|
|
|
2025-12-21 18:42:06 +11:00
|
|
|
// Make sleep screen dark unless light is selected in settings
|
|
|
|
|
if (SETTINGS.sleepScreen != CrossPointSettings::SLEEP_SCREEN_MODE::LIGHT) {
|
2025-12-15 13:16:46 +01:00
|
|
|
renderer.invertScreen();
|
|
|
|
|
}
|
|
|
|
|
|
2026-01-27 18:50:15 +01:00
|
|
|
renderer.displayBuffer(HalDisplay::HALF_REFRESH);
|
2025-12-08 19:48:49 +11:00
|
|
|
}
|
2025-12-19 08:45:14 +11:00
|
|
|
|
2026-02-09 11:52:55 -05:00
|
|
|
void SleepActivity::renderBitmapSleepScreen(const Bitmap& bitmap, const std::string& edgeCachePath) const {
|
2025-12-19 08:45:14 +11:00
|
|
|
int x, y;
|
2025-12-21 18:42:06 +11:00
|
|
|
const auto pageWidth = renderer.getScreenWidth();
|
|
|
|
|
const auto pageHeight = renderer.getScreenHeight();
|
2026-01-05 11:07:27 +01:00
|
|
|
float cropX = 0, cropY = 0;
|
2025-12-19 08:45:14 +11:00
|
|
|
|
2026-01-05 11:07:27 +01:00
|
|
|
Serial.printf("[%lu] [SLP] bitmap %d x %d, screen %d x %d\n", millis(), bitmap.getWidth(), bitmap.getHeight(),
|
|
|
|
|
pageWidth, pageHeight);
|
2026-02-09 11:52:55 -05:00
|
|
|
|
|
|
|
|
// Always compute aspect-ratio-preserving scale and position (supports both larger and smaller images)
|
|
|
|
|
float ratio = static_cast<float>(bitmap.getWidth()) / static_cast<float>(bitmap.getHeight());
|
|
|
|
|
const float screenRatio = static_cast<float>(pageWidth) / static_cast<float>(pageHeight);
|
|
|
|
|
|
|
|
|
|
Serial.printf("[%lu] [SLP] bitmap ratio: %f, screen ratio: %f\n", millis(), ratio, screenRatio);
|
|
|
|
|
if (ratio > screenRatio) {
|
|
|
|
|
// image wider than viewport ratio, needs to be centered vertically
|
|
|
|
|
if (SETTINGS.sleepScreenCoverMode == CrossPointSettings::SLEEP_SCREEN_COVER_MODE::CROP) {
|
|
|
|
|
cropX = 1.0f - (screenRatio / ratio);
|
|
|
|
|
Serial.printf("[%lu] [SLP] Cropping bitmap x: %f\n", millis(), cropX);
|
|
|
|
|
ratio = (1.0f - cropX) * static_cast<float>(bitmap.getWidth()) / static_cast<float>(bitmap.getHeight());
|
2025-12-19 08:45:14 +11:00
|
|
|
}
|
2026-02-09 11:52:55 -05:00
|
|
|
x = 0;
|
|
|
|
|
y = std::round((static_cast<float>(pageHeight) - static_cast<float>(pageWidth) / ratio) / 2);
|
|
|
|
|
Serial.printf("[%lu] [SLP] Centering with ratio %f to y=%d\n", millis(), ratio, y);
|
2025-12-19 08:45:14 +11:00
|
|
|
} else {
|
2026-02-09 11:52:55 -05:00
|
|
|
// image taller than or equal to viewport ratio, needs to be centered horizontally
|
|
|
|
|
if (SETTINGS.sleepScreenCoverMode == CrossPointSettings::SLEEP_SCREEN_COVER_MODE::CROP) {
|
|
|
|
|
cropY = 1.0f - (ratio / screenRatio);
|
|
|
|
|
Serial.printf("[%lu] [SLP] Cropping bitmap y: %f\n", millis(), cropY);
|
|
|
|
|
ratio = static_cast<float>(bitmap.getWidth()) / ((1.0f - cropY) * static_cast<float>(bitmap.getHeight()));
|
|
|
|
|
}
|
|
|
|
|
x = std::round((static_cast<float>(pageWidth) - static_cast<float>(pageHeight) * ratio) / 2);
|
|
|
|
|
y = 0;
|
|
|
|
|
Serial.printf("[%lu] [SLP] Centering with ratio %f to x=%d\n", millis(), ratio, x);
|
2025-12-19 08:45:14 +11:00
|
|
|
}
|
|
|
|
|
|
2026-01-05 11:07:27 +01:00
|
|
|
Serial.printf("[%lu] [SLP] drawing to %d x %d\n", millis(), x, y);
|
2026-02-09 11:52:55 -05:00
|
|
|
|
|
|
|
|
// Compute the scale factor (same formula as drawBitmap) so we can map screen coords to source coords
|
|
|
|
|
const float effectiveWidth = (1.0f - cropX) * bitmap.getWidth();
|
|
|
|
|
const float effectiveHeight = (1.0f - cropY) * bitmap.getHeight();
|
|
|
|
|
const float scale =
|
|
|
|
|
std::min(static_cast<float>(pageWidth) / effectiveWidth, static_cast<float>(pageHeight) / effectiveHeight);
|
|
|
|
|
|
|
|
|
|
// Determine letterbox fill settings
|
|
|
|
|
const uint8_t fillMode = SETTINGS.sleepScreenLetterboxFill;
|
|
|
|
|
const bool wantFill = (fillMode != CrossPointSettings::SLEEP_SCREEN_LETTERBOX_FILL::LETTERBOX_NONE);
|
|
|
|
|
const int targetColor =
|
|
|
|
|
(SETTINGS.sleepScreenGradientDir == CrossPointSettings::SLEEP_SCREEN_GRADIENT_DIR::GRADIENT_TO_BLACK) ? 0 : 255;
|
|
|
|
|
|
|
|
|
|
static const char* fillModeNames[] = {"none", "solid", "blended", "gradient"};
|
|
|
|
|
const char* fillModeName = (fillMode < 4) ? fillModeNames[fillMode] : "unknown";
|
|
|
|
|
|
|
|
|
|
// Load cached edge data or sample from bitmap (first pass over bitmap, then rewind)
|
|
|
|
|
LetterboxGradientData gradientData;
|
|
|
|
|
const bool hasLetterbox = (x > 0 || y > 0);
|
|
|
|
|
if (hasLetterbox && wantFill) {
|
|
|
|
|
bool cacheLoaded = false;
|
|
|
|
|
if (!edgeCachePath.empty()) {
|
|
|
|
|
cacheLoaded = loadEdgeCache(edgeCachePath, pageWidth, pageHeight, gradientData);
|
|
|
|
|
}
|
|
|
|
|
if (!cacheLoaded) {
|
|
|
|
|
Serial.printf("[%lu] [SLP] Letterbox detected (x=%d, y=%d), sampling edges for %s fill\n", millis(), x, y,
|
|
|
|
|
fillModeName);
|
|
|
|
|
gradientData = sampleBitmapEdges(bitmap, x, y, pageWidth, pageHeight, scale, cropX, cropY);
|
|
|
|
|
if (!edgeCachePath.empty() && gradientData.edgeA) {
|
|
|
|
|
saveEdgeCache(edgeCachePath, pageWidth, pageHeight, gradientData);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2025-12-19 08:45:14 +11:00
|
|
|
renderer.clearScreen();
|
2026-01-27 13:21:59 +00:00
|
|
|
|
|
|
|
|
const bool hasGreyscale = bitmap.hasGreyscale() &&
|
|
|
|
|
SETTINGS.sleepScreenCoverFilter == CrossPointSettings::SLEEP_SCREEN_COVER_FILTER::NO_FILTER;
|
|
|
|
|
|
2026-02-09 11:52:55 -05:00
|
|
|
// Draw letterbox fill (BW pass)
|
|
|
|
|
if (gradientData.edgeA) {
|
|
|
|
|
drawLetterboxFill(renderer, gradientData, scale, fillMode, targetColor);
|
|
|
|
|
}
|
|
|
|
|
|
2026-01-05 11:07:27 +01:00
|
|
|
renderer.drawBitmap(bitmap, x, y, pageWidth, pageHeight, cropX, cropY);
|
2026-01-27 13:21:59 +00:00
|
|
|
|
|
|
|
|
if (SETTINGS.sleepScreenCoverFilter == CrossPointSettings::SLEEP_SCREEN_COVER_FILTER::INVERTED_BLACK_AND_WHITE) {
|
|
|
|
|
renderer.invertScreen();
|
|
|
|
|
}
|
|
|
|
|
|
2026-01-27 18:50:15 +01:00
|
|
|
renderer.displayBuffer(HalDisplay::HALF_REFRESH);
|
2025-12-19 08:45:14 +11:00
|
|
|
|
2026-01-27 13:21:59 +00:00
|
|
|
if (hasGreyscale) {
|
2025-12-19 08:45:14 +11:00
|
|
|
bitmap.rewindToData();
|
|
|
|
|
renderer.clearScreen(0x00);
|
|
|
|
|
renderer.setRenderMode(GfxRenderer::GRAYSCALE_LSB);
|
2026-02-09 11:52:55 -05:00
|
|
|
if (gradientData.edgeA) {
|
|
|
|
|
drawLetterboxFill(renderer, gradientData, scale, fillMode, targetColor);
|
|
|
|
|
}
|
2026-01-05 11:07:27 +01:00
|
|
|
renderer.drawBitmap(bitmap, x, y, pageWidth, pageHeight, cropX, cropY);
|
2025-12-19 08:45:14 +11:00
|
|
|
renderer.copyGrayscaleLsbBuffers();
|
|
|
|
|
|
|
|
|
|
bitmap.rewindToData();
|
|
|
|
|
renderer.clearScreen(0x00);
|
|
|
|
|
renderer.setRenderMode(GfxRenderer::GRAYSCALE_MSB);
|
2026-02-09 11:52:55 -05:00
|
|
|
if (gradientData.edgeA) {
|
|
|
|
|
drawLetterboxFill(renderer, gradientData, scale, fillMode, targetColor);
|
|
|
|
|
}
|
2026-01-05 11:07:27 +01:00
|
|
|
renderer.drawBitmap(bitmap, x, y, pageWidth, pageHeight, cropX, cropY);
|
2025-12-19 08:45:14 +11:00
|
|
|
renderer.copyGrayscaleMsbBuffers();
|
|
|
|
|
|
|
|
|
|
renderer.displayGrayBuffer();
|
|
|
|
|
renderer.setRenderMode(GfxRenderer::BW);
|
|
|
|
|
}
|
2026-02-09 11:52:55 -05:00
|
|
|
|
|
|
|
|
gradientData.free();
|
2025-12-19 08:45:14 +11:00
|
|
|
}
|
2025-12-21 18:42:06 +11:00
|
|
|
|
|
|
|
|
void SleepActivity::renderCoverSleepScreen() const {
|
2026-02-05 18:46:14 +07:00
|
|
|
void (SleepActivity::*renderNoCoverSleepScreen)() const;
|
|
|
|
|
switch (SETTINGS.sleepScreen) {
|
|
|
|
|
case (CrossPointSettings::SLEEP_SCREEN_MODE::COVER_CUSTOM):
|
|
|
|
|
renderNoCoverSleepScreen = &SleepActivity::renderCustomSleepScreen;
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
renderNoCoverSleepScreen = &SleepActivity::renderDefaultSleepScreen;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
2025-12-21 21:17:00 +11:00
|
|
|
if (APP_STATE.openEpubPath.empty()) {
|
2026-02-05 18:46:14 +07:00
|
|
|
return (this->*renderNoCoverSleepScreen)();
|
2025-12-21 21:17:00 +11:00
|
|
|
}
|
|
|
|
|
|
2025-12-28 23:56:05 +09:00
|
|
|
std::string coverBmpPath;
|
2026-01-12 10:55:47 +01:00
|
|
|
bool cropped = SETTINGS.sleepScreenCoverMode == CrossPointSettings::SLEEP_SCREEN_COVER_MODE::CROP;
|
2025-12-21 21:17:00 +11:00
|
|
|
|
2026-01-14 19:36:40 +09:00
|
|
|
// Check if the current book is XTC, TXT, or EPUB
|
2026-01-07 20:07:23 +10:00
|
|
|
if (StringUtils::checkFileExtension(APP_STATE.openEpubPath, ".xtc") ||
|
|
|
|
|
StringUtils::checkFileExtension(APP_STATE.openEpubPath, ".xtch")) {
|
2025-12-28 23:56:05 +09:00
|
|
|
// Handle XTC file
|
|
|
|
|
Xtc lastXtc(APP_STATE.openEpubPath, "/.crosspoint");
|
|
|
|
|
if (!lastXtc.load()) {
|
2026-02-11 16:25:17 +01:00
|
|
|
Serial.printf("[%lu] [SLP] Failed to load last XTC\n", millis());
|
2026-02-05 18:46:14 +07:00
|
|
|
return (this->*renderNoCoverSleepScreen)();
|
2025-12-28 23:56:05 +09:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!lastXtc.generateCoverBmp()) {
|
2026-02-11 16:25:17 +01:00
|
|
|
Serial.printf("[%lu] [SLP] Failed to generate XTC cover bmp\n", millis());
|
2026-02-05 18:46:14 +07:00
|
|
|
return (this->*renderNoCoverSleepScreen)();
|
2025-12-28 23:56:05 +09:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
coverBmpPath = lastXtc.getCoverBmpPath();
|
2026-01-14 19:36:40 +09:00
|
|
|
} else if (StringUtils::checkFileExtension(APP_STATE.openEpubPath, ".txt")) {
|
|
|
|
|
// Handle TXT file - looks for cover image in the same folder
|
|
|
|
|
Txt lastTxt(APP_STATE.openEpubPath, "/.crosspoint");
|
|
|
|
|
if (!lastTxt.load()) {
|
2026-02-11 16:25:17 +01:00
|
|
|
Serial.printf("[%lu] [SLP] Failed to load last TXT\n", millis());
|
2026-02-05 18:46:14 +07:00
|
|
|
return (this->*renderNoCoverSleepScreen)();
|
2026-01-14 19:36:40 +09:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!lastTxt.generateCoverBmp()) {
|
2026-02-11 16:25:17 +01:00
|
|
|
Serial.printf("[%lu] [SLP] No cover image found for TXT file\n", millis());
|
2026-02-05 18:46:14 +07:00
|
|
|
return (this->*renderNoCoverSleepScreen)();
|
2026-01-14 19:36:40 +09:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
coverBmpPath = lastTxt.getCoverBmpPath();
|
2026-01-07 20:07:23 +10:00
|
|
|
} else if (StringUtils::checkFileExtension(APP_STATE.openEpubPath, ".epub")) {
|
2025-12-28 23:56:05 +09:00
|
|
|
// Handle EPUB file
|
|
|
|
|
Epub lastEpub(APP_STATE.openEpubPath, "/.crosspoint");
|
feat: Add CSS parsing and CSS support in EPUBs (#411)
## Summary
* **What is the goal of this PR?**
- Adds basic CSS parsing to EPUBs and determine the CSS rules when
rendering to the screen so that text is styled correctly. Currently
supports bold, underline, italics, margin, padding, and text alignment
## Additional Context
- My main reason for wanting this is that the book I'm currently
reading, Carl's Doomsday Scenario (2nd in the Dungeon Crawler Carl
series), relies _a lot_ on styled text for telling parts of the story.
When text is bolded, it's supposed to be a message that's rendered
"on-screen" in the story. When characters are "chatting" with each
other, the text is bolded and their names are underlined. Plus, normal
emphasis is provided with italicizing words here and there. So, this
greatly improves my experience reading this book on the Xteink, and I
figured it was useful enough for others too.
- For transparency: I'm a software engineer, but I'm mostly frontend and
TypeScript/JavaScript. It's been _years_ since I did any C/C++, so I
would not be surprised if I'm doing something dumb along the way in this
code. Please don't hesitate to ask for changes if something looks off. I
heavily relied on Claude Code for help, and I had a lot of inspiration
from how [microreader](https://github.com/CidVonHighwind/microreader)
achieves their CSS parsing and styling. I did give this as good of a
code review as I could and went through everything, and _it works on my
machine_ 😄
### Before


### After


---
### AI Usage
Did you use AI tools to help write this code? **YES**, Claude Code
2026-02-05 05:28:10 -05:00
|
|
|
// Skip loading css since we only need metadata here
|
|
|
|
|
if (!lastEpub.load(true, true)) {
|
2026-02-11 16:25:17 +01:00
|
|
|
Serial.printf("[%lu] [SLP] Failed to load last epub\n", millis());
|
2026-02-05 18:46:14 +07:00
|
|
|
return (this->*renderNoCoverSleepScreen)();
|
2025-12-28 23:56:05 +09:00
|
|
|
}
|
|
|
|
|
|
2026-01-12 10:55:47 +01:00
|
|
|
if (!lastEpub.generateCoverBmp(cropped)) {
|
2026-02-11 16:25:17 +01:00
|
|
|
Serial.printf("[%lu] [SLP] Failed to generate cover bmp\n", millis());
|
2026-02-05 18:46:14 +07:00
|
|
|
return (this->*renderNoCoverSleepScreen)();
|
2025-12-28 23:56:05 +09:00
|
|
|
}
|
|
|
|
|
|
2026-01-12 10:55:47 +01:00
|
|
|
coverBmpPath = lastEpub.getCoverBmpPath(cropped);
|
2026-01-07 20:07:23 +10:00
|
|
|
} else {
|
2026-02-05 18:46:14 +07:00
|
|
|
return (this->*renderNoCoverSleepScreen)();
|
2025-12-21 18:42:06 +11:00
|
|
|
}
|
|
|
|
|
|
2026-02-09 11:52:55 -05:00
|
|
|
// Derive edge cache path from cover BMP path (e.g. cover.bmp -> cover_edges.bin)
|
|
|
|
|
std::string edgeCachePath;
|
|
|
|
|
if (coverBmpPath.size() > 4) {
|
|
|
|
|
edgeCachePath = coverBmpPath.substr(0, coverBmpPath.size() - 4) + "_edges.bin";
|
|
|
|
|
}
|
|
|
|
|
|
2025-12-30 15:09:30 +10:00
|
|
|
FsFile file;
|
2026-02-08 21:29:14 +01:00
|
|
|
if (Storage.openFileForRead("SLP", coverBmpPath, file)) {
|
2025-12-21 18:42:06 +11:00
|
|
|
Bitmap bitmap(file);
|
|
|
|
|
if (bitmap.parseHeaders() == BmpReaderError::Ok) {
|
2026-02-11 16:25:17 +01:00
|
|
|
Serial.printf("[%lu] [SLP] Rendering sleep cover: %s\n", millis(), coverBmpPath.c_str());
|
2026-02-09 11:52:55 -05:00
|
|
|
renderBitmapSleepScreen(bitmap, edgeCachePath);
|
2025-12-21 18:42:06 +11:00
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2026-02-05 18:46:14 +07:00
|
|
|
return (this->*renderNoCoverSleepScreen)();
|
2025-12-21 18:42:06 +11:00
|
|
|
}
|
2026-01-05 10:08:39 +01:00
|
|
|
|
|
|
|
|
void SleepActivity::renderBlankSleepScreen() const {
|
|
|
|
|
renderer.clearScreen();
|
2026-01-27 18:50:15 +01:00
|
|
|
renderer.displayBuffer(HalDisplay::HALF_REFRESH);
|
2026-01-05 10:08:39 +01:00
|
|
|
}
|