cottongin/crosspoint-reader-mod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: resolve mod build errors after upstream sync

Browse Source 
- Update open-x4-sdk submodule to 9f76376 (BatteryMonitor ESP-IDF 5.x compat)
- Add RTC_NOINIT bounds check for logHead in Logging.cpp
- Add drawTextRotated90CCW to GfxRenderer for dictionary UI
- Add getWordXpos() accessor to TextBlock for dictionary word selection
- Fix bare include paths (ActivityResult.h, RenderLock.h) across 10 files
- Fix rvalue ref binding in setResult() lambdas (std::move pattern)
- Fix std::max type mismatch (uint8_t vs int) in EpubReaderActivity
- Fix FsFile forward declaration conflict in Dictionary.h
- Restore StringUtils::checkFileExtension() and sortFileList()
- Restore RecentBooksStore::removeBook()

Made-with: Cursor
This commit is contained in:
cottongin
2026-03-07 20:56:40 -05:00
parent 9464df1727
commit 4627ec95f9
22 changed files with 180 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/activities/reader/DictionaryDefinitionActivity.cpp
View File

@@ -4,7 +4,7 @@
#include <algorithm>
#include "ActivityResult.h"
#include "activities/ActivityResult.h"
#include <cctype>
#include <cstdlib>

6
src/activities/reader/DictionarySuggestionsActivity.cpp
View File

@@ -5,7 +5,7 @@
#include "DictionaryDefinitionActivity.h"
#include "HalDisplay.h"
#include "MappedInputManager.h"
#include "RenderLock.h"
#include "activities/RenderLock.h"
#include "components/UITheme.h"
#include "fontIds.h"
#include "util/Dictionary.h"
@@ -56,9 +56,9 @@ void DictionarySuggestionsActivity::loop() {
startActivityForResult(
std::make_unique<DictionaryDefinitionActivity>(renderer, mappedInput, selected, definition, readerFontId,
orientation, true),
[this](const ActivityResult& result) {
[this](ActivityResult result) {
if (!result.isCancelled) {
setResult(result);
setResult(std::move(result));
finish();
} else {
requestUpdate();

14
src/activities/reader/DictionaryWordSelectActivity.cpp
View File

@@ -5,7 +5,7 @@
#include <algorithm>
#include <climits>
#include "ActivityResult.h"
#include "activities/ActivityResult.h"
#include "CrossPointSettings.h"
#include "DictionaryDefinitionActivity.h"
#include "DictionarySuggestionsActivity.h"
@@ -353,9 +353,9 @@ void DictionaryWordSelectActivity::loop() {
startActivityForResult(
std::make_unique<DictionaryDefinitionActivity>(renderer, mappedInput, cleaned, definition, fontId, orientation,
true),
[this](const ActivityResult& result) {
[this](ActivityResult result) {
if (!result.isCancelled) {
setResult(result);
setResult(std::move(result));
finish();
} else {
requestUpdate();
@@ -372,9 +372,9 @@ void DictionaryWordSelectActivity::loop() {
startActivityForResult(
std::make_unique<DictionaryDefinitionActivity>(renderer, mappedInput, stem, stemDef, fontId, orientation,
true),
[this](const ActivityResult& result) {
[this](ActivityResult result) {
if (!result.isCancelled) {
setResult(result);
setResult(std::move(result));
finish();
} else {
requestUpdate();
@@ -390,9 +390,9 @@ void DictionaryWordSelectActivity::loop() {
startActivityForResult(
std::make_unique<DictionarySuggestionsActivity>(renderer, mappedInput, cleaned, similar, fontId, orientation,
cachePath),
[this](const ActivityResult& result) {
[this](ActivityResult result) {
if (!result.isCancelled) {
setResult(result);
setResult(std::move(result));
finish();
} else {
requestUpdate();

2
src/activities/reader/EndOfBookMenuActivity.cpp
View File

@@ -3,7 +3,7 @@
#include <GfxRenderer.h>
#include <I18n.h>
#include "ActivityResult.h"
#include "activities/ActivityResult.h"
#include "MappedInputManager.h"
#include "components/UITheme.h"
#include "fontIds.h"

2
src/activities/reader/EpubReaderActivity.cpp
View File

@@ -717,7 +717,7 @@ bool EpubReaderActivity::silentIndexNextChapterIfNeeded() {
marginTop += SETTINGS.screenMargin;
marginLeft += SETTINGS.screenMargin;
marginRight += SETTINGS.screenMargin;
marginBottom += std::max(SETTINGS.screenMargin, UITheme::getInstance().getStatusBarHeight());
marginBottom += std::max(static_cast<int>(SETTINGS.screenMargin), UITheme::getInstance().getStatusBarHeight());
const uint16_t vpWidth = renderer.getScreenWidth() - marginLeft - marginRight;
const uint16_t vpHeight = renderer.getScreenHeight() - marginTop - marginBottom;

2
src/activities/reader/EpubReaderBookmarkSelectionActivity.cpp
View File

@@ -2,7 +2,7 @@
#include <GfxRenderer.h>
#include "ActivityResult.h"
#include "activities/ActivityResult.h"
#include "MappedInputManager.h"
#include "components/UITheme.h"
#include "fontIds.h"

14
src/activities/reader/LookedUpWordsActivity.cpp
View File

@@ -5,7 +5,7 @@
#include <algorithm>
#include "ActivityResult.h"
#include "activities/ActivityResult.h"
#include "DictionaryDefinitionActivity.h"
#include "DictionarySuggestionsActivity.h"
#include "MappedInputManager.h"
@@ -143,9 +143,9 @@ void LookedUpWordsActivity::loop() {
startActivityForResult(
std::make_unique<DictionaryDefinitionActivity>(renderer, mappedInput, headword, definition, readerFontId,
orientation, true),
[this](const ActivityResult& result) {
[this](ActivityResult result) {
if (!result.isCancelled) {
setResult(result);
setResult(std::move(result));
finish();
} else {
requestUpdate();
@@ -162,9 +162,9 @@ void LookedUpWordsActivity::loop() {
startActivityForResult(
std::make_unique<DictionaryDefinitionActivity>(renderer, mappedInput, stem, stemDef, readerFontId,
orientation, true),
[this](const ActivityResult& result) {
[this](ActivityResult result) {
if (!result.isCancelled) {
setResult(result);
setResult(std::move(result));
finish();
} else {
requestUpdate();
@@ -180,9 +180,9 @@ void LookedUpWordsActivity::loop() {
startActivityForResult(
std::make_unique<DictionarySuggestionsActivity>(renderer, mappedInput, headword, similar, readerFontId,
orientation, cachePath),
[this](const ActivityResult& result) {
[this](ActivityResult result) {
if (!result.isCancelled) {
setResult(result);
setResult(std::move(result));
finish();
} else {
requestUpdate();