snark13/Xteink-X4-crosspoint-reader
1
0
Fork 0
mirror of https://github.com/daveallie/crosspoint-reader.git synced 2026-02-04 22:57:50 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix: reset clang correctly

Browse Source
This commit is contained in:
Brackyt 2026-01-25 17:48:57 +01:00
parent 1fab1f9ec5
commit dccd200b86
20 changed files with 720 additions and 937 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

205
lib/GfxRenderer/Bitmap.cpp
View File

@ -1,8 +1,10 @@
#include "Bitmap.h"
#include "BitmapHelpers.h"
#include <cstdlib>
#include <cstring>
#include "BitmapHelpers.h"
// ============================================================================
// IMAGE PROCESSING OPTIONS
// ============================================================================
@ -31,13 +33,12 @@ int Bitmap::readByte() const {
return -1;
}
size_t Bitmap::readBytes(void *buf, size_t count) const {
size_t Bitmap::readBytes(void* buf, size_t count) const {
if (file && *file) {
return file->read(buf, count);
} else if (memoryBuffer) {
size_t available = memorySize - bufferPos;
if (count > available)
count = available;
if (count > available) count = available;
memcpy(buf, memoryBuffer + bufferPos, count);
bufferPos += count;
return count;
@ -74,8 +75,7 @@ bool Bitmap::seekCur(int32_t offset) const {
uint16_t Bitmap::readLE16() {
const int c0 = readByte();
const int c1 = readByte();
return static_cast<uint16_t>(c0 & 0xFF) |
(static_cast<uint16_t>(c1 & 0xFF) << 8);
return static_cast<uint16_t>(c0 & 0xFF) | (static_cast<uint16_t>(c1 & 0xFF) << 8);
}
uint32_t Bitmap::readLE32() {
@ -83,64 +83,58 @@ uint32_t Bitmap::readLE32() {
const int c1 = readByte();
const int c2 = readByte();
const int c3 = readByte();
return static_cast<uint32_t>(c0 & 0xFF) |
(static_cast<uint32_t>(c1 & 0xFF) << 8) |
(static_cast<uint32_t>(c2 & 0xFF) << 16) |
(static_cast<uint32_t>(c3 & 0xFF) << 24);
return static_cast<uint32_t>(c0 & 0xFF) | (static_cast<uint32_t>(c1 & 0xFF) << 8) |
(static_cast<uint32_t>(c2 & 0xFF) << 16) | (static_cast<uint32_t>(c3 & 0xFF) << 24);
}
const char *Bitmap::errorToString(BmpReaderError err) {
const char* Bitmap::errorToString(BmpReaderError err) {
switch (err) {
case BmpReaderError::Ok:
return "Ok";
case BmpReaderError::FileInvalid:
return "FileInvalid";
case BmpReaderError::SeekStartFailed:
return "SeekStartFailed";
case BmpReaderError::NotBMP:
return "NotBMP";
case BmpReaderError::DIBTooSmall:
return "DIBTooSmall";
case BmpReaderError::BadPlanes:
return "BadPlanes";
case BmpReaderError::UnsupportedBpp:
return "UnsupportedBpp";
case BmpReaderError::UnsupportedCompression:
return "UnsupportedCompression";
case BmpReaderError::BadDimensions:
return "BadDimensions";
case BmpReaderError::ImageTooLarge:
return "ImageTooLarge";
case BmpReaderError::PaletteTooLarge:
return "PaletteTooLarge";
case BmpReaderError::SeekPixelDataFailed:
return "SeekPixelDataFailed";
case BmpReaderError::BufferTooSmall:
return "BufferTooSmall";
case BmpReaderError::OomRowBuffer:
return "OomRowBuffer";
case BmpReaderError::ShortReadRow:
return "ShortReadRow";
case BmpReaderError::Ok:
return "Ok";
case BmpReaderError::FileInvalid:
return "FileInvalid";
case BmpReaderError::SeekStartFailed:
return "SeekStartFailed";
case BmpReaderError::NotBMP:
return "NotBMP";
case BmpReaderError::DIBTooSmall:
return "DIBTooSmall";
case BmpReaderError::BadPlanes:
return "BadPlanes";
case BmpReaderError::UnsupportedBpp:
return "UnsupportedBpp";
case BmpReaderError::UnsupportedCompression:
return "UnsupportedCompression";
case BmpReaderError::BadDimensions:
return "BadDimensions";
case BmpReaderError::ImageTooLarge:
return "ImageTooLarge";
case BmpReaderError::PaletteTooLarge:
return "PaletteTooLarge";
case BmpReaderError::SeekPixelDataFailed:
return "SeekPixelDataFailed";
case BmpReaderError::BufferTooSmall:
return "BufferTooSmall";
case BmpReaderError::OomRowBuffer:
return "OomRowBuffer";
case BmpReaderError::ShortReadRow:
return "ShortReadRow";
}
return "Unknown";
}
BmpReaderError Bitmap::parseHeaders() {
if (!file && !memoryBuffer)
return BmpReaderError::FileInvalid;
if (!seekSet(0))
return BmpReaderError::SeekStartFailed;
if (!file && !memoryBuffer) return BmpReaderError::FileInvalid;
if (!seekSet(0)) return BmpReaderError::SeekStartFailed;
const uint16_t bfType = readLE16();
if (bfType != 0x4D42)
return BmpReaderError::NotBMP;
if (bfType != 0x4D42) return BmpReaderError::NotBMP;
seekCur(8);
bfOffBits = readLE32();
const uint32_t biSize = readLE32();
if (biSize < 40)
return BmpReaderError::DIBTooSmall;
if (biSize < 40) return BmpReaderError::DIBTooSmall;
width = static_cast<int32_t>(readLE32());
const auto rawHeight = static_cast<int32_t>(readLE32());
@ -150,24 +144,18 @@ BmpReaderError Bitmap::parseHeaders() {
const uint16_t planes = readLE16();
bpp = readLE16();
const uint32_t comp = readLE32();
const bool validBpp =
bpp == 1 || bpp == 2 || bpp == 8 || bpp == 24 || bpp == 32;
const bool validBpp = bpp == 1 || bpp == 2 || bpp == 8 || bpp == 24 || bpp == 32;
if (planes != 1)
return BmpReaderError::BadPlanes;
if (!validBpp)
return BmpReaderError::UnsupportedBpp;
if (!(comp == 0 || (bpp == 32 && comp == 3)))
return BmpReaderError::UnsupportedCompression;
if (planes != 1) return BmpReaderError::BadPlanes;
if (!validBpp) return BmpReaderError::UnsupportedBpp;
if (!(comp == 0 || (bpp == 32 && comp == 3))) return BmpReaderError::UnsupportedCompression;
seekCur(12);
const uint32_t colorsUsed = readLE32();
if (colorsUsed > 256u)
return BmpReaderError::PaletteTooLarge;
if (colorsUsed > 256u) return BmpReaderError::PaletteTooLarge;
seekCur(4);
if (width <= 0 || height <= 0)
return BmpReaderError::BadDimensions;
if (width <= 0 || height <= 0) return BmpReaderError::BadDimensions;
constexpr int MAX_IMAGE_WIDTH = 2048;
constexpr int MAX_IMAGE_HEIGHT = 3072;
@ -177,8 +165,7 @@ BmpReaderError Bitmap::parseHeaders() {
rowBytes = (width * bpp + 31) / 32 * 4;
for (int i = 0; i < 256; i++)
paletteLum[i] = static_cast<uint8_t>(i);
for (int i = 0; i < 256; i++) paletteLum[i] = static_cast<uint8_t>(i);
if (colorsUsed > 0) {
for (uint32_t i = 0; i < colorsUsed; i++) {
uint8_t rgb[4];
@ -187,8 +174,7 @@ BmpReaderError Bitmap::parseHeaders() {
}
}
if (!seekSet(bfOffBits))
return BmpReaderError::SeekPixelDataFailed;
if (!seekSet(bfOffBits)) return BmpReaderError::SeekPixelDataFailed;
if (bpp > 2 && dithering) {
if (USE_ATKINSON) {
@ -201,12 +187,11 @@ BmpReaderError Bitmap::parseHeaders() {
return BmpReaderError::Ok;
}
BmpReaderError Bitmap::readNextRow(uint8_t *data, uint8_t *rowBuffer) const {
if (readBytes(rowBuffer, rowBytes) != (size_t)rowBytes)
return BmpReaderError::ShortReadRow;
BmpReaderError Bitmap::readNextRow(uint8_t* data, uint8_t* rowBuffer) const {
if (readBytes(rowBuffer, rowBytes) != (size_t)rowBytes) return BmpReaderError::ShortReadRow;
prevRowY += 1;
uint8_t *outPtr = data;
uint8_t* outPtr = data;
uint8_t currentOutByte = 0;
int bitShift = 6;
int currentX = 0;
@ -236,46 +221,44 @@ BmpReaderError Bitmap::readNextRow(uint8_t *data, uint8_t *rowBuffer) const {
};
switch (bpp) {
case 32: {
const uint8_t *p = rowBuffer;
for (int x = 0; x < width; x++) {
uint8_t lum = (77u * p[2] + 150u * p[1] + 29u * p[0]) >> 8;
packPixel(lum);
p += 4;
case 32: {
const uint8_t* p = rowBuffer;
for (int x = 0; x < width; x++) {
uint8_t lum = (77u * p[2] + 150u * p[1] + 29u * p[0]) >> 8;
packPixel(lum);
p += 4;
}
break;
}
break;
}
case 24: {
const uint8_t *p = rowBuffer;
for (int x = 0; x < width; x++) {
uint8_t lum = (77u * p[2] + 150u * p[1] + 29u * p[0]) >> 8;
packPixel(lum);
p += 3;
case 24: {
const uint8_t* p = rowBuffer;
for (int x = 0; x < width; x++) {
uint8_t lum = (77u * p[2] + 150u * p[1] + 29u * p[0]) >> 8;
packPixel(lum);
p += 3;
}
break;
}
break;
}
case 8: {
for (int x = 0; x < width; x++)
packPixel(paletteLum[rowBuffer[x]]);
break;
}
case 2: {
for (int x = 0; x < width; x++) {
uint8_t lum =
paletteLum[(rowBuffer[x >> 2] >> (6 - ((x & 3) * 2))) & 0x03];
packPixel(lum);
case 8: {
for (int x = 0; x < width; x++) packPixel(paletteLum[rowBuffer[x]]);
break;
}
break;
}
case 1: {
for (int x = 0; x < width; x++) {
const uint8_t palIndex = (rowBuffer[x >> 3] & (0x80 >> (x & 7))) ? 1 : 0;
packPixel(paletteLum[palIndex]);
case 2: {
for (int x = 0; x < width; x++) {
uint8_t lum = paletteLum[(rowBuffer[x >> 2] >> (6 - ((x & 3) * 2))) & 0x03];
packPixel(lum);
}
break;
}
break;
}
default:
return BmpReaderError::UnsupportedBpp;
case 1: {
for (int x = 0; x < width; x++) {
const uint8_t palIndex = (rowBuffer[x >> 3] & (0x80 >> (x & 7))) ? 1 : 0;
packPixel(paletteLum[palIndex]);
}
break;
}
default:
return BmpReaderError::UnsupportedBpp;
}
if (atkinsonDitherer)
@ -283,17 +266,13 @@ BmpReaderError Bitmap::readNextRow(uint8_t *data, uint8_t *rowBuffer) const {
else if (fsDitherer)
fsDitherer->nextRow();
if (bitShift != 6)
*outPtr = currentOutByte;
if (bitShift != 6) *outPtr = currentOutByte;
return BmpReaderError::Ok;
}
BmpReaderError Bitmap::rewindToData() const {
if (!seekSet(bfOffBits))
return BmpReaderError::SeekPixelDataFailed;
if (fsDitherer)
fsDitherer->reset();
if (atkinsonDitherer)
atkinsonDitherer->reset();
if (!seekSet(bfOffBits)) return BmpReaderError::SeekPixelDataFailed;
if (fsDitherer) fsDitherer->reset();
if (atkinsonDitherer) atkinsonDitherer->reset();
return BmpReaderError::Ok;
}

34
lib/GfxRenderer/Bitmap.h
View File

@ -29,18 +29,16 @@ enum class BmpReaderError : uint8_t {
};
class Bitmap {
public:
static const char *errorToString(BmpReaderError err);
public:
static const char* errorToString(BmpReaderError err);
explicit Bitmap(FsFile &file, bool dithering = false)
: file(&file), dithering(dithering) {}
explicit Bitmap(const uint8_t *buffer, size_t size, bool dithering = false)
: file(nullptr), memoryBuffer(buffer), memorySize(size),
dithering(dithering) {}
explicit Bitmap(FsFile& file, bool dithering = false) : file(&file), dithering(dithering) {}
explicit Bitmap(const uint8_t* buffer, size_t size, bool dithering = false)
: file(nullptr), memoryBuffer(buffer), memorySize(size), dithering(dithering) {}
~Bitmap();
BmpReaderError parseHeaders();
BmpReaderError readNextRow(uint8_t *data, uint8_t *rowBuffer) const;
BmpReaderError readNextRow(uint8_t* data, uint8_t* rowBuffer) const;
BmpReaderError rewindToData() const;
// Getters
@ -52,19 +50,19 @@ public:
bool is1Bit() const { return bpp == 1; }
uint16_t getBpp() const { return bpp; }
private:
private:
// Internal IO helpers
int readByte() const;
size_t readBytes(void *buf, size_t count) const;
size_t readBytes(void* buf, size_t count) const;
bool seekSet(uint32_t pos) const;
bool seekCur(int32_t offset) const; // Only needed for skip?
bool seekCur(int32_t offset) const; // Only needed for skip?
uint16_t readLE16();
uint32_t readLE32();
// Source (one is valid)
FsFile *file = nullptr;
const uint8_t *memoryBuffer = nullptr;
FsFile* file = nullptr;
const uint8_t* memoryBuffer = nullptr;
size_t memorySize = 0;
mutable size_t bufferPos = 0;
@ -78,10 +76,10 @@ private:
uint8_t paletteLum[256] = {};
// Floyd-Steinberg dithering state (mutable for const methods)
mutable int16_t *errorCurRow = nullptr;
mutable int16_t *errorNextRow = nullptr;
mutable int prevRowY = -1; // Track row progression for error propagation
mutable int16_t* errorCurRow = nullptr;
mutable int16_t* errorNextRow = nullptr;
mutable int prevRowY = -1; // Track row progression for error propagation
mutable AtkinsonDitherer *atkinsonDitherer = nullptr;
mutable FloydSteinbergDitherer *fsDitherer = nullptr;
mutable AtkinsonDitherer* atkinsonDitherer = nullptr;
mutable FloydSteinbergDitherer* fsDitherer = nullptr;
};

186
lib/ThemeEngine/include/BasicElements.h
View File

@ -1,43 +1,42 @@
#pragma once
#include <Bitmap.h>
#include <SDCardManager.h>
#include <vector>
#include "ThemeContext.h"
#include "ThemeTypes.h"
#include "UIElement.h"
#include <Bitmap.h>
#include <SDCardManager.h>
#include <vector>
namespace ThemeEngine {
// --- Container ---
class Container : public UIElement {
protected:
std::vector<UIElement *> children;
protected:
std::vector<UIElement*> children;
Expression bgColorExpr;
bool hasBg = false;
bool border = false;
Expression borderExpr; // Dynamic border based on expression
int padding = 0; // Inner padding for children
int borderRadius = 0; // Corner radius (for future rounded rect support)
Expression borderExpr; // Dynamic border based on expression
int padding = 0; // Inner padding for children
int borderRadius = 0; // Corner radius (for future rounded rect support)
public:
Container(const std::string &id) : UIElement(id) {
bgColorExpr = Expression::parse("0xFF");
}
public:
Container(const std::string& id) : UIElement(id) { bgColorExpr = Expression::parse("0xFF"); }
virtual ~Container() {
for (auto child : children)
delete child;
for (auto child : children) delete child;
}
Container *asContainer() override { return this; }
Container* asContainer() override { return this; }
ElementType getType() const override { return ElementType::Container; }
void addChild(UIElement *child) { children.push_back(child); }
void addChild(UIElement* child) { children.push_back(child); }
const std::vector<UIElement *> &getChildren() const { return children; }
const std::vector<UIElement*>& getChildren() const { return children; }
void setBackgroundColorExpr(const std::string &expr) {
void setBackgroundColorExpr(const std::string& expr) {
bgColorExpr = Expression::parse(expr);
hasBg = true;
markDirty();
@ -48,29 +47,28 @@ public:
markDirty();
}
void setBorderExpr(const std::string &expr) {
void setBorderExpr(const std::string& expr) {
borderExpr = Expression::parse(expr);
markDirty();
}
bool hasBorderExpr() const { return !borderExpr.empty(); }
void setPadding(int p) {
padding = p;
markDirty();
}
int getPadding() const { return padding; }
void setBorderRadius(int r) {
borderRadius = r;
markDirty();
}
int getBorderRadius() const { return borderRadius; }
void layout(const ThemeContext &context, int parentX, int parentY,
int parentW, int parentH) override {
void layout(const ThemeContext& context, int parentX, int parentY, int parentW, int parentH) override {
UIElement::layout(context, parentX, parentY, parentW, parentH);
// Children are laid out with padding offset
int childX = absX + padding;
@ -89,9 +87,8 @@ public:
}
}
void draw(const GfxRenderer &renderer, const ThemeContext &context) override {
if (!isVisible(context))
return;
void draw(const GfxRenderer& renderer, const ThemeContext& context) override {
if (!isVisible(context)) return;
if (hasBg) {
std::string colStr = context.evaluatestring(bgColorExpr);
@ -144,13 +141,11 @@ public:
// --- Rectangle ---
class Rectangle : public UIElement {
bool fill = false;
Expression fillExpr; // Dynamic fill based on expression
Expression fillExpr; // Dynamic fill based on expression
Expression colorExpr;
public:
Rectangle(const std::string &id) : UIElement(id) {
colorExpr = Expression::parse("0x00");
}
public:
Rectangle(const std::string& id) : UIElement(id) { colorExpr = Expression::parse("0x00"); }
ElementType getType() const override { return ElementType::Rectangle; }
void setFill(bool f) {
@ -158,19 +153,18 @@ public:
markDirty();
}
void setFillExpr(const std::string &expr) {
void setFillExpr(const std::string& expr) {
fillExpr = Expression::parse(expr);
markDirty();
}
void setColorExpr(const std::string &c) {
void setColorExpr(const std::string& c) {
colorExpr = Expression::parse(c);
markDirty();
}
void draw(const GfxRenderer &renderer, const ThemeContext &context) override {
if (!isVisible(context))
return;
void draw(const GfxRenderer& renderer, const ThemeContext& context) override {
if (!isVisible(context)) return;
std::string colStr = context.evaluatestring(colorExpr);
uint8_t color = Color::parse(colStr).value;
@ -193,24 +187,22 @@ public:
// --- Label ---
class Label : public UIElement {
public:
public:
enum class Alignment { Left, Center, Right };
private:
private:
Expression textExpr;
int fontId = 0;
Alignment alignment = Alignment::Left;
Expression colorExpr;
int maxLines = 1; // For multi-line support
bool ellipsis = true; // Truncate with ... if too long
int maxLines = 1; // For multi-line support
bool ellipsis = true; // Truncate with ... if too long
public:
Label(const std::string &id) : UIElement(id) {
colorExpr = Expression::parse("0x00");
}
public:
Label(const std::string& id) : UIElement(id) { colorExpr = Expression::parse("0x00"); }
ElementType getType() const override { return ElementType::Label; }
void setText(const std::string &expr) {
void setText(const std::string& expr) {
textExpr = Expression::parse(expr);
markDirty();
}
@ -226,7 +218,7 @@ public:
alignment = c ? Alignment::Center : Alignment::Left;
markDirty();
}
void setColorExpr(const std::string &c) {
void setColorExpr(const std::string& c) {
colorExpr = Expression::parse(c);
markDirty();
}
@ -239,9 +231,8 @@ public:
markDirty();
}
void draw(const GfxRenderer &renderer, const ThemeContext &context) override {
if (!isVisible(context))
return;
void draw(const GfxRenderer& renderer, const ThemeContext& context) override {
if (!isVisible(context)) return;
std::string finalText = context.evaluatestring(textExpr);
if (finalText.empty()) {
@ -288,13 +279,13 @@ class BitmapElement : public UIElement {
bool scaleToFit = true;
bool preserveAspect = true;
public:
BitmapElement(const std::string &id) : UIElement(id) {
cacheable = true; // Bitmaps benefit from caching
public:
BitmapElement(const std::string& id) : UIElement(id) {
cacheable = true; // Bitmaps benefit from caching
}
ElementType getType() const override { return ElementType::Bitmap; }
void setSrc(const std::string &src) {
void setSrc(const std::string& src) {
srcExpr = Expression::parse(src);
invalidateCache();
}
@ -309,41 +300,41 @@ public:
invalidateCache();
}
void draw(const GfxRenderer &renderer, const ThemeContext &context) override;
void draw(const GfxRenderer& renderer, const ThemeContext& context) override;
};
// --- ProgressBar ---
class ProgressBar : public UIElement {
Expression valueExpr; // Current value (0-100 or 0-max)
Expression maxExpr; // Max value (default 100)
Expression fgColorExpr; // Foreground color
Expression bgColorExpr; // Background color
Expression valueExpr; // Current value (0-100 or 0-max)
Expression maxExpr; // Max value (default 100)
Expression fgColorExpr; // Foreground color
Expression bgColorExpr; // Background color
bool showBorder = true;
int borderWidth = 1;
public:
ProgressBar(const std::string &id) : UIElement(id) {
public:
ProgressBar(const std::string& id) : UIElement(id) {
valueExpr = Expression::parse("0");
maxExpr = Expression::parse("100");
fgColorExpr = Expression::parse("0x00"); // Black fill
bgColorExpr = Expression::parse("0xFF"); // White background
fgColorExpr = Expression::parse("0x00"); // Black fill
bgColorExpr = Expression::parse("0xFF"); // White background
}
ElementType getType() const override { return ElementType::ProgressBar; }
void setValue(const std::string &expr) {
void setValue(const std::string& expr) {
valueExpr = Expression::parse(expr);
markDirty();
}
void setMax(const std::string &expr) {
void setMax(const std::string& expr) {
maxExpr = Expression::parse(expr);
markDirty();
}
void setFgColor(const std::string &expr) {
void setFgColor(const std::string& expr) {
fgColorExpr = Expression::parse(expr);
markDirty();
}
void setBgColor(const std::string &expr) {
void setBgColor(const std::string& expr) {
bgColorExpr = Expression::parse(expr);
markDirty();
}
@ -352,23 +343,19 @@ public:
markDirty();
}
void draw(const GfxRenderer &renderer, const ThemeContext &context) override {
if (!isVisible(context))
return;
void draw(const GfxRenderer& renderer, const ThemeContext& context) override {
if (!isVisible(context)) return;
std::string valStr = context.evaluatestring(valueExpr);
std::string maxStr = context.evaluatestring(maxExpr);
int value = valStr.empty() ? 0 : std::stoi(valStr);
int maxVal = maxStr.empty() ? 100 : std::stoi(maxStr);
if (maxVal <= 0)
maxVal = 100;
if (maxVal <= 0) maxVal = 100;
float ratio = static_cast<float>(value) / static_cast<float>(maxVal);
if (ratio < 0)
ratio = 0;
if (ratio > 1)
ratio = 1;
if (ratio < 0) ratio = 0;
if (ratio > 1) ratio = 1;
// Draw background
std::string bgStr = context.evaluatestring(bgColorExpr);
@ -398,14 +385,12 @@ class Divider : public UIElement {
bool horizontal = true;
int thickness = 1;
public:
Divider(const std::string &id) : UIElement(id) {
colorExpr = Expression::parse("0x00");
}
public:
Divider(const std::string& id) : UIElement(id) { colorExpr = Expression::parse("0x00"); }
ElementType getType() const override { return ElementType::Divider; }
void setColorExpr(const std::string &expr) {
void setColorExpr(const std::string& expr) {
colorExpr = Expression::parse(expr);
markDirty();
}
@ -418,9 +403,8 @@ public:
markDirty();
}
void draw(const GfxRenderer &renderer, const ThemeContext &context) override {
if (!isVisible(context))
return;
void draw(const GfxRenderer& renderer, const ThemeContext& context) override {
if (!isVisible(context)) return;
std::string colStr = context.evaluatestring(colorExpr);
uint8_t color = Color::parse(colStr).value;
@ -445,27 +429,26 @@ class BatteryIcon : public UIElement {
Expression valueExpr;
Expression colorExpr;
public:
BatteryIcon(const std::string &id) : UIElement(id) {
public:
BatteryIcon(const std::string& id) : UIElement(id) {
valueExpr = Expression::parse("0");
colorExpr = Expression::parse("0x00"); // Black by default
colorExpr = Expression::parse("0x00"); // Black by default
}
ElementType getType() const override { return ElementType::BatteryIcon; }
void setValue(const std::string &expr) {
void setValue(const std::string& expr) {
valueExpr = Expression::parse(expr);
markDirty();
}
void setColor(const std::string &expr) {
void setColor(const std::string& expr) {
colorExpr = Expression::parse(expr);
markDirty();
}
void draw(const GfxRenderer &renderer, const ThemeContext &context) override {
if (!isVisible(context))
return;
void draw(const GfxRenderer& renderer, const ThemeContext& context) override {
if (!isVisible(context)) return;
std::string valStr = context.evaluatestring(valueExpr);
int percentage = valStr.empty() ? 0 : std::stoi(valStr);
@ -480,22 +463,17 @@ public:
int x = absX;
int y = absY;
if (absW > batteryWidth)
x += (absW - batteryWidth) / 2;
if (absH > batteryHeight)
y += (absH - batteryHeight) / 2;
if (absW > batteryWidth) x += (absW - batteryWidth) / 2;
if (absH > batteryHeight) y += (absH - batteryHeight) / 2;
renderer.drawLine(x + 1, y, x + batteryWidth - 3, y, black);
renderer.drawLine(x + 1, y + batteryHeight - 1, x + batteryWidth - 3,
y + batteryHeight - 1, black);
renderer.drawLine(x + 1, y + batteryHeight - 1, x + batteryWidth - 3, y + batteryHeight - 1, black);
renderer.drawLine(x, y + 1, x, y + batteryHeight - 2, black);
renderer.drawLine(x + batteryWidth - 2, y + 1, x + batteryWidth - 2,
y + batteryHeight - 2, black);
renderer.drawLine(x + batteryWidth - 2, y + 1, x + batteryWidth - 2, y + batteryHeight - 2, black);
renderer.drawPixel(x + batteryWidth - 1, y + 3, black);
renderer.drawPixel(x + batteryWidth - 1, y + batteryHeight - 4, black);
renderer.drawLine(x + batteryWidth - 0, y + 4, x + batteryWidth - 0,
y + batteryHeight - 5, black);
renderer.drawLine(x + batteryWidth - 0, y + 4, x + batteryWidth - 0, y + batteryHeight - 5, black);
if (percentage > 0) {
int filledWidth = percentage * (batteryWidth - 5) / 100 + 1;
@ -509,4 +487,4 @@ public:
}
};
} // namespace ThemeEngine
} // namespace ThemeEngine

6
lib/ThemeEngine/include/DefaultTheme.h
View File

@ -6,8 +6,8 @@
namespace ThemeEngine {
// Use static function for C++14 ODR compatibility
static const char *getDefaultThemeIni() {
static const char *theme = R"INI(
static const char* getDefaultThemeIni() {
static const char* theme = R"INI(
; ============================================
; DEFAULT THEME - Original CrossPoint Reader
; ============================================
@ -275,4 +275,4 @@ Align = center
return theme;
}
} // namespace ThemeEngine
} // namespace ThemeEngine

14
lib/ThemeEngine/include/IniParser.h
View File

@ -24,17 +24,15 @@ struct IniSection {
};
class IniParser {
public:
public:
// Parse a stream (File, Serial, etc.)
static std::map<std::string, std::map<std::string, std::string>>
parse(Stream &stream);
static std::map<std::string, std::map<std::string, std::string>> parse(Stream& stream);
// Parse a string buffer (useful for testing)
static std::map<std::string, std::map<std::string, std::string>>
parseString(const std::string &content);
static std::map<std::string, std::map<std::string, std::string>> parseString(const std::string& content);
private:
static void trim(std::string &s);
private:
static void trim(std::string& s);
};
} // namespace ThemeEngine
} // namespace ThemeEngine

151
lib/ThemeEngine/include/LayoutElements.h
View File

@ -1,22 +1,23 @@
#pragma once
#include <vector>
#include "BasicElements.h"
#include "ThemeContext.h"
#include "ThemeTypes.h"
#include "UIElement.h"
#include <vector>
namespace ThemeEngine {
// --- HStack: Horizontal Stack Layout ---
// Children are arranged horizontally with optional spacing
class HStack : public Container {
int spacing = 0; // Gap between children
int padding = 0; // Internal padding
int spacing = 0; // Gap between children
int padding = 0; // Internal padding
bool centerVertical = false;
public:
HStack(const std::string &id) : Container(id) {}
public:
HStack(const std::string& id) : Container(id) {}
ElementType getType() const override { return ElementType::HStack; }
void setSpacing(int s) {
@ -32,8 +33,7 @@ public:
markDirty();
}
void layout(const ThemeContext &context, int parentX, int parentY,
int parentW, int parentH) override {
void layout(const ThemeContext& context, int parentX, int parentY, int parentW, int parentH) override {
UIElement::layout(context, parentX, parentY, parentW, parentH);
int currentX = absX + padding;
@ -68,8 +68,8 @@ class VStack : public Container {
int padding = 0;
bool centerHorizontal = false;
public:
VStack(const std::string &id) : Container(id) {}
public:
VStack(const std::string& id) : Container(id) {}
ElementType getType() const override { return ElementType::VStack; }
void setSpacing(int s) {
@ -85,8 +85,7 @@ public:
markDirty();
}
void layout(const ThemeContext &context, int parentX, int parentY,
int parentW, int parentH) override {
void layout(const ThemeContext& context, int parentX, int parentY, int parentW, int parentH) override {
UIElement::layout(context, parentX, parentY, parentW, parentH);
int currentY = absY + padding;
@ -120,8 +119,8 @@ class Grid : public Container {
int colSpacing = 10;
int padding = 0;
public:
Grid(const std::string &id) : Container(id) {}
public:
Grid(const std::string& id) : Container(id) {}
ElementType getType() const override { return ElementType::Grid; }
void setColumns(int c) {
@ -141,12 +140,10 @@ public:
markDirty();
}
void layout(const ThemeContext &context, int parentX, int parentY,
int parentW, int parentH) override {
void layout(const ThemeContext& context, int parentX, int parentY, int parentW, int parentH) override {
UIElement::layout(context, parentX, parentY, parentW, parentH);
if (children.empty())
return;
if (children.empty()) return;
int availableW = absW - 2 * padding - (columns - 1) * colSpacing;
int cellW = availableW / columns;
@ -162,8 +159,7 @@ public:
// Pass cell dimensions to avoid clamping issues
child->layout(context, cellX, currentY, cellW, availableH);
int childH = child->getAbsH();
if (childH > maxRowHeight)
maxRowHeight = childH;
if (childH > maxRowHeight) maxRowHeight = childH;
col++;
if (col >= columns) {
@ -184,27 +180,27 @@ class Badge : public UIElement {
Expression bgColorExpr;
Expression fgColorExpr;
int fontId = 0;
int paddingH = 8; // Horizontal padding
int paddingV = 4; // Vertical padding
int paddingH = 8; // Horizontal padding
int paddingV = 4; // Vertical padding
int cornerRadius = 0;
public:
Badge(const std::string &id) : UIElement(id) {
bgColorExpr = Expression::parse("0x00"); // Black background
fgColorExpr = Expression::parse("0xFF"); // White text
public:
Badge(const std::string& id) : UIElement(id) {
bgColorExpr = Expression::parse("0x00"); // Black background
fgColorExpr = Expression::parse("0xFF"); // White text
}
ElementType getType() const override { return ElementType::Badge; }
void setText(const std::string &expr) {
void setText(const std::string& expr) {
textExpr = Expression::parse(expr);
markDirty();
}
void setBgColor(const std::string &expr) {
void setBgColor(const std::string& expr) {
bgColorExpr = Expression::parse(expr);
markDirty();
}
void setFgColor(const std::string &expr) {
void setFgColor(const std::string& expr) {
fgColorExpr = Expression::parse(expr);
markDirty();
}
@ -221,9 +217,8 @@ public:
markDirty();
}
void draw(const GfxRenderer &renderer, const ThemeContext &context) override {
if (!isVisible(context))
return;
void draw(const GfxRenderer& renderer, const ThemeContext& context) override {
if (!isVisible(context)) return;
std::string text = context.evaluatestring(textExpr);
if (text.empty()) {
@ -238,10 +233,8 @@ public:
int badgeH = textH + 2 * paddingV;
// Use absX, absY as position, but we may auto-size
if (absW == 0)
absW = badgeW;
if (absH == 0)
absH = badgeH;
if (absW == 0) absW = badgeW;
if (absH == 0) absH = badgeH;
// Draw background
std::string bgStr = context.evaluatestring(bgColorExpr);
@ -264,31 +257,31 @@ public:
// --- Toggle: On/Off Switch ---
class Toggle : public UIElement {
Expression valueExpr; // Boolean expression
Expression valueExpr; // Boolean expression
Expression onColorExpr;
Expression offColorExpr;
int trackWidth = 44;
int trackHeight = 24;
int knobSize = 20;
public:
Toggle(const std::string &id) : UIElement(id) {
public:
Toggle(const std::string& id) : UIElement(id) {
valueExpr = Expression::parse("false");
onColorExpr = Expression::parse("0x00"); // Black when on
offColorExpr = Expression::parse("0xFF"); // White when off
onColorExpr = Expression::parse("0x00"); // Black when on
offColorExpr = Expression::parse("0xFF"); // White when off
}
ElementType getType() const override { return ElementType::Toggle; }
void setValue(const std::string &expr) {
void setValue(const std::string& expr) {
valueExpr = Expression::parse(expr);
markDirty();
}
void setOnColor(const std::string &expr) {
void setOnColor(const std::string& expr) {
onColorExpr = Expression::parse(expr);
markDirty();
}
void setOffColor(const std::string &expr) {
void setOffColor(const std::string& expr) {
offColorExpr = Expression::parse(expr);
markDirty();
}
@ -305,15 +298,13 @@ public:
markDirty();
}
void draw(const GfxRenderer &renderer, const ThemeContext &context) override {
if (!isVisible(context))
return;
void draw(const GfxRenderer& renderer, const ThemeContext& context) override {
if (!isVisible(context)) return;
bool isOn = context.evaluateBool(valueExpr.rawExpr);
// Get colors
std::string colorStr =
isOn ? context.evaluatestring(onColorExpr) : context.evaluatestring(offColorExpr);
std::string colorStr = isOn ? context.evaluatestring(onColorExpr) : context.evaluatestring(offColorExpr);
uint8_t trackColor = Color::parse(colorStr).value;
// Draw track
@ -324,8 +315,7 @@ public:
// Draw knob
int knobMargin = (trackHeight - knobSize) / 2;
int knobX = isOn ? (trackX + trackWidth - knobSize - knobMargin)
: (trackX + knobMargin);
int knobX = isOn ? (trackX + trackWidth - knobSize - knobMargin) : (trackX + knobMargin);
int knobY = trackY + knobMargin;
// Knob is opposite color of track
@ -338,17 +328,17 @@ public:
// --- TabBar: Horizontal tab selection ---
class TabBar : public Container {
Expression selectedExpr; // Currently selected tab index or name
Expression selectedExpr; // Currently selected tab index or name
int tabSpacing = 0;
int padding = 0;
int indicatorHeight = 3;
bool showIndicator = true;
public:
TabBar(const std::string &id) : Container(id) {}
public:
TabBar(const std::string& id) : Container(id) {}
ElementType getType() const override { return ElementType::TabBar; }
void setSelected(const std::string &expr) {
void setSelected(const std::string& expr) {
selectedExpr = Expression::parse(expr);
markDirty();
}
@ -369,12 +359,10 @@ public:
markDirty();
}
void layout(const ThemeContext &context, int parentX, int parentY,
int parentW, int parentH) override {
void layout(const ThemeContext& context, int parentX, int parentY, int parentW, int parentH) override {
UIElement::layout(context, parentX, parentY, parentW, parentH);
if (children.empty())
return;
if (children.empty()) return;
// Distribute tabs evenly
int numTabs = children.size();
@ -389,9 +377,8 @@ public:
}
}
void draw(const GfxRenderer &renderer, const ThemeContext &context) override {
if (!isVisible(context))
return;
void draw(const GfxRenderer& renderer, const ThemeContext& context) override {
if (!isVisible(context)) return;
// Draw background if set
if (hasBg) {
@ -419,7 +406,7 @@ public:
}
if (selectedIdx >= 0 && selectedIdx < static_cast<int>(children.size())) {
UIElement *tab = children[selectedIdx];
UIElement* tab = children[selectedIdx];
int indX = tab->getAbsX();
int indY = absY + absH - indicatorHeight;
int indW = tab->getAbsW();
@ -437,25 +424,25 @@ public:
// --- Icon: Small symbolic image ---
// Can be a built-in icon name or a path to a BMP
class Icon : public UIElement {
Expression srcExpr; // Icon name or path
Expression srcExpr; // Icon name or path
Expression colorExpr;
int iconSize = 24;
// Built-in icon names and their simple representations
// In a real implementation, these would be actual bitmap data
public:
Icon(const std::string &id) : UIElement(id) {
colorExpr = Expression::parse("0x00"); // Black by default
public:
Icon(const std::string& id) : UIElement(id) {
colorExpr = Expression::parse("0x00"); // Black by default
}
ElementType getType() const override { return ElementType::Icon; }
void setSrc(const std::string &expr) {
void setSrc(const std::string& expr) {
srcExpr = Expression::parse(expr);
markDirty();
}
void setColorExpr(const std::string &expr) {
void setColorExpr(const std::string& expr) {
colorExpr = Expression::parse(expr);
markDirty();
}
@ -464,18 +451,18 @@ public:
markDirty();
}
void draw(const GfxRenderer &renderer, const ThemeContext &context) override;
void draw(const GfxRenderer& renderer, const ThemeContext& context) override;
};
// --- ScrollIndicator: Visual scroll position ---
class ScrollIndicator : public UIElement {
Expression positionExpr; // 0.0 to 1.0
Expression totalExpr; // Total items
Expression visibleExpr; // Visible items
Expression positionExpr; // 0.0 to 1.0
Expression totalExpr; // Total items
Expression visibleExpr; // Visible items
int trackWidth = 4;
public:
ScrollIndicator(const std::string &id) : UIElement(id) {
public:
ScrollIndicator(const std::string& id) : UIElement(id) {
positionExpr = Expression::parse("0");
totalExpr = Expression::parse("1");
visibleExpr = Expression::parse("1");
@ -483,15 +470,15 @@ public:
ElementType getType() const override { return ElementType::ScrollIndicator; }
void setPosition(const std::string &expr) {
void setPosition(const std::string& expr) {
positionExpr = Expression::parse(expr);
markDirty();
}
void setTotal(const std::string &expr) {
void setTotal(const std::string& expr) {
totalExpr = Expression::parse(expr);
markDirty();
}
void setVisibleCount(const std::string &expr) {
void setVisibleCount(const std::string& expr) {
visibleExpr = Expression::parse(expr);
markDirty();
}
@ -500,9 +487,8 @@ public:
markDirty();
}
void draw(const GfxRenderer &renderer, const ThemeContext &context) override {
if (!isVisible(context))
return;
void draw(const GfxRenderer& renderer, const ThemeContext& context) override {
if (!isVisible(context)) return;
// Get values
std::string posStr = context.evaluatestring(positionExpr);
@ -526,8 +512,7 @@ public:
// Calculate thumb size and position
float ratio = static_cast<float>(visible) / static_cast<float>(total);
int thumbH = static_cast<int>(absH * ratio);
if (thumbH < 20)
thumbH = 20; // Minimum thumb size
if (thumbH < 20) thumbH = 20; // Minimum thumb size
int maxScroll = total - visible;
float scrollRatio = maxScroll > 0 ? position / maxScroll : 0;
@ -540,4 +525,4 @@ public:
}
};
} // namespace ThemeEngine
} // namespace ThemeEngine

67
lib/ThemeEngine/include/ListElement.h
View File

@ -1,57 +1,58 @@
#pragma once
#include <map>
#include <vector>
#include "BasicElements.h"
#include "UIElement.h"
#include <map>
#include <vector>
namespace ThemeEngine {
// --- List ---
// Supports vertical, horizontal, and grid layouts
class List : public Container {
public:
public:
enum class Direction { Vertical, Horizontal };
enum class LayoutMode { List, Grid };
private:
std::string source; // Data source name (e.g., "MainMenu", "FileList")
std::string itemTemplateId; // ID of the template element
int itemWidth = 0; // Explicit item width (0 = auto)
int itemHeight = 0; // Explicit item height (0 = auto from template)
int scrollOffset = 0; // Scroll position for long lists
int visibleItems = -1; // Max visible items (-1 = auto)
int spacing = 0; // Gap between items
int columns = 1; // Number of columns (for grid mode)
private:
std::string source; // Data source name (e.g., "MainMenu", "FileList")
std::string itemTemplateId; // ID of the template element
int itemWidth = 0; // Explicit item width (0 = auto)
int itemHeight = 0; // Explicit item height (0 = auto from template)
int scrollOffset = 0; // Scroll position for long lists
int visibleItems = -1; // Max visible items (-1 = auto)
int spacing = 0; // Gap between items
int columns = 1; // Number of columns (for grid mode)
Direction direction = Direction::Vertical;
LayoutMode layoutMode = LayoutMode::List;
// Template element reference (resolved after loading)
UIElement *itemTemplate = nullptr;
UIElement* itemTemplate = nullptr;
public:
List(const std::string &id) : Container(id) {}
public:
List(const std::string& id) : Container(id) {}
ElementType getType() const override { return ElementType::List; }
void setSource(const std::string &s) {
void setSource(const std::string& s) {
source = s;
markDirty();
}
const std::string &getSource() const { return source; }
const std::string& getSource() const { return source; }
void setItemTemplateId(const std::string &id) {
void setItemTemplateId(const std::string& id) {
itemTemplateId = id;
markDirty();
}
void setItemTemplate(UIElement *elem) {
void setItemTemplate(UIElement* elem) {
itemTemplate = elem;
markDirty();
}
UIElement *getItemTemplate() const { return itemTemplate; }
UIElement* getItemTemplate() const { return itemTemplate; }
void setItemWidth(int w) {
itemWidth = w;
@ -64,18 +65,14 @@ public:
}
int getItemHeight() const {
if (itemHeight > 0)
return itemHeight;
if (itemTemplate)
return itemTemplate->getAbsH() > 0 ? itemTemplate->getAbsH() : 45;
if (itemHeight > 0) return itemHeight;
if (itemTemplate) return itemTemplate->getAbsH() > 0 ? itemTemplate->getAbsH() : 45;
return 45;
}
int getItemWidth() const {
if (itemWidth > 0)
return itemWidth;
if (itemTemplate)
return itemTemplate->getAbsW() > 0 ? itemTemplate->getAbsW() : 100;
if (itemWidth > 0) return itemWidth;
if (itemTemplate) return itemTemplate->getAbsW() > 0 ? itemTemplate->getAbsW() : 100;
return 100;
}
@ -98,8 +95,7 @@ public:
void setColumns(int c) {
columns = c > 0 ? c : 1;
if (columns > 1)
layoutMode = LayoutMode::Grid;
if (columns > 1) layoutMode = LayoutMode::Grid;
markDirty();
}
@ -108,7 +104,7 @@ public:
markDirty();
}
void setDirectionFromString(const std::string &dir) {
void setDirectionFromString(const std::string& dir) {
if (dir == "Horizontal" || dir == "horizontal" || dir == "row") {
direction = Direction::Horizontal;
} else {
@ -123,14 +119,13 @@ public:
}
// Resolve template reference from element map
void resolveTemplate(const std::map<std::string, UIElement *> &elements) {
void resolveTemplate(const std::map<std::string, UIElement*>& elements) {
if (elements.count(itemTemplateId)) {
itemTemplate = elements.at(itemTemplateId);
}
}
void layout(const ThemeContext &context, int parentX, int parentY,
int parentW, int parentH) override {
void layout(const ThemeContext& context, int parentX, int parentY, int parentW, int parentH) override {
// Layout self first (bounds)
UIElement::layout(context, parentX, parentY, parentW, parentH);
@ -142,7 +137,7 @@ public:
}
// Draw is implemented in BasicElements.cpp
void draw(const GfxRenderer &renderer, const ThemeContext &context) override;
void draw(const GfxRenderer& renderer, const ThemeContext& context) override;
};
} // namespace ThemeEngine
} // namespace ThemeEngine

146
lib/ThemeEngine/include/ThemeContext.h
View File

@ -11,22 +11,21 @@ namespace ThemeEngine {
struct ExpressionToken {
enum Type { LITERAL, VARIABLE };
Type type;
std::string value; // Literal text or variable name
std::string value; // Literal text or variable name
};
// Pre-parsed expression for efficient repeated evaluation
struct Expression {
std::vector<ExpressionToken> tokens;
std::string rawExpr; // Original expression string for complex evaluation
std::string rawExpr; // Original expression string for complex evaluation
bool empty() const { return tokens.empty() && rawExpr.empty(); }
static Expression parse(const std::string &str) {
static Expression parse(const std::string& str) {
Expression expr;
expr.rawExpr = str;
if (str.empty())
return expr;
if (str.empty()) return expr;
size_t start = 0;
while (start < str.length()) {
@ -39,8 +38,7 @@ struct Expression {
if (open > start) {
// Literal before variable
expr.tokens.push_back(
{ExpressionToken::LITERAL, str.substr(start, open - start)});
expr.tokens.push_back({ExpressionToken::LITERAL, str.substr(start, open - start)});
}
size_t close = str.find('}', open);
@ -51,8 +49,7 @@ struct Expression {
}
// Variable
expr.tokens.push_back(
{ExpressionToken::VARIABLE, str.substr(open + 1, close - open - 1)});
expr.tokens.push_back({ExpressionToken::VARIABLE, str.substr(open + 1, close - open - 1)});
start = close + 1;
}
return expr;
@ -60,115 +57,94 @@ struct Expression {
};
class ThemeContext {
private:
private:
std::map<std::string, std::string> strings;
std::map<std::string, int> ints;
std::map<std::string, bool> bools;
const ThemeContext *parent = nullptr;
const ThemeContext* parent = nullptr;
// Helper to trim whitespace
static std::string trim(const std::string &s) {
static std::string trim(const std::string& s) {
size_t start = s.find_first_not_of(" \t\n\r");
if (start == std::string::npos)
return "";
if (start == std::string::npos) return "";
size_t end = s.find_last_not_of(" \t\n\r");
return s.substr(start, end - start + 1);
}
// Helper to check if string is a number
static bool isNumber(const std::string &s) {
if (s.empty())
return false;
static bool isNumber(const std::string& s) {
if (s.empty()) return false;
size_t start = (s[0] == '-') ? 1 : 0;
for (size_t i = start; i < s.length(); i++) {
if (!isdigit(s[i]))
return false;
if (!isdigit(s[i])) return false;
}
return start < s.length();
}
public:
ThemeContext(const ThemeContext *parent = nullptr) : parent(parent) {}
public:
ThemeContext(const ThemeContext* parent = nullptr) : parent(parent) {}
void setString(const std::string &key, const std::string &value) {
strings[key] = value;
}
void setInt(const std::string &key, int value) { ints[key] = value; }
void setBool(const std::string &key, bool value) { bools[key] = value; }
void setString(const std::string& key, const std::string& value) { strings[key] = value; }
void setInt(const std::string& key, int value) { ints[key] = value; }
void setBool(const std::string& key, bool value) { bools[key] = value; }
std::string getString(const std::string &key,
const std::string &defaultValue = "") const {
std::string getString(const std::string& key, const std::string& defaultValue = "") const {
auto it = strings.find(key);
if (it != strings.end())
return it->second;
if (parent)
return parent->getString(key, defaultValue);
if (it != strings.end()) return it->second;
if (parent) return parent->getString(key, defaultValue);
return defaultValue;
}
int getInt(const std::string &key, int defaultValue = 0) const {
int getInt(const std::string& key, int defaultValue = 0) const {
auto it = ints.find(key);
if (it != ints.end())
return it->second;
if (parent)
return parent->getInt(key, defaultValue);
if (it != ints.end()) return it->second;
if (parent) return parent->getInt(key, defaultValue);
return defaultValue;
}
bool getBool(const std::string &key, bool defaultValue = false) const {
bool getBool(const std::string& key, bool defaultValue = false) const {
auto it = bools.find(key);
if (it != bools.end())
return it->second;
if (parent)
return parent->getBool(key, defaultValue);
if (it != bools.end()) return it->second;
if (parent) return parent->getBool(key, defaultValue);
return defaultValue;
}
bool hasKey(const std::string &key) const {
if (strings.count(key) || ints.count(key) || bools.count(key))
return true;
if (parent)
return parent->hasKey(key);
bool hasKey(const std::string& key) const {
if (strings.count(key) || ints.count(key) || bools.count(key)) return true;
if (parent) return parent->hasKey(key);
return false;
}
// Get any value as string
std::string getAnyAsString(const std::string &key) const {
std::string getAnyAsString(const std::string& key) const {
// Check strings first
auto sit = strings.find(key);
if (sit != strings.end())
return sit->second;
if (sit != strings.end()) return sit->second;
// Check ints
auto iit = ints.find(key);
if (iit != ints.end())
return std::to_string(iit->second);
if (iit != ints.end()) return std::to_string(iit->second);
// Check bools
auto bit = bools.find(key);
if (bit != bools.end())
return bit->second ? "true" : "false";
if (bit != bools.end()) return bit->second ? "true" : "false";
// Check parent
if (parent)
return parent->getAnyAsString(key);
if (parent) return parent->getAnyAsString(key);
return "";
}
// Evaluate a complex boolean expression
// Supports: !, &&, ||, ==, !=, <, >, <=, >=, parentheses
bool evaluateBool(const std::string &expression) const {
bool evaluateBool(const std::string& expression) const {
std::string expr = trim(expression);
if (expr.empty())
return false;
if (expr.empty()) return false;
// Handle literal true/false
if (expr == "true" || expr == "1")
return true;
if (expr == "false" || expr == "0")
return false;
if (expr == "true" || expr == "1") return true;
if (expr == "false" || expr == "0") return false;
// Handle {var} wrapper
if (expr.size() > 2 && expr.front() == '{' && expr.back() == '}') {
@ -185,10 +161,8 @@ public:
int depth = 1;
size_t closePos = 1;
while (closePos < expr.length() && depth > 0) {
if (expr[closePos] == '(')
depth++;
if (expr[closePos] == ')')
depth--;
if (expr[closePos] == '(') depth++;
if (expr[closePos] == ')') depth--;
closePos++;
}
if (closePos <= expr.length()) {
@ -212,14 +186,11 @@ public:
size_t orPos = expr.find("||");
// Process || first (lower precedence than &&)
if (orPos != std::string::npos &&
(andPos == std::string::npos || orPos < andPos)) {
return evaluateBool(expr.substr(0, orPos)) ||
evaluateBool(expr.substr(orPos + 2));
if (orPos != std::string::npos && (andPos == std::string::npos || orPos < andPos)) {
return evaluateBool(expr.substr(0, orPos)) || evaluateBool(expr.substr(orPos + 2));
}
if (andPos != std::string::npos) {
return evaluateBool(expr.substr(0, andPos)) &&
evaluateBool(expr.substr(andPos + 2));
return evaluateBool(expr.substr(0, andPos)) && evaluateBool(expr.substr(andPos + 2));
}
// Handle comparisons
@ -270,7 +241,7 @@ public:
}
// Compare two values (handles variables, numbers, strings)
int compareValues(const std::string &left, const std::string &right) const {
int compareValues(const std::string& left, const std::string& right) const {
std::string leftVal = resolveValue(left);
std::string rightVal = resolveValue(right);
@ -286,7 +257,7 @@ public:
}
// Resolve a value (variable name -> value, or literal)
std::string resolveValue(const std::string &val) const {
std::string resolveValue(const std::string& val) const {
std::string v = trim(val);
// Remove quotes for string literals
@ -298,8 +269,7 @@ public:
}
// If it's a number, return as-is
if (isNumber(v))
return v;
if (isNumber(v)) return v;
// Check for hex color literals (0x00, 0xFF, etc.)
if (v.size() > 2 && v[0] == '0' && (v[1] == 'x' || v[1] == 'X')) {
@ -326,12 +296,11 @@ public:
}
// Evaluate a string expression with variable substitution
std::string evaluatestring(const Expression &expr) const {
if (expr.empty())
return "";
std::string evaluatestring(const Expression& expr) const {
if (expr.empty()) return "";
std::string result;
for (const auto &token : expr.tokens) {
for (const auto& token : expr.tokens) {
if (token.type == ExpressionToken::LITERAL) {
result += token.value;
} else {
@ -339,10 +308,8 @@ public:
std::string varName = token.value;
// If the variable contains comparison operators, evaluate as condition
if (varName.find("==") != std::string::npos ||
varName.find("!=") != std::string::npos ||
varName.find("&&") != std::string::npos ||
varName.find("||") != std::string::npos) {
if (varName.find("==") != std::string::npos || varName.find("!=") != std::string::npos ||
varName.find("&&") != std::string::npos || varName.find("||") != std::string::npos) {
result += evaluateBool(varName) ? "true" : "false";
continue;
}
@ -355,7 +322,7 @@ public:
std::string condition = trim(varName.substr(0, qPos));
std::string trueVal = trim(varName.substr(qPos + 1, cPos - qPos - 1));
std::string falseVal = trim(varName.substr(cPos + 1));
bool condResult = evaluateBool(condition);
result += resolveValue(condResult ? trueVal : falseVal);
continue;
@ -371,12 +338,11 @@ public:
}
// Legacy method for backward compatibility
std::string evaluateString(const std::string &expression) const {
if (expression.empty())
return "";
std::string evaluateString(const std::string& expression) const {
if (expression.empty()) return "";
Expression expr = Expression::parse(expression);
return evaluatestring(expr);
}
};
} // namespace ThemeEngine
} // namespace ThemeEngine

64
lib/ThemeEngine/include/ThemeManager.h
View File

@ -1,12 +1,14 @@
#pragma once
#include <GfxRenderer.h>
#include <map>
#include <string>
#include <vector>
#include "BasicElements.h"
#include "IniParser.h"
#include "ThemeContext.h"
#include <GfxRenderer.h>
#include <map>
#include <string>
#include <vector>
namespace ThemeEngine {
@ -18,10 +20,10 @@ struct ProcessedAsset {
// Screen render cache - stores full screen state for quick restore
struct ScreenCache {
uint8_t *buffer = nullptr;
uint8_t* buffer = nullptr;
size_t bufferSize = 0;
std::string screenName;
uint32_t contextHash = 0; // Hash of context data to detect changes
uint32_t contextHash = 0; // Hash of context data to detect changes
bool valid = false;
~ScreenCache() {
@ -35,8 +37,8 @@ struct ScreenCache {
};
class ThemeManager {
private:
std::map<std::string, UIElement *> elements; // All elements by ID
private:
std::map<std::string, UIElement*> elements; // All elements by ID
std::string currentThemeName;
int navBookCount = 1; // Number of navigable book slots (from theme [Global] section)
std::map<std::string, int> fontMap;
@ -49,12 +51,11 @@ private:
std::map<std::string, bool> elementDependsOnData;
// Factory and property methods
UIElement *createElement(const std::string &id, const std::string &type);
void applyProperties(UIElement *elem,
const std::map<std::string, std::string> &props);
UIElement* createElement(const std::string& id, const std::string& type);
void applyProperties(UIElement* elem, const std::map<std::string, std::string>& props);
public:
static ThemeManager &get() {
public:
static ThemeManager& get() {
static ThemeManager instance;
return instance;
}
@ -63,66 +64,59 @@ public:
void begin();
// Register a font ID mapping (e.g. "UI_12" -> 0)
void registerFont(const std::string &name, int id);
void registerFont(const std::string& name, int id);
// Theme loading
void loadTheme(const std::string &themeName);
void loadTheme(const std::string& themeName);
void unloadTheme();
// Get current theme name
const std::string &getCurrentTheme() const { return currentThemeName; }
const std::string& getCurrentTheme() const { return currentThemeName; }
// Get number of navigable book slots (from theme config, default 1)
int getNavBookCount() const { return navBookCount; }
// Render a screen
void renderScreen(const std::string &screenName, const GfxRenderer &renderer,
const ThemeContext &context);
void renderScreen(const std::string& screenName, const GfxRenderer& renderer, const ThemeContext& context);
// Render with dirty tracking (only redraws changed regions)
void renderScreenOptimized(const std::string &screenName,
const GfxRenderer &renderer,
const ThemeContext &context,
const ThemeContext *prevContext = nullptr);
void renderScreenOptimized(const std::string& screenName, const GfxRenderer& renderer, const ThemeContext& context,
const ThemeContext* prevContext = nullptr);
// Invalidate all caches (call when theme changes or screen switches)
void invalidateAllCaches();
// Invalidate specific screen cache
void invalidateScreenCache(const std::string &screenName);
void invalidateScreenCache(const std::string& screenName);
// Enable/disable caching
void setCachingEnabled(bool enabled) { useCaching = enabled; }
bool isCachingEnabled() const { return useCaching; }
// Asset path resolution
std::string getAssetPath(const std::string &assetName);
std::string getAssetPath(const std::string& assetName);
// Asset caching
const std::vector<uint8_t> *getCachedAsset(const std::string &path);
const ProcessedAsset *getProcessedAsset(const std::string &path,
GfxRenderer::Orientation orientation,
const std::vector<uint8_t>* getCachedAsset(const std::string& path);
const ProcessedAsset* getProcessedAsset(const std::string& path, GfxRenderer::Orientation orientation,
int targetW = 0, int targetH = 0);
void cacheProcessedAsset(const std::string &path,
const ProcessedAsset &asset,
int targetW = 0, int targetH = 0);
void cacheProcessedAsset(const std::string& path, const ProcessedAsset& asset, int targetW = 0, int targetH = 0);
// Clear asset caches (for memory management)
void clearAssetCaches();
// Get element by ID (useful for direct manipulation)
UIElement *getElement(const std::string &id) {
UIElement* getElement(const std::string& id) {
auto it = elements.find(id);
return it != elements.end() ? it->second : nullptr;
}
private:
private:
std::map<std::string, std::vector<uint8_t>> assetCache;
std::map<std::string, ProcessedAsset> processedCache;
// Compute a simple hash of context data for cache invalidation
uint32_t computeContextHash(const ThemeContext &context,
const std::string &screenName);
uint32_t computeContextHash(const ThemeContext& context, const std::string& screenName);
};
} // namespace ThemeEngine
} // namespace ThemeEngine

39
lib/ThemeEngine/include/ThemeTypes.h
View File

@ -14,13 +14,11 @@ struct Dimension {
Dimension(int v, DimensionUnit u) : value(v), unit(u) {}
Dimension() : value(0), unit(DimensionUnit::PIXELS) {}
static Dimension parse(const std::string &str) {
if (str.empty())
return Dimension(0, DimensionUnit::PIXELS);
static Dimension parse(const std::string& str) {
if (str.empty()) return Dimension(0, DimensionUnit::PIXELS);
if (str.back() == '%') {
return Dimension(std::stoi(str.substr(0, str.length() - 1)),
DimensionUnit::PERCENT);
return Dimension(std::stoi(str.substr(0, str.length() - 1)), DimensionUnit::PERCENT);
}
return Dimension(std::stoi(str), DimensionUnit::PIXELS);
}
@ -34,20 +32,16 @@ struct Dimension {
};
struct Color {
uint8_t value; // For E-Ink: 0 (Black) to 255 (White), or simplified palette
uint8_t value; // For E-Ink: 0 (Black) to 255 (White), or simplified palette
Color(uint8_t v) : value(v) {}
Color() : value(0) {}
static Color parse(const std::string &str) {
if (str.empty())
return Color(0);
if (str == "black")
return Color(0x00);
if (str == "white")
return Color(0xFF);
if (str == "gray" || str == "grey")
return Color(0x80);
static Color parse(const std::string& str) {
if (str.empty()) return Color(0);
if (str == "black") return Color(0x00);
if (str == "white") return Color(0xFF);
if (str == "gray" || str == "grey") return Color(0x80);
if (str.size() > 2 && str.substr(0, 2) == "0x") {
return Color((uint8_t)std::strtol(str.c_str(), nullptr, 16));
}
@ -64,16 +58,13 @@ struct Rect {
bool isEmpty() const { return w <= 0 || h <= 0; }
bool intersects(const Rect &other) const {
return !(x + w <= other.x || other.x + other.w <= x || y + h <= other.y ||
other.y + other.h <= y);
bool intersects(const Rect& other) const {
return !(x + w <= other.x || other.x + other.w <= x || y + h <= other.y || other.y + other.h <= y);
}
Rect unite(const Rect &other) const {
if (isEmpty())
return other;
if (other.isEmpty())
return *this;
Rect unite(const Rect& other) const {
if (isEmpty()) return other;
if (other.isEmpty()) return *this;
int nx = std::min(x, other.x);
int ny = std::min(y, other.y);
int nx2 = std::max(x + w, other.x + other.w);
@ -82,4 +73,4 @@ struct Rect {
}
};
} // namespace ThemeEngine
} // namespace ThemeEngine

82
lib/ThemeEngine/include/UIElement.h
View File

@ -1,52 +1,51 @@
#pragma once
#include "ThemeContext.h"
#include "ThemeTypes.h"
#include <GfxRenderer.h>
#include <string>
#include <vector>
#include "ThemeContext.h"
#include "ThemeTypes.h"
namespace ThemeEngine {
class Container; // Forward declaration
class Container; // Forward declaration
class UIElement {
public:
public:
int getAbsX() const { return absX; }
int getAbsY() const { return absY; }
int getAbsW() const { return absW; }
int getAbsH() const { return absH; }
const std::string &getId() const { return id; }
const std::string& getId() const { return id; }
protected:
protected:
std::string id;
Dimension x, y, width, height;
Expression visibleExpr;
bool visibleExprIsStatic = true; // True if visibility doesn't depend on data
bool visibleExprIsStatic = true; // True if visibility doesn't depend on data
// Recomputed every layout pass
int absX = 0, absY = 0, absW = 0, absH = 0;
// Caching support
bool cacheable = false; // Set true for expensive elements like bitmaps
bool cacheValid = false; // Is the cached render still valid?
uint8_t *cachedRender = nullptr;
bool cacheable = false; // Set true for expensive elements like bitmaps
bool cacheValid = false; // Is the cached render still valid?
uint8_t* cachedRender = nullptr;
size_t cachedRenderSize = 0;
int cachedX = 0, cachedY = 0, cachedW = 0, cachedH = 0;
// Dirty tracking
bool dirty = true; // Needs redraw
bool dirty = true; // Needs redraw
bool isVisible(const ThemeContext &context) const {
if (visibleExpr.empty())
return true;
bool isVisible(const ThemeContext& context) const {
if (visibleExpr.empty()) return true;
return context.evaluateBool(visibleExpr.rawExpr);
}
public:
UIElement(const std::string &id) : id(id) {
visibleExpr = Expression::parse("true");
}
public:
UIElement(const std::string& id) : id(id) { visibleExpr = Expression::parse("true"); }
virtual ~UIElement() {
if (cachedRender) {
@ -71,11 +70,11 @@ public:
height = val;
markDirty();
}
void setVisibleExpr(const std::string &expr) {
void setVisibleExpr(const std::string& expr) {
visibleExpr = Expression::parse(expr);
// Check if expression contains variables
visibleExprIsStatic = (expr == "true" || expr == "false" || expr == "1" ||
expr == "0" || expr.find('{') == std::string::npos);
visibleExprIsStatic =
(expr == "true" || expr == "false" || expr == "1" || expr == "0" || expr.find('{') == std::string::npos);
markDirty();
}
@ -97,31 +96,24 @@ public:
}
// Calculate absolute position based on parent
virtual void layout(const ThemeContext &context, int parentX, int parentY,
int parentW, int parentH) {
virtual void layout(const ThemeContext& context, int parentX, int parentY, int parentW, int parentH) {
int newX = parentX + x.resolve(parentW);
int newY = parentY + y.resolve(parentH);
int newW = width.resolve(parentW);
int newH = height.resolve(parentH);
// Clamp to parent bounds
if (newX >= parentX + parentW)
newX = parentX + parentW - 1;
if (newY >= parentY + parentH)
newY = parentY + parentH - 1;
if (newX >= parentX + parentW) newX = parentX + parentW - 1;
if (newY >= parentY + parentH) newY = parentY + parentH - 1;
int maxX = parentX + parentW;
int maxY = parentY + parentH;
if (newX + newW > maxX)
newW = maxX - newX;
if (newY + newH > maxY)
newH = maxY - newY;
if (newX + newW > maxX) newW = maxX - newX;
if (newY + newH > maxY) newH = maxY - newY;
if (newW < 0)
newW = 0;
if (newH < 0)
newH = 0;
if (newW < 0) newW = 0;
if (newH < 0) newH = 0;
// Check if position changed
if (newX != absX || newY != absY || newW != absW || newH != absH) {
@ -133,7 +125,7 @@ public:
}
}
virtual Container *asContainer() { return nullptr; }
virtual Container* asContainer() { return nullptr; }
enum class ElementType {
Base,
@ -166,12 +158,11 @@ public:
Rect getBounds() const { return Rect(absX, absY, absW, absH); }
// Main draw method - handles caching automatically
virtual void draw(const GfxRenderer &renderer,
const ThemeContext &context) = 0;
virtual void draw(const GfxRenderer& renderer, const ThemeContext& context) = 0;
protected:
protected:
// Cache the rendered output
bool cacheRender(const GfxRenderer &renderer) {
bool cacheRender(const GfxRenderer& renderer) {
if (cachedRender) {
free(cachedRender);
cachedRender = nullptr;
@ -190,16 +181,13 @@ protected:
}
// Restore from cache
bool restoreFromCache(const GfxRenderer &renderer) const {
if (!cacheValid || !cachedRender)
return false;
if (absX != cachedX || absY != cachedY || absW != cachedW ||
absH != cachedH)
return false;
bool restoreFromCache(const GfxRenderer& renderer) const {
if (!cacheValid || !cachedRender) return false;
if (absX != cachedX || absY != cachedY || absW != cachedW || absH != cachedH) return false;
renderer.restoreRegion(cachedRender, absX, absY, absW, absH);
return true;
}
};
} // namespace ThemeEngine
} // namespace ThemeEngine

33
lib/ThemeEngine/src/BasicElements.cpp
View File

@ -1,4 +1,5 @@
#include "BasicElements.h"
#include "Bitmap.h"
#include "ListElement.h"
#include "ThemeManager.h"
@ -7,8 +8,7 @@
namespace ThemeEngine {
// --- BitmapElement ---
void BitmapElement::draw(const GfxRenderer &renderer,
const ThemeContext &context) {
void BitmapElement::draw(const GfxRenderer& renderer, const ThemeContext& context) {
if (!isVisible(context)) {
markClean();
return;
@ -21,13 +21,12 @@ void BitmapElement::draw(const GfxRenderer &renderer,
}
// Check if we have a cached 1-bit render of this bitmap at this size
const ProcessedAsset *processed =
ThemeManager::get().getProcessedAsset(path, renderer.getOrientation(), absW, absH);
const ProcessedAsset* processed = ThemeManager::get().getProcessedAsset(path, renderer.getOrientation(), absW, absH);
if (processed && processed->w == absW && processed->h == absH) {
// Draw cached 1-bit data directly
const int rowBytes = (absW + 7) / 8;
for (int y = 0; y < absH; y++) {
const uint8_t *srcRow = processed->data.data() + y * rowBytes;
const uint8_t* srcRow = processed->data.data() + y * rowBytes;
for (int x = 0; x < absW; x++) {
bool isBlack = !(srcRow[x / 8] & (1 << (7 - (x % 8))));
if (isBlack) {
@ -40,7 +39,7 @@ void BitmapElement::draw(const GfxRenderer &renderer,
}
// Load raw asset from cache (file data cached in memory)
const std::vector<uint8_t> *data = ThemeManager::get().getCachedAsset(path);
const std::vector<uint8_t>* data = ThemeManager::get().getCachedAsset(path);
if (!data || data->empty()) {
markClean();
return;
@ -54,19 +53,19 @@ void BitmapElement::draw(const GfxRenderer &renderer,
// Draw the bitmap (handles scaling internally)
renderer.drawBitmap(bmp, absX, absY, absW, absH);
// Cache the result as 1-bit packed data for next time
ProcessedAsset asset;
asset.w = absW;
asset.h = absH;
asset.orientation = renderer.getOrientation();
const int rowBytes = (absW + 7) / 8;
asset.data.resize(rowBytes * absH, 0xFF); // Initialize to white
asset.data.resize(rowBytes * absH, 0xFF); // Initialize to white
// Capture pixels using renderer's coordinate system
for (int y = 0; y < absH; y++) {
uint8_t *dstRow = asset.data.data() + y * rowBytes;
uint8_t* dstRow = asset.data.data() + y * rowBytes;
for (int x = 0; x < absW; x++) {
// Read pixel from framebuffer (this handles orientation)
bool isBlack = renderer.readPixel(absX + x, absY + y);
@ -75,14 +74,14 @@ void BitmapElement::draw(const GfxRenderer &renderer,
}
}
}
ThemeManager::get().cacheProcessedAsset(path, asset, absW, absH);
markClean();
}
// --- List ---
void List::draw(const GfxRenderer &renderer, const ThemeContext &context) {
void List::draw(const GfxRenderer& renderer, const ThemeContext& context) {
if (!isVisible(context)) {
markClean();
return;
@ -148,8 +147,7 @@ void List::draw(const GfxRenderer &renderer, const ThemeContext &context) {
currentX += itemW + spacing;
continue;
}
if (currentX > absX + absW)
break;
if (currentX > absX + absW) break;
} else {
// Grid mode
if (currentY + itemH < absY) {
@ -162,8 +160,7 @@ void List::draw(const GfxRenderer &renderer, const ThemeContext &context) {
currentX = absX + col * (itemW + spacing);
continue;
}
if (currentY > absY + absH)
break;
if (currentY > absY + absH) break;
}
// Layout and draw
@ -225,4 +222,4 @@ void List::draw(const GfxRenderer &renderer, const ThemeContext &context) {
markClean();
}
} // namespace ThemeEngine
} // namespace ThemeEngine

20
lib/ThemeEngine/src/IniParser.cpp
View File

@ -1,11 +1,11 @@
#include "IniParser.h"
#include <sstream>
namespace ThemeEngine {
void IniParser::trim(std::string &s) {
if (s.empty())
return;
void IniParser::trim(std::string& s) {
if (s.empty()) return;
// Trim left
size_t first = s.find_first_not_of(" \t\n\r");
@ -19,14 +19,13 @@ void IniParser::trim(std::string &s) {
s = s.substr(first, (last - first + 1));
}
std::map<std::string, std::map<std::string, std::string>>
IniParser::parse(Stream &stream) {
std::map<std::string, std::map<std::string, std::string>> IniParser::parse(Stream& stream) {
std::map<std::string, std::map<std::string, std::string>> sections;
// stream check not strictly possible like file, can rely on available()
std::string currentSection = "";
String line; // Use Arduino String for easy file reading, then convert to
// std::string
String line; // Use Arduino String for easy file reading, then convert to
// std::string
while (stream.available()) {
line = stream.readStringUntil('\n');
@ -34,7 +33,7 @@ IniParser::parse(Stream &stream) {
trim(sLine);
if (sLine.empty() || sLine[0] == ';' || sLine[0] == '#') {
continue; // Skip comments and empty lines
continue; // Skip comments and empty lines
}
if (sLine.front() == '[' && sLine.back() == ']') {
@ -62,8 +61,7 @@ IniParser::parse(Stream &stream) {
return sections;
}
std::map<std::string, std::map<std::string, std::string>>
IniParser::parseString(const std::string &content) {
std::map<std::string, std::map<std::string, std::string>> IniParser::parseString(const std::string& content) {
std::map<std::string, std::map<std::string, std::string>> sections;
std::stringstream ss(content);
std::string line;
@ -101,4 +99,4 @@ IniParser::parseString(const std::string &content) {
return sections;
}
} // namespace ThemeEngine
} // namespace ThemeEngine

13
lib/ThemeEngine/src/LayoutElements.cpp
View File

@ -1,12 +1,14 @@
#include "LayoutElements.h"
#include "ThemeManager.h"
#include <Bitmap.h>
#include "ThemeManager.h"
namespace ThemeEngine {
// Built-in icon drawing
// These are simple geometric representations of common icons
void Icon::draw(const GfxRenderer &renderer, const ThemeContext &context) {
void Icon::draw(const GfxRenderer& renderer, const ThemeContext& context) {
if (!isVisible(context)) {
markClean();
return;
@ -29,15 +31,14 @@ void Icon::draw(const GfxRenderer &renderer, const ThemeContext &context) {
int cy = absY + h / 2;
// Check if it's a path to a BMP file
if (iconName.find('/') != std::string::npos ||
iconName.find('.') != std::string::npos) {
if (iconName.find('/') != std::string::npos || iconName.find('.') != std::string::npos) {
// Try to load as bitmap
std::string path = iconName;
if (path[0] != '/') {
path = ThemeManager::get().getAssetPath(iconName);
}
const std::vector<uint8_t> *data = ThemeManager::get().getCachedAsset(path);
const std::vector<uint8_t>* data = ThemeManager::get().getCachedAsset(path);
if (data && !data->empty()) {
Bitmap bmp(data->data(), data->size());
if (bmp.parseHeaders() == BmpReaderError::Ok) {
@ -170,4 +171,4 @@ void Icon::draw(const GfxRenderer &renderer, const ThemeContext &context) {
markClean();
}
} // namespace ThemeEngine
} // namespace ThemeEngine

342
lib/ThemeEngine/src/ThemeManager.cpp
View File

@ -1,82 +1,63 @@
#include "ThemeManager.h"
#include "DefaultTheme.h"
#include "LayoutElements.h"
#include "ListElement.h"
#include <SDCardManager.h>
#include <algorithm>
#include <map>
#include <vector>
#include "DefaultTheme.h"
#include "LayoutElements.h"
#include "ListElement.h"
namespace ThemeEngine {
void ThemeManager::begin() {
// Default fonts or setup
}
void ThemeManager::registerFont(const std::string &name, int id) {
fontMap[name] = id;
}
void ThemeManager::registerFont(const std::string& name, int id) { fontMap[name] = id; }
std::string ThemeManager::getAssetPath(const std::string &assetName) {
std::string ThemeManager::getAssetPath(const std::string& assetName) {
// Check if absolute path
if (!assetName.empty() && assetName[0] == '/')
return assetName;
if (!assetName.empty() && assetName[0] == '/') return assetName;
// Otherwise relative to theme assets
return "/themes/" + currentThemeName + "/assets/" + assetName;
}
UIElement *ThemeManager::createElement(const std::string &id,
const std::string &type) {
UIElement* ThemeManager::createElement(const std::string& id, const std::string& type) {
// Basic elements
if (type == "Container")
return new Container(id);
if (type == "Rectangle")
return new Rectangle(id);
if (type == "Label")
return new Label(id);
if (type == "Bitmap")
return new BitmapElement(id);
if (type == "List")
return new List(id);
if (type == "ProgressBar")
return new ProgressBar(id);
if (type == "Divider")
return new Divider(id);
if (type == "Container") return new Container(id);
if (type == "Rectangle") return new Rectangle(id);
if (type == "Label") return new Label(id);
if (type == "Bitmap") return new BitmapElement(id);
if (type == "List") return new List(id);
if (type == "ProgressBar") return new ProgressBar(id);
if (type == "Divider") return new Divider(id);
// Layout elements
if (type == "HStack")
return new HStack(id);
if (type == "VStack")
return new VStack(id);
if (type == "Grid")
return new Grid(id);
if (type == "HStack") return new HStack(id);
if (type == "VStack") return new VStack(id);
if (type == "Grid") return new Grid(id);
// Advanced elements
if (type == "Badge")
return new Badge(id);
if (type == "Toggle")
return new Toggle(id);
if (type == "TabBar")
return new TabBar(id);
if (type == "Icon")
return new Icon(id);
if (type == "ScrollIndicator")
return new ScrollIndicator(id);
if (type == "BatteryIcon")
return new BatteryIcon(id);
if (type == "Badge") return new Badge(id);
if (type == "Toggle") return new Toggle(id);
if (type == "TabBar") return new TabBar(id);
if (type == "Icon") return new Icon(id);
if (type == "ScrollIndicator") return new ScrollIndicator(id);
if (type == "BatteryIcon") return new BatteryIcon(id);
return nullptr;
}
void ThemeManager::applyProperties(
UIElement *elem, const std::map<std::string, std::string> &props) {
void ThemeManager::applyProperties(UIElement* elem, const std::map<std::string, std::string>& props) {
const auto elemType = elem->getType();
for (const auto &kv : props) {
const std::string &key = kv.first;
const std::string &val = kv.second;
for (const auto& kv : props) {
const std::string& key = kv.first;
const std::string& val = kv.second;
// ========== Common properties ==========
if (key == "X")
@ -95,7 +76,7 @@ void ThemeManager::applyProperties(
// ========== Rectangle properties ==========
else if (key == "Fill") {
if (elemType == UIElement::ElementType::Rectangle) {
auto rect = static_cast<Rectangle *>(elem);
auto rect = static_cast<Rectangle*>(elem);
if (val.find('{') != std::string::npos) {
rect->setFillExpr(val);
} else {
@ -104,21 +85,19 @@ void ThemeManager::applyProperties(
}
} else if (key == "Color") {
if (elemType == UIElement::ElementType::Rectangle) {
static_cast<Rectangle *>(elem)->setColorExpr(val);
} else if (elemType == UIElement::ElementType::Container ||
elemType == UIElement::ElementType::HStack ||
elemType == UIElement::ElementType::VStack ||
elemType == UIElement::ElementType::Grid ||
static_cast<Rectangle*>(elem)->setColorExpr(val);
} else if (elemType == UIElement::ElementType::Container || elemType == UIElement::ElementType::HStack ||
elemType == UIElement::ElementType::VStack || elemType == UIElement::ElementType::Grid ||
elemType == UIElement::ElementType::TabBar) {
static_cast<Container *>(elem)->setBackgroundColorExpr(val);
static_cast<Container*>(elem)->setBackgroundColorExpr(val);
} else if (elemType == UIElement::ElementType::Label) {
static_cast<Label *>(elem)->setColorExpr(val);
static_cast<Label*>(elem)->setColorExpr(val);
} else if (elemType == UIElement::ElementType::Divider) {
static_cast<Divider *>(elem)->setColorExpr(val);
static_cast<Divider*>(elem)->setColorExpr(val);
} else if (elemType == UIElement::ElementType::Icon) {
static_cast<Icon *>(elem)->setColorExpr(val);
static_cast<Icon*>(elem)->setColorExpr(val);
} else if (elemType == UIElement::ElementType::BatteryIcon) {
static_cast<BatteryIcon *>(elem)->setColor(val);
static_cast<BatteryIcon*>(elem)->setColor(val);
}
}
@ -132,278 +111,264 @@ void ThemeManager::applyProperties(
}
}
} else if (key == "Padding") {
if (elemType == UIElement::ElementType::Container ||
elemType == UIElement::ElementType::HStack ||
elemType == UIElement::ElementType::VStack ||
elemType == UIElement::ElementType::Grid) {
static_cast<Container *>(elem)->setPadding(std::stoi(val));
if (elemType == UIElement::ElementType::Container || elemType == UIElement::ElementType::HStack ||
elemType == UIElement::ElementType::VStack || elemType == UIElement::ElementType::Grid) {
static_cast<Container*>(elem)->setPadding(std::stoi(val));
} else if (elemType == UIElement::ElementType::TabBar) {
static_cast<TabBar *>(elem)->setPadding(std::stoi(val));
static_cast<TabBar*>(elem)->setPadding(std::stoi(val));
}
} else if (key == "BorderRadius") {
if (elemType == UIElement::ElementType::Container ||
elemType == UIElement::ElementType::HStack ||
elemType == UIElement::ElementType::VStack ||
elemType == UIElement::ElementType::Grid) {
static_cast<Container *>(elem)->setBorderRadius(std::stoi(val));
if (elemType == UIElement::ElementType::Container || elemType == UIElement::ElementType::HStack ||
elemType == UIElement::ElementType::VStack || elemType == UIElement::ElementType::Grid) {
static_cast<Container*>(elem)->setBorderRadius(std::stoi(val));
}
} else if (key == "Spacing") {
if (elemType == UIElement::ElementType::HStack) {
static_cast<HStack *>(elem)->setSpacing(std::stoi(val));
static_cast<HStack*>(elem)->setSpacing(std::stoi(val));
} else if (elemType == UIElement::ElementType::VStack) {
static_cast<VStack *>(elem)->setSpacing(std::stoi(val));
static_cast<VStack*>(elem)->setSpacing(std::stoi(val));
} else if (elemType == UIElement::ElementType::List) {
static_cast<List *>(elem)->setSpacing(std::stoi(val));
static_cast<List*>(elem)->setSpacing(std::stoi(val));
}
} else if (key == "CenterVertical") {
if (elemType == UIElement::ElementType::HStack) {
static_cast<HStack *>(elem)->setCenterVertical(val == "true" || val == "1");
static_cast<HStack*>(elem)->setCenterVertical(val == "true" || val == "1");
}
} else if (key == "CenterHorizontal") {
if (elemType == UIElement::ElementType::VStack) {
static_cast<VStack *>(elem)->setCenterHorizontal(val == "true" || val == "1");
static_cast<VStack*>(elem)->setCenterHorizontal(val == "true" || val == "1");
}
}
// ========== Label properties ==========
else if (key == "Text") {
if (elemType == UIElement::ElementType::Label) {
static_cast<Label *>(elem)->setText(val);
static_cast<Label*>(elem)->setText(val);
} else if (elemType == UIElement::ElementType::Badge) {
static_cast<Badge *>(elem)->setText(val);
static_cast<Badge*>(elem)->setText(val);
}
} else if (key == "Font") {
if (elemType == UIElement::ElementType::Label) {
if (fontMap.count(val)) {
static_cast<Label *>(elem)->setFont(fontMap[val]);
static_cast<Label*>(elem)->setFont(fontMap[val]);
}
} else if (elemType == UIElement::ElementType::Badge) {
if (fontMap.count(val)) {
static_cast<Badge *>(elem)->setFont(fontMap[val]);
static_cast<Badge*>(elem)->setFont(fontMap[val]);
}
}
} else if (key == "Centered") {
if (elemType == UIElement::ElementType::Label) {
static_cast<Label *>(elem)->setCentered(val == "true" || val == "1");
static_cast<Label*>(elem)->setCentered(val == "true" || val == "1");
}
} else if (key == "Align") {
if (elemType == UIElement::ElementType::Label) {
Label::Alignment align = Label::Alignment::Left;
if (val == "Center" || val == "center")
align = Label::Alignment::Center;
if (val == "Right" || val == "right")
align = Label::Alignment::Right;
static_cast<Label *>(elem)->setAlignment(align);
if (val == "Center" || val == "center") align = Label::Alignment::Center;
if (val == "Right" || val == "right") align = Label::Alignment::Right;
static_cast<Label*>(elem)->setAlignment(align);
}
} else if (key == "MaxLines") {
if (elemType == UIElement::ElementType::Label) {
static_cast<Label *>(elem)->setMaxLines(std::stoi(val));
static_cast<Label*>(elem)->setMaxLines(std::stoi(val));
}
} else if (key == "Ellipsis") {
if (elemType == UIElement::ElementType::Label) {
static_cast<Label *>(elem)->setEllipsis(val == "true" || val == "1");
static_cast<Label*>(elem)->setEllipsis(val == "true" || val == "1");
}
}
// ========== Bitmap/Icon properties ==========
else if (key == "Src") {
if (elemType == UIElement::ElementType::Bitmap) {
auto b = static_cast<BitmapElement *>(elem);
if (val.find('{') == std::string::npos &&
val.find('/') == std::string::npos) {
auto b = static_cast<BitmapElement*>(elem);
if (val.find('{') == std::string::npos && val.find('/') == std::string::npos) {
b->setSrc(getAssetPath(val));
} else {
b->setSrc(val);
}
} else if (elemType == UIElement::ElementType::Icon) {
static_cast<Icon *>(elem)->setSrc(val);
static_cast<Icon*>(elem)->setSrc(val);
}
} else if (key == "ScaleToFit") {
if (elemType == UIElement::ElementType::Bitmap) {
static_cast<BitmapElement *>(elem)->setScaleToFit(val == "true" ||
val == "1");
static_cast<BitmapElement*>(elem)->setScaleToFit(val == "true" || val == "1");
}
} else if (key == "PreserveAspect") {
if (elemType == UIElement::ElementType::Bitmap) {
static_cast<BitmapElement *>(elem)->setPreserveAspect(val == "true" ||
val == "1");
static_cast<BitmapElement*>(elem)->setPreserveAspect(val == "true" || val == "1");
}
} else if (key == "IconSize") {
if (elemType == UIElement::ElementType::Icon) {
static_cast<Icon *>(elem)->setIconSize(std::stoi(val));
static_cast<Icon*>(elem)->setIconSize(std::stoi(val));
}
}
// ========== List properties ==========
else if (key == "Source") {
if (elemType == UIElement::ElementType::List) {
static_cast<List *>(elem)->setSource(val);
static_cast<List*>(elem)->setSource(val);
}
} else if (key == "ItemTemplate") {
if (elemType == UIElement::ElementType::List) {
static_cast<List *>(elem)->setItemTemplateId(val);
static_cast<List*>(elem)->setItemTemplateId(val);
}
} else if (key == "ItemHeight") {
if (elemType == UIElement::ElementType::List) {
static_cast<List *>(elem)->setItemHeight(std::stoi(val));
static_cast<List*>(elem)->setItemHeight(std::stoi(val));
}
} else if (key == "ItemWidth") {
if (elemType == UIElement::ElementType::List) {
static_cast<List *>(elem)->setItemWidth(std::stoi(val));
static_cast<List*>(elem)->setItemWidth(std::stoi(val));
}
} else if (key == "Direction") {
if (elemType == UIElement::ElementType::List) {
static_cast<List *>(elem)->setDirectionFromString(val);
static_cast<List*>(elem)->setDirectionFromString(val);
}
} else if (key == "Columns") {
if (elemType == UIElement::ElementType::List) {
static_cast<List *>(elem)->setColumns(std::stoi(val));
static_cast<List*>(elem)->setColumns(std::stoi(val));
} else if (elemType == UIElement::ElementType::Grid) {
static_cast<Grid *>(elem)->setColumns(std::stoi(val));
static_cast<Grid*>(elem)->setColumns(std::stoi(val));
}
} else if (key == "RowSpacing") {
if (elemType == UIElement::ElementType::Grid) {
static_cast<Grid *>(elem)->setRowSpacing(std::stoi(val));
static_cast<Grid*>(elem)->setRowSpacing(std::stoi(val));
}
} else if (key == "ColSpacing") {
if (elemType == UIElement::ElementType::Grid) {
static_cast<Grid *>(elem)->setColSpacing(std::stoi(val));
static_cast<Grid*>(elem)->setColSpacing(std::stoi(val));
}
}
// ========== ProgressBar properties ==========
else if (key == "Value") {
if (elemType == UIElement::ElementType::ProgressBar) {
static_cast<ProgressBar *>(elem)->setValue(val);
static_cast<ProgressBar*>(elem)->setValue(val);
} else if (elemType == UIElement::ElementType::Toggle) {
static_cast<Toggle *>(elem)->setValue(val);
static_cast<Toggle*>(elem)->setValue(val);
} else if (elemType == UIElement::ElementType::BatteryIcon) {
static_cast<BatteryIcon *>(elem)->setValue(val);
static_cast<BatteryIcon*>(elem)->setValue(val);
}
} else if (key == "Max") {
if (elemType == UIElement::ElementType::ProgressBar) {
static_cast<ProgressBar *>(elem)->setMax(val);
static_cast<ProgressBar*>(elem)->setMax(val);
}
} else if (key == "FgColor") {
if (elemType == UIElement::ElementType::ProgressBar) {
static_cast<ProgressBar *>(elem)->setFgColor(val);
static_cast<ProgressBar*>(elem)->setFgColor(val);
} else if (elemType == UIElement::ElementType::Badge) {
static_cast<Badge *>(elem)->setFgColor(val);
static_cast<Badge*>(elem)->setFgColor(val);
}
} else if (key == "BgColor") {
if (elemType == UIElement::ElementType::ProgressBar) {
static_cast<ProgressBar *>(elem)->setBgColor(val);
static_cast<ProgressBar*>(elem)->setBgColor(val);
} else if (elemType == UIElement::ElementType::Badge) {
static_cast<Badge *>(elem)->setBgColor(val);
} else if (elemType == UIElement::ElementType::Container ||
elemType == UIElement::ElementType::HStack ||
elemType == UIElement::ElementType::VStack ||
elemType == UIElement::ElementType::Grid) {
static_cast<Container *>(elem)->setBackgroundColorExpr(val);
static_cast<Badge*>(elem)->setBgColor(val);
} else if (elemType == UIElement::ElementType::Container || elemType == UIElement::ElementType::HStack ||
elemType == UIElement::ElementType::VStack || elemType == UIElement::ElementType::Grid) {
static_cast<Container*>(elem)->setBackgroundColorExpr(val);
}
} else if (key == "ShowBorder") {
if (elemType == UIElement::ElementType::ProgressBar) {
static_cast<ProgressBar *>(elem)->setShowBorder(val == "true" ||
val == "1");
static_cast<ProgressBar*>(elem)->setShowBorder(val == "true" || val == "1");
}
}
// ========== Divider properties ==========
else if (key == "Horizontal") {
if (elemType == UIElement::ElementType::Divider) {
static_cast<Divider *>(elem)->setHorizontal(val == "true" || val == "1");
static_cast<Divider*>(elem)->setHorizontal(val == "true" || val == "1");
}
} else if (key == "Thickness") {
if (elemType == UIElement::ElementType::Divider) {
static_cast<Divider *>(elem)->setThickness(std::stoi(val));
static_cast<Divider*>(elem)->setThickness(std::stoi(val));
}
}
// ========== Toggle properties ==========
else if (key == "OnColor") {
if (elemType == UIElement::ElementType::Toggle) {
static_cast<Toggle *>(elem)->setOnColor(val);
static_cast<Toggle*>(elem)->setOnColor(val);
}
} else if (key == "OffColor") {
if (elemType == UIElement::ElementType::Toggle) {
static_cast<Toggle *>(elem)->setOffColor(val);
static_cast<Toggle*>(elem)->setOffColor(val);
}
} else if (key == "TrackWidth") {
if (elemType == UIElement::ElementType::Toggle) {
static_cast<Toggle *>(elem)->setTrackWidth(std::stoi(val));
static_cast<Toggle*>(elem)->setTrackWidth(std::stoi(val));
} else if (elemType == UIElement::ElementType::ScrollIndicator) {
static_cast<ScrollIndicator *>(elem)->setTrackWidth(std::stoi(val));
static_cast<ScrollIndicator*>(elem)->setTrackWidth(std::stoi(val));
}
} else if (key == "TrackHeight") {
if (elemType == UIElement::ElementType::Toggle) {
static_cast<Toggle *>(elem)->setTrackHeight(std::stoi(val));
static_cast<Toggle*>(elem)->setTrackHeight(std::stoi(val));
}
} else if (key == "KnobSize") {
if (elemType == UIElement::ElementType::Toggle) {
static_cast<Toggle *>(elem)->setKnobSize(std::stoi(val));
static_cast<Toggle*>(elem)->setKnobSize(std::stoi(val));
}
}
// ========== TabBar properties ==========
else if (key == "Selected") {
if (elemType == UIElement::ElementType::TabBar) {
static_cast<TabBar *>(elem)->setSelected(val);
static_cast<TabBar*>(elem)->setSelected(val);
}
} else if (key == "TabSpacing") {
if (elemType == UIElement::ElementType::TabBar) {
static_cast<TabBar *>(elem)->setTabSpacing(std::stoi(val));
static_cast<TabBar*>(elem)->setTabSpacing(std::stoi(val));
}
} else if (key == "IndicatorHeight") {
if (elemType == UIElement::ElementType::TabBar) {
static_cast<TabBar *>(elem)->setIndicatorHeight(std::stoi(val));
static_cast<TabBar*>(elem)->setIndicatorHeight(std::stoi(val));
}
} else if (key == "ShowIndicator") {
if (elemType == UIElement::ElementType::TabBar) {
static_cast<TabBar *>(elem)->setShowIndicator(val == "true" || val == "1");
static_cast<TabBar*>(elem)->setShowIndicator(val == "true" || val == "1");
}
}
// ========== ScrollIndicator properties ==========
else if (key == "Position") {
if (elemType == UIElement::ElementType::ScrollIndicator) {
static_cast<ScrollIndicator *>(elem)->setPosition(val);
static_cast<ScrollIndicator*>(elem)->setPosition(val);
}
} else if (key == "Total") {
if (elemType == UIElement::ElementType::ScrollIndicator) {
static_cast<ScrollIndicator *>(elem)->setTotal(val);
static_cast<ScrollIndicator*>(elem)->setTotal(val);
}
} else if (key == "VisibleCount") {
if (elemType == UIElement::ElementType::ScrollIndicator) {
static_cast<ScrollIndicator *>(elem)->setVisibleCount(val);
static_cast<ScrollIndicator*>(elem)->setVisibleCount(val);
}
}
// ========== Badge properties ==========
else if (key == "PaddingH") {
if (elemType == UIElement::ElementType::Badge) {
static_cast<Badge *>(elem)->setPaddingH(std::stoi(val));
static_cast<Badge*>(elem)->setPaddingH(std::stoi(val));
}
} else if (key == "PaddingV") {
if (elemType == UIElement::ElementType::Badge) {
static_cast<Badge *>(elem)->setPaddingV(std::stoi(val));
static_cast<Badge*>(elem)->setPaddingV(std::stoi(val));
}
}
}
}
const std::vector<uint8_t> *
ThemeManager::getCachedAsset(const std::string &path) {
const std::vector<uint8_t>* ThemeManager::getCachedAsset(const std::string& path) {
if (assetCache.count(path)) {
return &assetCache.at(path);
}
if (!SdMan.exists(path.c_str()))
return nullptr;
if (!SdMan.exists(path.c_str())) return nullptr;
FsFile file;
if (SdMan.openFileForRead("ThemeCache", path, file)) {
size_t size = file.size();
auto &buf = assetCache[path];
auto& buf = assetCache[path];
buf.resize(size);
file.read(buf.data(), size);
file.close();
@ -412,18 +377,16 @@ ThemeManager::getCachedAsset(const std::string &path) {
return nullptr;
}
const ProcessedAsset *
ThemeManager::getProcessedAsset(const std::string &path,
GfxRenderer::Orientation orientation,
int targetW, int targetH) {
const ProcessedAsset* ThemeManager::getProcessedAsset(const std::string& path, GfxRenderer::Orientation orientation,
int targetW, int targetH) {
// Include dimensions in cache key for scaled images
std::string cacheKey = path;
if (targetW > 0 && targetH > 0) {
cacheKey += ":" + std::to_string(targetW) + "x" + std::to_string(targetH);
}
if (processedCache.count(cacheKey)) {
const auto &asset = processedCache.at(cacheKey);
const auto& asset = processedCache.at(cacheKey);
if (asset.orientation == orientation) {
return &asset;
}
@ -431,9 +394,7 @@ ThemeManager::getProcessedAsset(const std::string &path,
return nullptr;
}
void ThemeManager::cacheProcessedAsset(const std::string &path,
const ProcessedAsset &asset,
int targetW, int targetH) {
void ThemeManager::cacheProcessedAsset(const std::string& path, const ProcessedAsset& asset, int targetW, int targetH) {
std::string cacheKey = path;
if (targetW > 0 && targetH > 0) {
cacheKey += ":" + std::to_string(targetW) + "x" + std::to_string(targetH);
@ -456,19 +417,18 @@ void ThemeManager::unloadTheme() {
}
void ThemeManager::invalidateAllCaches() {
for (auto &kv : screenCaches) {
for (auto& kv : screenCaches) {
kv.second.invalidate();
}
}
void ThemeManager::invalidateScreenCache(const std::string &screenName) {
void ThemeManager::invalidateScreenCache(const std::string& screenName) {
if (screenCaches.count(screenName)) {
screenCaches[screenName].invalidate();
}
}
uint32_t ThemeManager::computeContextHash(const ThemeContext &context,
const std::string &screenName) {
uint32_t ThemeManager::computeContextHash(const ThemeContext& context, const std::string& screenName) {
uint32_t hash = 2166136261u;
for (char c : screenName) {
hash ^= static_cast<uint32_t>(c);
@ -477,7 +437,7 @@ uint32_t ThemeManager::computeContextHash(const ThemeContext &context,
return hash;
}
void ThemeManager::loadTheme(const std::string &themeName) {
void ThemeManager::loadTheme(const std::string& themeName) {
unloadTheme();
currentThemeName = themeName;
@ -500,7 +460,7 @@ void ThemeManager::loadTheme(const std::string &themeName) {
} else {
std::string path = "/themes/" + themeName + "/theme.ini";
Serial.printf("[ThemeManager] Checking path: %s\n", path.c_str());
if (!SdMan.exists(path.c_str())) {
Serial.printf("[ThemeManager] Theme %s not found, using Default\n", themeName.c_str());
sections = IniParser::parseString(getDefaultThemeIni());
@ -511,8 +471,7 @@ void ThemeManager::loadTheme(const std::string &themeName) {
Serial.printf("[ThemeManager] Parsing theme file...\n");
sections = IniParser::parse(file);
file.close();
Serial.printf("[ThemeManager] Parsed %d sections from %s\n",
(int)sections.size(), themeName.c_str());
Serial.printf("[ThemeManager] Parsed %d sections from %s\n", (int)sections.size(), themeName.c_str());
} else {
Serial.printf("[ThemeManager] Failed to open %s, using Default\n", path.c_str());
sections = IniParser::parseString(getDefaultThemeIni());
@ -522,63 +481,57 @@ void ThemeManager::loadTheme(const std::string &themeName) {
}
// Read theme configuration from [Global] section
navBookCount = 1; // Default
navBookCount = 1; // Default
if (sections.count("Global")) {
const auto &global = sections.at("Global");
const auto& global = sections.at("Global");
if (global.count("NavBookCount")) {
navBookCount = std::stoi(global.at("NavBookCount"));
if (navBookCount < 1) navBookCount = 1;
if (navBookCount > 10) navBookCount = 10; // Reasonable max
if (navBookCount > 10) navBookCount = 10; // Reasonable max
}
}
// Pass 1: Creation
for (const auto &sec : sections) {
for (const auto& sec : sections) {
std::string id = sec.first;
const std::map<std::string, std::string> &props = sec.second;
const std::map<std::string, std::string>& props = sec.second;
if (id == "Global")
continue;
if (id == "Global") continue;
auto it = props.find("Type");
if (it == props.end())
continue;
if (it == props.end()) continue;
std::string type = it->second;
if (type.empty())
continue;
if (type.empty()) continue;
UIElement *elem = createElement(id, type);
UIElement* elem = createElement(id, type);
if (elem) {
elements[id] = elem;
}
}
// Pass 2: Properties & Parent Wiring
std::vector<List *> lists;
for (const auto &sec : sections) {
std::vector<List*> lists;
for (const auto& sec : sections) {
std::string id = sec.first;
if (id == "Global")
continue;
if (elements.find(id) == elements.end())
continue;
if (id == "Global") continue;
if (elements.find(id) == elements.end()) continue;
UIElement *elem = elements[id];
UIElement* elem = elements[id];
applyProperties(elem, sec.second);
if (elem->getType() == UIElement::ElementType::List) {
lists.push_back(static_cast<List *>(elem));
lists.push_back(static_cast<List*>(elem));
}
if (sec.second.count("Parent")) {
std::string parentId = sec.second.at("Parent");
if (elements.count(parentId)) {
UIElement *parent = elements[parentId];
UIElement* parent = elements[parentId];
if (auto c = parent->asContainer()) {
c->addChild(elem);
}
} else {
Serial.printf("[ThemeManager] WARN: Parent %s not found for %s\n",
parentId.c_str(), id.c_str());
Serial.printf("[ThemeManager] WARN: Parent %s not found for %s\n", parentId.c_str(), id.c_str());
}
}
}
@ -588,31 +541,26 @@ void ThemeManager::loadTheme(const std::string &themeName) {
l->resolveTemplate(elements);
}
Serial.printf("[ThemeManager] Theme loaded with %d elements\n",
(int)elements.size());
Serial.printf("[ThemeManager] Theme loaded with %d elements\n", (int)elements.size());
}
void ThemeManager::renderScreen(const std::string &screenName,
const GfxRenderer &renderer,
const ThemeContext &context) {
void ThemeManager::renderScreen(const std::string& screenName, const GfxRenderer& renderer,
const ThemeContext& context) {
if (elements.count(screenName) == 0) {
Serial.printf("[ThemeManager] Screen '%s' not found\n", screenName.c_str());
return;
}
UIElement *root = elements[screenName];
UIElement* root = elements[screenName];
root->layout(context, 0, 0, renderer.getScreenWidth(),
renderer.getScreenHeight());
root->layout(context, 0, 0, renderer.getScreenWidth(), renderer.getScreenHeight());
root->draw(renderer, context);
}
void ThemeManager::renderScreenOptimized(const std::string &screenName,
const GfxRenderer &renderer,
const ThemeContext &context,
const ThemeContext *prevContext) {
void ThemeManager::renderScreenOptimized(const std::string& screenName, const GfxRenderer& renderer,
const ThemeContext& context, const ThemeContext* prevContext) {
renderScreen(screenName, renderer, context);
}
} // namespace ThemeEngine
} // namespace ThemeEngine

79
src/activities/home/HomeActivity.cpp
View File

@ -4,6 +4,7 @@
#include <Epub.h>
#include <GfxRenderer.h>
#include <SDCardManager.h>
#include <ThemeManager.h>
#include <Xtc.h>
#include <cstring>
@ -17,17 +18,15 @@
#include "ScreenComponents.h"
#include "fontIds.h"
#include "util/StringUtils.h"
#include <ThemeManager.h>
void HomeActivity::taskTrampoline(void *param) {
auto *self = static_cast<HomeActivity *>(param);
void HomeActivity::taskTrampoline(void* param) {
auto* self = static_cast<HomeActivity*>(param);
self->displayTaskLoop();
}
int HomeActivity::getMenuItemCount() const {
int count = 3; // Browse Files, File Transfer, Settings
if (hasOpdsUrl)
count++; // + Calibre Library
int count = 3; // Browse Files, File Transfer, Settings
if (hasOpdsUrl) count++; // + Calibre Library
return count;
}
@ -43,8 +42,7 @@ void HomeActivity::onEnter() {
selectorIndex = 0; // Start at first item (first book if any, else first menu)
// Check if we have a book to continue reading
hasContinueReading = !APP_STATE.openEpubPath.empty() &&
SdMan.exists(APP_STATE.openEpubPath.c_str());
hasContinueReading = !APP_STATE.openEpubPath.empty() && SdMan.exists(APP_STATE.openEpubPath.c_str());
// Check if OPDS browser URL is configured
hasOpdsUrl = strlen(SETTINGS.opdsServerUrl) > 0;
@ -99,7 +97,7 @@ void HomeActivity::onEnter() {
}
selectorIndex = 0;
lastBatteryCheck = 0; // Force update on first render
lastBatteryCheck = 0; // Force update on first render
coverRendered = false;
coverBufferStored = false;
@ -110,25 +108,25 @@ void HomeActivity::onEnter() {
updateRequired = true;
xTaskCreate(&HomeActivity::taskTrampoline, "HomeActivityTask",
4096, // Stack size (increased for cover image rendering)
this, // Parameters
1, // Priority
&displayTaskHandle // Task handle
4096, // Stack size (increased for cover image rendering)
this, // Parameters
1, // Priority
&displayTaskHandle // Task handle
);
}
void HomeActivity::loadRecentBooksData() {
cachedRecentBooks.clear();
const auto &recentBooks = RECENT_BOOKS.getBooks();
const auto& recentBooks = RECENT_BOOKS.getBooks();
const int maxRecentBooks = 3;
int recentCount = std::min(static_cast<int>(recentBooks.size()), maxRecentBooks);
for (int i = 0; i < recentCount; i++) {
const std::string &bookPath = recentBooks[i];
const std::string& bookPath = recentBooks[i];
CachedBookInfo info;
info.path = bookPath; // Store the full path
// Extract title from path
info.title = bookPath;
size_t lastSlash = info.title.find_last_of('/');
@ -139,7 +137,7 @@ void HomeActivity::loadRecentBooksData() {
if (lastDot != std::string::npos) {
info.title = info.title.substr(0, lastDot);
}
if (StringUtils::checkFileExtension(bookPath, ".epub")) {
Epub epub(bookPath, "/.crosspoint");
epub.load(false);
@ -149,7 +147,7 @@ void HomeActivity::loadRecentBooksData() {
if (epub.generateThumbBmp()) {
info.coverPath = epub.getThumbBmpPath();
}
// Read progress
FsFile f;
if (SdMan.openFileForRead("HOME", epub.getCachePath() + "/progress.bin", f)) {
@ -173,7 +171,7 @@ void HomeActivity::loadRecentBooksData() {
if (xtc.generateThumbBmp()) {
info.coverPath = xtc.getThumbBmpPath();
}
// Read progress
FsFile f;
if (SdMan.openFileForRead("HOME", xtc.getCachePath() + "/progress.bin", f)) {
@ -189,12 +187,12 @@ void HomeActivity::loadRecentBooksData() {
}
}
}
Serial.printf("[HOME] Book %d: title='%s', cover='%s', progress=%d%%\n",
i, info.title.c_str(), info.coverPath.c_str(), info.progressPercent);
Serial.printf("[HOME] Book %d: title='%s', cover='%s', progress=%d%%\n", i, info.title.c_str(),
info.coverPath.c_str(), info.progressPercent);
cachedRecentBooks.push_back(info);
}
Serial.printf("[HOME] Loaded %d recent books\n", (int)cachedRecentBooks.size());
}
@ -216,7 +214,7 @@ void HomeActivity::onExit() {
}
bool HomeActivity::storeCoverBuffer() {
uint8_t *frameBuffer = renderer.getFrameBuffer();
uint8_t* frameBuffer = renderer.getFrameBuffer();
if (!frameBuffer) {
return false;
}
@ -225,7 +223,7 @@ bool HomeActivity::storeCoverBuffer() {
freeCoverBuffer();
const size_t bufferSize = GfxRenderer::getBufferSize();
coverBuffer = static_cast<uint8_t *>(malloc(bufferSize));
coverBuffer = static_cast<uint8_t*>(malloc(bufferSize));
if (!coverBuffer) {
return false;
}
@ -239,7 +237,7 @@ bool HomeActivity::restoreCoverBuffer() {
return false;
}
uint8_t *frameBuffer = renderer.getFrameBuffer();
uint8_t* frameBuffer = renderer.getFrameBuffer();
if (!frameBuffer) {
return false;
}
@ -258,12 +256,10 @@ void HomeActivity::freeCoverBuffer() {
}
void HomeActivity::loop() {
const bool prevPressed =
mappedInput.wasPressed(MappedInputManager::Button::Up) ||
mappedInput.wasPressed(MappedInputManager::Button::Left);
const bool nextPressed =
mappedInput.wasPressed(MappedInputManager::Button::Down) ||
mappedInput.wasPressed(MappedInputManager::Button::Right);
const bool prevPressed = mappedInput.wasPressed(MappedInputManager::Button::Up) ||
mappedInput.wasPressed(MappedInputManager::Button::Left);
const bool nextPressed = mappedInput.wasPressed(MappedInputManager::Button::Down) ||
mappedInput.wasPressed(MappedInputManager::Button::Right);
const bool confirmPressed = mappedInput.wasReleased(MappedInputManager::Button::Confirm);
// Navigation uses theme-configured book slots (limited by actual books available)
@ -324,8 +320,7 @@ void HomeActivity::displayTaskLoop() {
void HomeActivity::render() {
// Battery check logic (only update every 60 seconds)
const uint32_t now = millis();
const bool needBatteryUpdate =
(now - lastBatteryCheck > 60000) || (lastBatteryCheck == 0);
const bool needBatteryUpdate = (now - lastBatteryCheck > 60000) || (lastBatteryCheck == 0);
if (needBatteryUpdate) {
cachedBatteryLevel = battery.readPercentage();
lastBatteryCheck = now;
@ -339,8 +334,7 @@ void HomeActivity::render() {
// --- Bind Global Data ---
context.setString("BatteryPercent", std::to_string(cachedBatteryLevel));
context.setBool("ShowBatteryPercent",
SETTINGS.hideBatteryPercentage !=
CrossPointSettings::HIDE_BATTERY_PERCENTAGE::HIDE_ALWAYS);
SETTINGS.hideBatteryPercentage != CrossPointSettings::HIDE_BATTERY_PERCENTAGE::HIDE_ALWAYS);
// --- Navigation counts (must match loop()) ---
const int recentCount = static_cast<int>(cachedRecentBooks.size());
@ -354,9 +348,9 @@ void HomeActivity::render() {
context.setInt("SelectedBookIndex", isBookSelected ? selectorIndex : -1);
for (int i = 0; i < recentCount; i++) {
const auto &book = cachedRecentBooks[i];
const auto& book = cachedRecentBooks[i];
std::string prefix = "RecentBooks." + std::to_string(i) + ".";
context.setString(prefix + "Title", book.title);
context.setString(prefix + "Image", book.coverPath);
context.setString(prefix + "Progress", std::to_string(book.progressPercent));
@ -370,14 +364,13 @@ void HomeActivity::render() {
context.setString("BookTitle", lastBookTitle);
context.setString("BookAuthor", lastBookAuthor);
context.setString("BookCoverPath", coverBmpPath);
context.setBool("HasCover",
hasContinueReading && hasCoverImage && !coverBmpPath.empty());
context.setBool("HasCover", hasContinueReading && hasCoverImage && !coverBmpPath.empty());
context.setBool("ShowInfoBox", true);
// --- Main Menu Data ---
// Menu items start after the book slot
const int menuStartIdx = navBookCount;
int idx = 0;
const int myLibraryIdx = menuStartIdx + idx++;
const int opdsLibraryIdx = hasOpdsUrl ? menuStartIdx + idx++ : -1;

38
src/activities/home/HomeActivity.h
View File

@ -11,7 +11,7 @@
// Cached data for a recent book
struct CachedBookInfo {
std::string path; // Full path to the book file
std::string path; // Full path to the book file
std::string title;
std::string coverPath;
int progressPercent = 0;
@ -25,15 +25,15 @@ class HomeActivity final : public Activity {
bool hasContinueReading = false;
bool hasOpdsUrl = false;
bool hasCoverImage = false;
bool coverRendered = false; // Track if cover has been rendered once
bool coverBufferStored = false; // Track if cover buffer is stored
uint8_t *coverBuffer = nullptr; // HomeActivity's own buffer for cover image
bool coverRendered = false; // Track if cover has been rendered once
bool coverBufferStored = false; // Track if cover buffer is stored
uint8_t* coverBuffer = nullptr; // HomeActivity's own buffer for cover image
std::string lastBookTitle;
std::string lastBookAuthor;
std::string coverBmpPath;
uint8_t cachedBatteryLevel = 0;
uint32_t lastBatteryCheck = 0;
// Cached recent books data (loaded once in onEnter)
std::vector<CachedBookInfo> cachedRecentBooks;
const std::function<void()> onContinueReading;
@ -42,25 +42,25 @@ class HomeActivity final : public Activity {
const std::function<void()> onFileTransferOpen;
const std::function<void()> onOpdsBrowserOpen;
static void taskTrampoline(void *param);
static void taskTrampoline(void* param);
[[noreturn]] void displayTaskLoop();
void render();
int getMenuItemCount() const;
bool storeCoverBuffer(); // Store frame buffer for cover image
bool restoreCoverBuffer(); // Restore frame buffer from stored cover
void freeCoverBuffer(); // Free the stored cover buffer
void loadRecentBooksData(); // Load and cache recent books data
bool storeCoverBuffer(); // Store frame buffer for cover image
bool restoreCoverBuffer(); // Restore frame buffer from stored cover
void freeCoverBuffer(); // Free the stored cover buffer
void loadRecentBooksData(); // Load and cache recent books data
public:
explicit HomeActivity(GfxRenderer &renderer, MappedInputManager &mappedInput,
const std::function<void()> &onContinueReading,
const std::function<void()> &onMyLibraryOpen,
const std::function<void()> &onSettingsOpen,
const std::function<void()> &onFileTransferOpen,
const std::function<void()> &onOpdsBrowserOpen)
public:
explicit HomeActivity(GfxRenderer& renderer, MappedInputManager& mappedInput,
const std::function<void()>& onContinueReading, const std::function<void()>& onMyLibraryOpen,
const std::function<void()>& onSettingsOpen, const std::function<void()>& onFileTransferOpen,
const std::function<void()>& onOpdsBrowserOpen)
: Activity("Home", renderer, mappedInput),
onContinueReading(onContinueReading), onMyLibraryOpen(onMyLibraryOpen),
onSettingsOpen(onSettingsOpen), onFileTransferOpen(onFileTransferOpen),
onContinueReading(onContinueReading),
onMyLibraryOpen(onMyLibraryOpen),
onSettingsOpen(onSettingsOpen),
onFileTransferOpen(onFileTransferOpen),
onOpdsBrowserOpen(onOpdsBrowserOpen) {}
void onEnter() override;
void onExit() override;

82
src/activities/settings/CategorySettingsActivity.cpp
View File

@ -18,8 +18,8 @@
// ...
void CategorySettingsActivity::taskTrampoline(void *param) {
auto *self = static_cast<CategorySettingsActivity *>(param);
void CategorySettingsActivity::taskTrampoline(void* param) {
auto* self = static_cast<CategorySettingsActivity*>(param);
self->displayTaskLoop();
}
@ -30,8 +30,7 @@ void CategorySettingsActivity::onEnter() {
selectedSettingIndex = 0;
updateRequired = true;
xTaskCreate(&CategorySettingsActivity::taskTrampoline,
"CategorySettingsActivityTask", 4096, this, 1,
xTaskCreate(&CategorySettingsActivity::taskTrampoline, "CategorySettingsActivityTask", 4096, this, 1,
&displayTaskHandle);
}
@ -71,15 +70,11 @@ void CategorySettingsActivity::loop() {
// Handle navigation
if (mappedInput.wasPressed(MappedInputManager::Button::Up) ||
mappedInput.wasPressed(MappedInputManager::Button::Left)) {
selectedSettingIndex = (selectedSettingIndex > 0)
? (selectedSettingIndex - 1)
: (settingsCount - 1);
selectedSettingIndex = (selectedSettingIndex > 0) ? (selectedSettingIndex - 1) : (settingsCount - 1);
updateRequired = true;
} else if (mappedInput.wasPressed(MappedInputManager::Button::Down) ||
mappedInput.wasPressed(MappedInputManager::Button::Right)) {
selectedSettingIndex = (selectedSettingIndex < settingsCount - 1)
? (selectedSettingIndex + 1)
: 0;
selectedSettingIndex = (selectedSettingIndex < settingsCount - 1) ? (selectedSettingIndex + 1) : 0;
updateRequired = true;
}
}
@ -89,7 +84,7 @@ void CategorySettingsActivity::toggleCurrentSetting() {
return;
}
const auto &setting = settingsList[selectedSettingIndex];
const auto& setting = settingsList[selectedSettingIndex];
if (setting.type == SettingType::TOGGLE && setting.valuePtr != nullptr) {
// Toggle the boolean value using the member pointer
@ -97,10 +92,8 @@ void CategorySettingsActivity::toggleCurrentSetting() {
SETTINGS.*(setting.valuePtr) = !currentValue;
} else if (setting.type == SettingType::ENUM && setting.valuePtr != nullptr) {
const uint8_t currentValue = SETTINGS.*(setting.valuePtr);
SETTINGS.*(setting.valuePtr) =
(currentValue + 1) % static_cast<uint8_t>(setting.enumValues.size());
} else if (setting.type == SettingType::VALUE &&
setting.valuePtr != nullptr) {
SETTINGS.*(setting.valuePtr) = (currentValue + 1) % static_cast<uint8_t>(setting.enumValues.size());
} else if (setting.type == SettingType::VALUE && setting.valuePtr != nullptr) {
const int8_t currentValue = SETTINGS.*(setting.valuePtr);
if (currentValue + setting.valueRange.step > setting.valueRange.max) {
SETTINGS.*(setting.valuePtr) = setting.valueRange.min;
@ -111,20 +104,18 @@ void CategorySettingsActivity::toggleCurrentSetting() {
if (strcmp(setting.name, "KOReader Sync") == 0) {
xSemaphoreTake(renderingMutex, portMAX_DELAY);
exitActivity();
enterNewActivity(
new KOReaderSettingsActivity(renderer, mappedInput, [this] {
exitActivity();
updateRequired = true;
}));
enterNewActivity(new KOReaderSettingsActivity(renderer, mappedInput, [this] {
exitActivity();
updateRequired = true;
}));
xSemaphoreGive(renderingMutex);
} else if (strcmp(setting.name, "OPDS Browser") == 0) {
xSemaphoreTake(renderingMutex, portMAX_DELAY);
exitActivity();
enterNewActivity(
new CalibreSettingsActivity(renderer, mappedInput, [this] {
exitActivity();
updateRequired = true;
}));
enterNewActivity(new CalibreSettingsActivity(renderer, mappedInput, [this] {
exitActivity();
updateRequired = true;
}));
xSemaphoreGive(renderingMutex);
} else if (strcmp(setting.name, "Clear Cache") == 0) {
xSemaphoreTake(renderingMutex, portMAX_DELAY);
@ -145,11 +136,10 @@ void CategorySettingsActivity::toggleCurrentSetting() {
} else if (strcmp(setting.name, "Theme") == 0) {
xSemaphoreTake(renderingMutex, portMAX_DELAY);
exitActivity();
enterNewActivity(
new ThemeSelectionActivity(renderer, mappedInput, [this] {
exitActivity();
updateRequired = true;
}));
enterNewActivity(new ThemeSelectionActivity(renderer, mappedInput, [this] {
exitActivity();
updateRequired = true;
}));
xSemaphoreGive(renderingMutex);
}
} else {
@ -177,51 +167,41 @@ void CategorySettingsActivity::render() const {
const auto pageWidth = renderer.getScreenWidth();
const auto pageHeight = renderer.getScreenHeight();
renderer.drawCenteredText(UI_12_FONT_ID, 15, categoryName, true,
EpdFontFamily::BOLD);
renderer.drawCenteredText(UI_12_FONT_ID, 15, categoryName, true, EpdFontFamily::BOLD);
// Draw selection highlight
renderer.fillRect(0, 60 + selectedSettingIndex * 30 - 2, pageWidth - 1, 30);
// Draw all settings
for (int i = 0; i < settingsCount; i++) {
const int settingY = 60 + i * 30; // 30 pixels between settings
const int settingY = 60 + i * 30; // 30 pixels between settings
const bool isSelected = (i == selectedSettingIndex);
// Draw setting name
renderer.drawText(UI_10_FONT_ID, 20, settingY, settingsList[i].name,
!isSelected);
renderer.drawText(UI_10_FONT_ID, 20, settingY, settingsList[i].name, !isSelected);
// Draw value based on setting type
std::string valueText;
if (settingsList[i].type == SettingType::TOGGLE &&
settingsList[i].valuePtr != nullptr) {
if (settingsList[i].type == SettingType::TOGGLE && settingsList[i].valuePtr != nullptr) {
const bool value = SETTINGS.*(settingsList[i].valuePtr);
valueText = value ? "ON" : "OFF";
} else if (settingsList[i].type == SettingType::ENUM &&
settingsList[i].valuePtr != nullptr) {
} else if (settingsList[i].type == SettingType::ENUM && settingsList[i].valuePtr != nullptr) {
const uint8_t value = SETTINGS.*(settingsList[i].valuePtr);
valueText = settingsList[i].enumValues[value];
} else if (settingsList[i].type == SettingType::VALUE &&
settingsList[i].valuePtr != nullptr) {
} else if (settingsList[i].type == SettingType::VALUE && settingsList[i].valuePtr != nullptr) {
valueText = std::to_string(SETTINGS.*(settingsList[i].valuePtr));
}
if (!valueText.empty()) {
const auto width =
renderer.getTextWidth(UI_10_FONT_ID, valueText.c_str());
renderer.drawText(UI_10_FONT_ID, pageWidth - 20 - width, settingY,
valueText.c_str(), !isSelected);
const auto width = renderer.getTextWidth(UI_10_FONT_ID, valueText.c_str());
renderer.drawText(UI_10_FONT_ID, pageWidth - 20 - width, settingY, valueText.c_str(), !isSelected);
}
}
renderer.drawText(
SMALL_FONT_ID,
pageWidth - 20 - renderer.getTextWidth(SMALL_FONT_ID, CROSSPOINT_VERSION),
pageHeight - 60, CROSSPOINT_VERSION);
renderer.drawText(SMALL_FONT_ID, pageWidth - 20 - renderer.getTextWidth(SMALL_FONT_ID, CROSSPOINT_VERSION),
pageHeight - 60, CROSSPOINT_VERSION);
const auto labels = mappedInput.mapLabels("« Back", "Toggle", "", "");
renderer.drawButtonHints(UI_10_FONT_ID, labels.btn1, labels.btn2, labels.btn3,
labels.btn4);
renderer.drawButtonHints(UI_10_FONT_ID, labels.btn1, labels.btn2, labels.btn3, labels.btn4);
renderer.displayBuffer();
}

45
src/activities/settings/ThemeSelectionActivity.cpp
View File

@ -1,14 +1,17 @@
#include "ThemeSelectionActivity.h"
#include <GfxRenderer.h>
#include <SDCardManager.h>
#include <esp_system.h>
#include <cstring>
#include "CrossPointSettings.h"
#include "MappedInputManager.h"
#include "fontIds.h"
#include <GfxRenderer.h>
#include <SDCardManager.h>
#include <cstring>
#include <esp_system.h>
void ThemeSelectionActivity::taskTrampoline(void *param) {
auto *self = static_cast<ThemeSelectionActivity *>(param);
void ThemeSelectionActivity::taskTrampoline(void* param) {
auto* self = static_cast<ThemeSelectionActivity*>(param);
self->displayTaskLoop();
}
@ -49,8 +52,7 @@ void ThemeSelectionActivity::onEnter() {
}
updateRequired = true;
xTaskCreate(&ThemeSelectionActivity::taskTrampoline, "ThemeSelTask", 4096,
this, 1, &displayTaskHandle);
xTaskCreate(&ThemeSelectionActivity::taskTrampoline, "ThemeSelTask", 4096, this, 1, &displayTaskHandle);
}
void ThemeSelectionActivity::onExit() {
@ -72,17 +74,14 @@ void ThemeSelectionActivity::loop() {
// Only reboot if theme actually changed
if (selected != std::string(SETTINGS.themeName)) {
strncpy(SETTINGS.themeName, selected.c_str(),
sizeof(SETTINGS.themeName) - 1);
strncpy(SETTINGS.themeName, selected.c_str(), sizeof(SETTINGS.themeName) - 1);
SETTINGS.themeName[sizeof(SETTINGS.themeName) - 1] = '\0';
SETTINGS.saveToFile();
// Show reboot message
renderer.clearScreen();
renderer.drawCenteredText(UI_12_FONT_ID, renderer.getScreenHeight() / 2 - 20,
"Applying theme...", true);
renderer.drawCenteredText(UI_10_FONT_ID, renderer.getScreenHeight() / 2 + 10,
"Device will restart", true);
renderer.drawCenteredText(UI_12_FONT_ID, renderer.getScreenHeight() / 2 - 20, "Applying theme...", true);
renderer.drawCenteredText(UI_10_FONT_ID, renderer.getScreenHeight() / 2 + 10, "Device will restart", true);
renderer.displayBuffer();
// Small delay to ensure display updates
@ -103,13 +102,11 @@ void ThemeSelectionActivity::loop() {
if (mappedInput.wasPressed(MappedInputManager::Button::Up) ||
mappedInput.wasPressed(MappedInputManager::Button::Left)) {
selectedIndex =
(selectedIndex > 0) ? (selectedIndex - 1) : (themeNames.size() - 1);
selectedIndex = (selectedIndex > 0) ? (selectedIndex - 1) : (themeNames.size() - 1);
updateRequired = true;
} else if (mappedInput.wasPressed(MappedInputManager::Button::Down) ||
mappedInput.wasPressed(MappedInputManager::Button::Right)) {
selectedIndex =
(selectedIndex < themeNames.size() - 1) ? (selectedIndex + 1) : 0;
selectedIndex = (selectedIndex < themeNames.size() - 1) ? (selectedIndex + 1) : 0;
updateRequired = true;
}
}
@ -133,8 +130,7 @@ void ThemeSelectionActivity::render() const {
const auto pageHeight = renderer.getScreenHeight();
// Header
renderer.drawCenteredText(UI_12_FONT_ID, 15, "Select Theme", true,
EpdFontFamily::BOLD);
renderer.drawCenteredText(UI_12_FONT_ID, 15, "Select Theme", true, EpdFontFamily::BOLD);
// Layout constants
const int entryHeight = 30;
@ -155,8 +151,7 @@ void ThemeSelectionActivity::render() const {
// Draw Highlight
int visibleIndex = selectedIndex - startIdx;
if (visibleIndex >= 0 && visibleIndex < maxVisible) {
renderer.fillRect(0, startY + visibleIndex * entryHeight - 2, pageWidth - 1,
entryHeight);
renderer.fillRect(0, startY + visibleIndex * entryHeight - 2, pageWidth - 1, entryHeight);
}
// Draw List
@ -176,15 +171,13 @@ void ThemeSelectionActivity::render() const {
if (themeNames.size() > maxVisible) {
int barHeight = pageHeight - startY - 40;
int thumbHeight = barHeight * maxVisible / themeNames.size();
int thumbY = startY + (barHeight - thumbHeight) * startIdx /
(themeNames.size() - maxVisible);
int thumbY = startY + (barHeight - thumbHeight) * startIdx / (themeNames.size() - maxVisible);
renderer.fillRect(pageWidth - 5, startY, 2, barHeight, 0);
renderer.fillRect(pageWidth - 7, thumbY, 6, thumbHeight, 1);
}
const auto labels = mappedInput.mapLabels("Cancel", "Select", "", "");
renderer.drawButtonHints(UI_10_FONT_ID, labels.btn1, labels.btn2, labels.btn3,
labels.btn4);
renderer.drawButtonHints(UI_10_FONT_ID, labels.btn1, labels.btn2, labels.btn3, labels.btn4);
renderer.displayBuffer();
}

11
src/activities/settings/ThemeSelectionActivity.h
View File

@ -1,12 +1,14 @@
#pragma once
#include "activities/Activity.h"
#include <freertos/FreeRTOS.h>
#include <freertos/semphr.h>
#include <freertos/task.h>
#include <functional>
#include <string>
#include <vector>
#include "activities/Activity.h"
class ThemeSelectionActivity final : public Activity {
TaskHandle_t displayTaskHandle = nullptr;
SemaphoreHandle_t renderingMutex = nullptr;
@ -15,13 +17,12 @@ class ThemeSelectionActivity final : public Activity {
std::vector<std::string> themeNames;
const std::function<void()> onGoBack;
static void taskTrampoline(void *param);
static void taskTrampoline(void* param);
[[noreturn]] void displayTaskLoop();
void render() const;
public:
ThemeSelectionActivity(GfxRenderer &renderer, MappedInputManager &mappedInput,
const std::function<void()> &onGoBack)
public:
ThemeSelectionActivity(GfxRenderer& renderer, MappedInputManager& mappedInput, const std::function<void()>& onGoBack)
: Activity("ThemeSelection", renderer, mappedInput), onGoBack(onGoBack) {}
void onEnter() override;
void onExit() override;