cottongin/crosspoint-reader-mod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
mod/master
crosspoint-reader-mod/chat-summaries/2026-02-16_21-30-summary.md
cottongin dfbc931c14 mod: Phase 1 - bring forward mod-exclusive files with ActivityManager migration 
Brings ~55 mod-exclusive files to the upstream-based mod/master-resync branch:

Activities (migrated to new ActivityManager pattern):
- Clock/Time: SetTimeActivity, SetTimezoneOffsetActivity, NtpSyncActivity
- Dictionary: DictionaryDefinitionActivity, DictionarySuggestionsActivity,
  DictionaryWordSelectActivity, LookedUpWordsActivity
- Bookmark: EpubReaderBookmarkSelectionActivity
- Book management: BookManageMenuActivity, EndOfBookMenuActivity
- OPDS: OpdsServerListActivity, OpdsSettingsActivity
- Utility: DirectoryPickerActivity, NumericStepperActivity

Utilities (unchanged):
- BookManager, BookSettings, BookmarkStore, BootNtpSync
- Dictionary, LookupHistory, TimeSync, OpdsServerStore

Libraries: PlaceholderCover, TableData, ChapterXPathIndexer
Scripts: inject_mod_version, generate_book_icon, preview_placeholder_cover
Docs: KOReader sync XPath mapping

Migration changes:
- ActivityWithSubactivity -> Activity base class
- Callback constructors -> finish()/setResult() pattern
- enterNewActivity() -> startActivityForResult()
- Activity::RenderLock&& -> RenderLock&&

These files won't compile yet - they reference mod settings and I18n
strings that will be added in subsequent phases.

Made-with: Cursor
2026-03-07 15:10:00 -05:00

1.5 KiB
Raw Permalink Blame History

Merge Assessment & Cherry-pick: master -> mod/master

Task

Assess and merge new commits from master into mod/master.

Analysis

  • 19 commits on master not on mod/master, but 16 were already cherry-picked or manually ported (different hashes, same content)
  • A full git merge master produced 30+ conflicts due to duplicate cherry-picks with different patch IDs
  • Identified 3 genuinely new commits

Changes Made

1. Cherry-pick 97c3314 (#932) - f21720d

  • perf: Skip constructing unnecessary std::string in TextBlock.cpp
  • 1-line change, applied cleanly

2. Cherry-pick 2a32d8a (#926) - 424e332

  • chore: Improve Russian language support
  • Renamed russia.yaml -> russian.yaml, updated i18n.md, fixed translation strings
  • Applied cleanly

3. Cherry-pick 0bc6747 (#827) - 61fb11c

  • feat: Add PNG cover image support for EPUB books
  • Added PngToBmpConverter library (new files, 858 lines)
  • Resolved 2 conflicts:
    • Epub.cpp: Discarded incoming JPG/PNG block (used old variable names), added PNG thumbnail support to mod's existing structure using effectiveCoverImageHref with case-insensitive checks. Fixed generateCoverBmp() PNG block to also use effectiveCoverImageHref. Added .png to getCoverCandidates().
    • ImageToFramebufferDecoder.cpp: Took upstream LOG_ERR version over mod's Serial.printf

Follow-up Items

  • Build and test PNG cover rendering on device
  • mod/master is now fully caught up with master
Reference in New Issue View Git Blame Copy Permalink