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

fix(cppcheck): clang format

Browse Source
This commit is contained in:
Brackyt 2026-01-27 23:51:18 +01:00
parent e6b3ecc519
commit c6cfaa38af
4 changed files with 29 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -298,15 +298,15 @@ class Badge : public UIElement {
// Fully themable toggle with track and knob
// Supports rounded or square appearance based on BorderRadius
class Toggle : public UIElement {
Expression valueExpr; // Boolean expression for on/off state
Expression onColorExpr; // Track color when ON
Expression offColorExpr; // Track color when OFF
Expression knobColorExpr; // Knob color (optional, defaults to opposite of track)
Expression valueExpr; // Boolean expression for on/off state
Expression onColorExpr; // Track color when ON
Expression offColorExpr; // Track color when OFF
Expression knobColorExpr; // Knob color (optional, defaults to opposite of track)
int trackWidth = 44;
int trackHeight = 24;
int knobSize = 20;
int borderRadius = 0; // 0 = square, >0 = rounded (use trackHeight/2 for pill shape)
int knobRadius = 0; // Knob corner radius
int borderRadius = 0; // 0 = square, >0 = rounded (use trackHeight/2 for pill shape)
int knobRadius = 0; // Knob corner radius
public:
Toggle(const std::string& id) : UIElement(id) {

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

@ -117,7 +117,7 @@ void Label::draw(const GfxRenderer& renderer, const ThemeContext& context) {
markClean();
return;
}
std::string colStr = context.evaluatestring(colorExpr);
uint8_t color = Color::parse(colStr).value;
bool black = (color == 0x00);
@ -294,7 +294,7 @@ void BitmapElement::draw(const GfxRenderer& renderer, const ThemeContext& contex
}
}
// 3. Fallback to RAM Cache (Standard method)
// 3. Fallback to RAM Cache (Standard method)
if (!drawSuccess) {
const std::vector<uint8_t>* data = ThemeManager::get().getCachedAsset(path);
if (data && !data->empty()) {

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

@ -56,9 +56,7 @@ UIElement* ThemeManager::createElement(const std::string& id, const std::string&
}
// Parse integer safely - returns 0 on error
static int parseIntSafe(const std::string& val) {
return static_cast<int>(std::strtol(val.c_str(), nullptr, 10));
}
static int parseIntSafe(const std::string& val) { return static_cast<int>(std::strtol(val.c_str(), nullptr, 10)); }
void ThemeManager::applyProperties(UIElement* elem, const std::map<std::string, std::string>& props) {
const auto elemType = elem->getType();

41
src/activities/settings/SettingsActivity.cpp
View File

@ -44,16 +44,16 @@ constexpr int controlsSettingsCount = 4;
const SettingInfo controlsSettings[controlsSettingsCount] = {
SettingInfo::Enum("Front Button Layout", &CrossPointSettings::frontButtonLayout,
{"Bck, Cnfrm, Lft, Rght", "Lft, Rght, Bck, Cnfrm", "Lft, Bck, Cnfrm, Rght"}),
SettingInfo::Enum("Side Button Layout (reader)", &CrossPointSettings::sideButtonLayout, {"Prev, Next", "Next, Prev"}),
SettingInfo::Enum("Side Button Layout (reader)", &CrossPointSettings::sideButtonLayout,
{"Prev, Next", "Next, Prev"}),
SettingInfo::Toggle("Long-press Chapter Skip", &CrossPointSettings::longPressChapterSkip),
SettingInfo::Enum("Short Power Button Click", &CrossPointSettings::shortPwrBtn, {"Ignore", "Sleep", "Page Turn"})};
constexpr int systemSettingsCount = 5;
const SettingInfo systemSettings[systemSettingsCount] = {
SettingInfo::Enum("Time to Sleep", &CrossPointSettings::sleepTimeout, {"1 min", "5 min", "10 min", "15 min", "30 min"}),
SettingInfo::Action("KOReader Sync"),
SettingInfo::Action("Calibre Settings"),
SettingInfo::Action("Clear Cache"),
SettingInfo::Enum("Time to Sleep", &CrossPointSettings::sleepTimeout,
{"1 min", "5 min", "10 min", "15 min", "30 min"}),
SettingInfo::Action("KOReader Sync"), SettingInfo::Action("Calibre Settings"), SettingInfo::Action("Clear Cache"),
SettingInfo::Action("Check for updates")};
// All categories with their settings
@ -63,11 +63,10 @@ struct CategoryData {
int count;
};
const CategoryData allCategories[4] = {
{"Display", displaySettings, displaySettingsCount},
{"Reader", readerSettings, readerSettingsCount},
{"Controls", controlsSettings, controlsSettingsCount},
{"System", systemSettings, systemSettingsCount}};
const CategoryData allCategories[4] = {{"Display", displaySettings, displaySettingsCount},
{"Reader", readerSettings, readerSettingsCount},
{"Controls", controlsSettings, controlsSettingsCount},
{"System", systemSettings, systemSettingsCount}};
void updateContextForSetting(ThemeEngine::ThemeContext& ctx, const std::string& prefix, int i, const SettingInfo& info,
bool isSelected, bool fullUpdate) {
@ -120,7 +119,7 @@ void SettingsActivity::onEnter() {
// For themed mode, provide all data upfront
if (ThemeEngine::ThemeManager::get().getElement("Settings")) {
updateThemeContext(true); // Full update
updateThemeContext(true); // Full update
}
updateRequired = true;
@ -186,8 +185,8 @@ void SettingsActivity::enterCategoryLegacy(int categoryIndex) {
xSemaphoreTake(renderingMutex, portMAX_DELAY);
exitActivity();
enterNewActivity(new CategorySettingsActivity(renderer, mappedInput, allCategories[categoryIndex].name,
allCategories[categoryIndex].settings, allCategories[categoryIndex].count,
[this] {
allCategories[categoryIndex].settings,
allCategories[categoryIndex].count, [this] {
exitActivity();
updateRequired = true;
}));
@ -244,7 +243,7 @@ void SettingsActivity::updateThemeContext(bool fullUpdate) {
if (fullUpdate) {
themeContext.setInt("Categories.Count", categoryCount);
}
themeContext.setInt("Categories.Selected", selectedCategoryIndex);
for (int i = 0; i < categoryCount; i++) {
@ -267,9 +266,9 @@ void SettingsActivity::updateThemeContext(bool fullUpdate) {
// Also provide current category's settings as "Settings" for simpler themes
if (fullUpdate) {
themeContext.setInt("Settings.Count", allCategories[selectedCategoryIndex].count);
themeContext.setInt("Settings.Count", allCategories[selectedCategoryIndex].count);
}
for (int i = 0; i < allCategories[selectedCategoryIndex].count; i++) {
updateContextForSetting(themeContext, "Settings", i, allCategories[selectedCategoryIndex].settings[i],
i == selectedSettingIndex, fullUpdate);
@ -282,14 +281,14 @@ void SettingsActivity::handleThemeInput() {
// Up/Down navigates settings within current category
if (mappedInput.wasPressed(MappedInputManager::Button::Up)) {
selectedSettingIndex = (selectedSettingIndex > 0) ? (selectedSettingIndex - 1) : (currentCategorySettingsCount - 1);
updateThemeContext(false); // Partial update
updateThemeContext(false); // Partial update
updateRequired = true;
return;
}
if (mappedInput.wasPressed(MappedInputManager::Button::Down)) {
selectedSettingIndex = (selectedSettingIndex < currentCategorySettingsCount - 1) ? (selectedSettingIndex + 1) : 0;
updateThemeContext(false); // Partial update
updateThemeContext(false); // Partial update
updateRequired = true;
return;
}
@ -299,7 +298,7 @@ void SettingsActivity::handleThemeInput() {
mappedInput.wasPressed(MappedInputManager::Button::PageBack)) {
selectedCategoryIndex = (selectedCategoryIndex > 0) ? (selectedCategoryIndex - 1) : (categoryCount - 1);
selectedSettingIndex = 0; // Reset to first setting in new category
updateThemeContext(true); // Full update (category changed)
updateThemeContext(true); // Full update (category changed)
updateRequired = true;
return;
}
@ -308,7 +307,7 @@ void SettingsActivity::handleThemeInput() {
mappedInput.wasPressed(MappedInputManager::Button::PageForward)) {
selectedCategoryIndex = (selectedCategoryIndex < categoryCount - 1) ? (selectedCategoryIndex + 1) : 0;
selectedSettingIndex = 0;
updateThemeContext(true); // Full update
updateThemeContext(true); // Full update
updateRequired = true;
return;
}
@ -316,7 +315,7 @@ void SettingsActivity::handleThemeInput() {
// Confirm toggles/activates current setting
if (mappedInput.wasPressed(MappedInputManager::Button::Confirm)) {
toggleCurrentSetting();
updateThemeContext(false); // Values changed, partial update is enough (names don't change)
updateThemeContext(false); // Values changed, partial update is enough (names don't change)
updateRequired = true;
return;
}