eric/Crosspoint
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #185 from jpirnay/feat-pr1775

Browse Source 
feat: Add and refactor carousel theme (Upstream 1775 by zgredex)
This commit is contained in:
jpirnay
2026-05-09 00:10:00 +02:00
committed by GitHub
parent 9cd732bfd8 fe96dfa7a5
commit 1f1a80581d
25 changed files with 1307 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/activities/home/HomeActivity.cpp
+256 -45
View File
@@ -6,11 +6,15 @@
#include <GfxRenderer.h>
#include <HalStorage.h>
#include <I18n.h>
#include <JpegToBmpConverter.h>
#include <Logging.h>
#include <PngToBmpConverter.h>
#include <Utf8.h>
#include <Xtc.h>
#include <algorithm>
#include <cstring>
#include <string>
#include <vector>
#include "CrossPointSettings.h"
@@ -19,10 +23,43 @@
#include "MappedInputManager.h"
#include "OpdsServerStore.h"
#include "RecentBooksStore.h"
#include "activities/reader/ReaderActivity.h"
#include "components/UITheme.h"
#include "fontIds.h"
namespace {
// Convert a sidecar JPG/PNG cover to a 1-bit BMP in the cache and return the BMP path, or "" on failure.
// fileName is the basename of the output file (without directory), e.g. "340x540.bmp" or "400.bmp".
std::string convertSidecarToBmp(const std::string& bookPath, const std::string& sidecarPath, int width, int height,
const std::string& fileName) {
const std::string cacheDir = "/.crosspoint/sidecar_" + std::to_string(std::hash<std::string>{}(bookPath));
Storage.mkdir(cacheDir.c_str());
const std::string bmpPath = cacheDir + "/" + fileName;
if (Storage.exists(bmpPath.c_str())) return bmpPath;
FsFile src;
if (!Storage.openFileForRead("HOME", sidecarPath, src)) return "";
FsFile dst;
if (!Storage.openFileForWrite("HOME", bmpPath, dst)) {
src.close();
return "";
}
bool ok = false;
if (FsHelpers::hasJpgExtension(sidecarPath)) {
ok = JpegToBmpConverter::jpegFileTo1BitBmpStreamWithSize(src, dst, width, height);
} else if (FsHelpers::hasPngExtension(sidecarPath)) {
ok = PngToBmpConverter::pngFileTo1BitBmpStreamWithSize(src, dst, width, height);
}
src.close();
dst.close();
if (!ok) {
Storage.remove(bmpPath.c_str());
return "";
}
return bmpPath;
}
constexpr int CLASSIC_MIN_RECENT_TILE_HEIGHT = 280;
constexpr int LYRA_MIN_RECENT_TILE_HEIGHT = 170;
constexpr int LYRA_3_COVERS_MIN_RECENT_TILE_HEIGHT = 200;
@@ -139,6 +176,24 @@ void HomeActivity::loadRecentBooks(int maxBooks) {
continue;
}
// Check for a sidecar cover — takes priority over embedded cover.
// Also catches books registered before sidecar support (empty coverBmpPath).
const std::string sidecar = ReaderActivity::sidecarCoverPath(book.path);
if (!sidecar.empty()) {
const bool sidecarAlreadyStored =
book.coverBmpPath == sidecar || book.coverBmpPath.find("sidecar_") != std::string::npos;
LOG_DBG("HOME", "Sidecar for %s: stored=%s alreadyStored=%d", book.path.c_str(), book.coverBmpPath.c_str(),
sidecarAlreadyStored ? 1 : 0);
if (!sidecarAlreadyStored) {
LOG_DBG("HOME", "Updating coverBmpPath to sidecar: %s", sidecar.c_str());
RECENT_BOOKS.updateBook(book.path, book.title, book.author, book.series, sidecar);
RecentBook updated = book;
updated.coverBmpPath = sidecar;
recentBooks.push_back(updated);
continue;
}
}
recentBooks.push_back(book);
}
}
@@ -146,34 +201,90 @@ void HomeActivity::loadRecentBooks(int maxBooks) {
void HomeActivity::loadRecentCovers(int coverHeight) {
recentsLoading = true;
const auto thumbSizes = GUI.getCoverThumbSizes(coverHeight);
for (; nextRecentCoverIndex < recentBooks.size(); nextRecentCoverIndex++) {
RecentBook& book = recentBooks[nextRecentCoverIndex];
if (!book.coverBmpPath.empty()) {
std::string coverPath = UITheme::getCoverThumbPath(book.coverBmpPath, coverHeight);
if (!Storage.exists(coverPath.c_str())) {
// If epub, try to load the metadata for title/author and cover
if (FsHelpers::hasEpubExtension(book.path)) {
Epub epub(book.path, "/.crosspoint");
// Skip loading css since we only need metadata here
epub.load(false, true);
// Sidecar covers (JPG/PNG paths stored directly) must be converted to BMP thumbnails
// and the stored coverBmpPath updated to the cache path with [WIDTH]x[HEIGHT] placeholder.
const bool isSidecar =
FsHelpers::hasJpgExtension(book.coverBmpPath) || FsHelpers::hasPngExtension(book.coverBmpPath);
if (isSidecar) {
LOG_DBG("HOME", "Converting sidecar %s for book %s", book.coverBmpPath.c_str(), book.path.c_str());
if (!Storage.exists(book.coverBmpPath.c_str())) {
LOG_ERR("HOME", "Sidecar file missing: %s", book.coverBmpPath.c_str());
RECENT_BOOKS.updateBook(book.path, book.title, book.author, book.series, "");
book.coverBmpPath = "";
} else {
// Free the carousel frame cache before converting — PNG/JPEG decode needs ~42 KB
// contiguous heap, which won't be available while the 48 KB frame buffer is held.
// The cache will be rebuilt on the next render.
UITheme::getInstance().getMutableTheme().invalidateFrameCache();
// Try to generate thumbnail image for Continue Reading card
bool success = epub.generateThumbBmp(coverHeight);
if (!success) {
RECENT_BOOKS.updateBook(book.path, book.title, book.author, book.series, "");
book.coverBmpPath = "";
const std::string cacheBase = "/.crosspoint/sidecar_" + std::to_string(std::hash<std::string>{}(book.path));
const std::string placeholder = cacheBase + "/[HEIGHT].bmp";
bool success = true;
if (!thumbSizes.empty()) {
for (const auto& sz : thumbSizes) {
const std::string name = std::to_string(sz.first) + "x" + std::to_string(sz.second) + ".bmp";
if (convertSidecarToBmp(book.path, book.coverBmpPath, sz.first, sz.second, name).empty()) {
success = false;
break;
}
}
} else {
const int w = coverHeight * 6 / 10;
const std::string name = std::to_string(coverHeight) + ".bmp";
if (convertSidecarToBmp(book.path, book.coverBmpPath, w, coverHeight, name).empty()) success = false;
}
if (success) {
LOG_DBG("HOME", "Sidecar converted, placeholder: %s", placeholder.c_str());
RECENT_BOOKS.updateBook(book.path, book.title, book.author, book.series, placeholder);
book.coverBmpPath = placeholder;
} else {
LOG_ERR("HOME", "Failed to convert sidecar cover for %s", book.path.c_str());
// Don't permanently clear the path on failure — keep the raw sidecar path
// so the next home visit can retry (e.g. after more memory becomes available).
}
coverRendered = false;
nextRecentCoverIndex++;
recentsLoading = false;
requestUpdate();
return;
} else if (FsHelpers::hasXtcExtension(book.path)) {
// Handle XTC file
Xtc xtc(book.path, "/.crosspoint");
if (xtc.load()) {
// Try to generate thumbnail image for Continue Reading card
bool success = xtc.generateThumbBmp(coverHeight);
}
}
if (!book.coverBmpPath.empty()) {
if (!thumbSizes.empty()) {
// Theme uses WxH thumbnails — check which are missing and generate
bool anyMissing = false;
for (const auto& sz : thumbSizes) {
const std::string path = UITheme::getCoverThumbPath(book.coverBmpPath, sz.first, sz.second);
if (!Storage.exists(path.c_str())) {
anyMissing = true;
break;
}
}
if (anyMissing) {
bool success = true;
if (FsHelpers::hasEpubExtension(book.path)) {
Epub epub(book.path, "/.crosspoint");
epub.load(false, true);
for (const auto& sz : thumbSizes) {
const std::string path = UITheme::getCoverThumbPath(book.coverBmpPath, sz.first, sz.second);
if (!Storage.exists(path.c_str())) success = epub.generateThumbBmp(sz.first, sz.second) && success;
}
} else if (FsHelpers::hasXtcExtension(book.path)) {
Xtc xtc(book.path, "/.crosspoint");
if (xtc.load()) {
for (const auto& sz : thumbSizes) {
const std::string path = UITheme::getCoverThumbPath(book.coverBmpPath, sz.first, sz.second);
if (!Storage.exists(path.c_str())) success = xtc.generateThumbBmp(sz.first, sz.second) && success;
}
}
}
if (!success) {
RECENT_BOOKS.updateBook(book.path, book.title, book.author, book.series, "");
book.coverBmpPath = "";
@@ -184,8 +295,40 @@ void HomeActivity::loadRecentCovers(int coverHeight) {
requestUpdate();
return;
}
} else {
std::string coverPath = UITheme::getCoverThumbPath(book.coverBmpPath, coverHeight);
if (!Storage.exists(coverPath.c_str())) {
if (FsHelpers::hasEpubExtension(book.path)) {
Epub epub(book.path, "/.crosspoint");
epub.load(false, true);
bool success = epub.generateThumbBmp(coverHeight);
if (!success) {
RECENT_BOOKS.updateBook(book.path, book.title, book.author, book.series, "");
book.coverBmpPath = "";
}
coverRendered = false;
nextRecentCoverIndex++;
recentsLoading = false;
requestUpdate();
return;
} else if (FsHelpers::hasXtcExtension(book.path)) {
Xtc xtc(book.path, "/.crosspoint");
if (xtc.load()) {
bool success = xtc.generateThumbBmp(coverHeight);
if (!success) {
RECENT_BOOKS.updateBook(book.path, book.title, book.author, book.series, "");
book.coverBmpPath = "";
}
coverRendered = false;
nextRecentCoverIndex++;
recentsLoading = false;
requestUpdate();
return;
}
}
}
}
}
} // if (!book.coverBmpPath.empty()) after sidecar check
}
}
@@ -241,9 +384,8 @@ void HomeActivity::onEnter() {
void HomeActivity::onExit() {
Activity::onExit();
// Free the stored cover buffer if any
freeCoverBuffer();
UITheme::getInstance().getMutableTheme().invalidateFrameCache();
}
bool HomeActivity::storeCoverBuffer() {
@@ -292,27 +434,70 @@ void HomeActivity::loop() {
if (menuEntriesDirty) {
rebuildMenuEntries();
}
const int totalItems = static_cast<int>(recentBooks.size() + menuEntries.size());
if (firstRenderDone && !recentsLoaded && !recentsLoading) {
const auto& metrics = UITheme::getInstance().getMetrics();
const Rect contentRect = UITheme::getContentRect(renderer, true, false);
const HomeScreenLayout layout =
computeHomeScreenLayout(metrics, contentRect.height, static_cast<int>(menuEntries.size()));
loadRecentCovers(getHomeCoverRenderHeight(layout));
return;
const bool isCarousel = (GUI.getHomeNavigation() == HomeNavigation::Carousel);
if (isCarousel) {
const int bookCount = static_cast<int>(recentBooks.size());
const int menuItemCount = static_cast<int>(menuEntries.size());
const bool inCarouselRow = (selectorIndex < bookCount);
const int menuIdx = inCarouselRow ? 0 : (selectorIndex - bookCount);
if (mappedInput.wasPressed(MappedInputManager::Button::Right)) {
if (inCarouselRow && bookCount > 0)
selectorIndex = (selectorIndex + 1) % bookCount;
else if (!inCarouselRow)
selectorIndex = bookCount + (menuIdx + 1) % menuItemCount;
requestUpdate();
}
if (mappedInput.wasPressed(MappedInputManager::Button::Left)) {
if (inCarouselRow && bookCount > 0)
selectorIndex = (selectorIndex + bookCount - 1) % bookCount;
else if (!inCarouselRow)
selectorIndex = bookCount + (menuIdx + menuItemCount - 1) % menuItemCount;
requestUpdate();
}
if (mappedInput.wasPressed(MappedInputManager::Button::Down)) {
if (inCarouselRow) {
lastCarouselBookIndex = selectorIndex;
selectorIndex = bookCount;
} else {
selectorIndex = lastCarouselBookIndex;
}
requestUpdate();
}
if (mappedInput.wasPressed(MappedInputManager::Button::Up)) {
if (inCarouselRow) {
lastCarouselBookIndex = selectorIndex;
selectorIndex = bookCount;
} else {
selectorIndex = lastCarouselBookIndex;
}
requestUpdate();
}
} else {
const int totalItems = static_cast<int>(recentBooks.size() + menuEntries.size());
if (firstRenderDone && !recentsLoaded && !recentsLoading) {
const auto& metrics = UITheme::getInstance().getMetrics();
const Rect contentRect = UITheme::getContentRect(renderer, true, false);
const HomeScreenLayout layout =
computeHomeScreenLayout(metrics, contentRect.height, static_cast<int>(menuEntries.size()));
loadRecentCovers(getHomeCoverRenderHeight(layout));
return;
}
buttonNavigator.onNext([this, totalItems] {
selectorIndex = ButtonNavigator::nextIndex(selectorIndex, totalItems);
requestUpdate();
});
buttonNavigator.onPrevious([this, totalItems] {
selectorIndex = ButtonNavigator::previousIndex(selectorIndex, totalItems);
requestUpdate();
});
}
buttonNavigator.onNext([this, totalItems] {
selectorIndex = ButtonNavigator::nextIndex(selectorIndex, totalItems);
requestUpdate();
});
buttonNavigator.onPrevious([this, totalItems] {
selectorIndex = ButtonNavigator::previousIndex(selectorIndex, totalItems);
requestUpdate();
});
if (mappedInput.wasReleased(MappedInputManager::Button::Confirm)) {
const int recentsCount = static_cast<int>(recentBooks.size());
if (selectorIndex < recentsCount) {
@@ -330,21 +515,43 @@ void HomeActivity::render(RenderLock&&) {
const auto& metrics = UITheme::getInstance().getMetrics();
const Rect contentRect = UITheme::getContentRect(renderer, true, false);
if (menuEntriesDirty) {
rebuildMenuEntries();
}
const int menuCount = static_cast<int>(menuEntries.size());
const bool isCarousel = (GUI.getHomeNavigation() == HomeNavigation::Carousel);
// Fast path: theme owns its own pre-rendered frame cache
if (isCarousel) {
const auto carouselLabels = mappedInput.mapLabels("", tr(STR_SELECT), tr(STR_DIR_LEFT), tr(STR_DIR_RIGHT));
const bool handled = GUI.tryFastHomeRender(
renderer, recentBooks, selectorIndex, menuCount,
[this](int index) { return std::string(I18N.get(menuEntries[index].label)); },
[this](int index) { return menuEntries[index].icon; }, carouselLabels.btn1, carouselLabels.btn2,
carouselLabels.btn3, carouselLabels.btn4);
if (handled) {
if (!firstRenderDone) {
firstRenderDone = true;
requestUpdate();
} else if (!recentsLoaded && !recentsLoading) {
recentsLoading = true;
loadRecentCovers(metrics.homeCoverHeight);
}
return;
}
}
renderer.clearScreen();
bool bufferRestored = coverBufferStored && restoreCoverBuffer();
GUI.drawHeader(renderer, Rect{contentRect.x, metrics.topPadding, contentRect.width, metrics.homeTopPadding}, nullptr);
if (menuEntriesDirty) {
rebuildMenuEntries();
}
const int totalItems = static_cast<int>(recentBooks.size() + menuEntries.size());
if (selectorIndex >= totalItems) {
selectorIndex = std::max(0, totalItems - 1);
}
const int menuCount = static_cast<int>(menuEntries.size());
const HomeScreenLayout layout = computeHomeScreenLayout(metrics, contentRect.height, menuCount);
GUI.drawRecentBookCover(renderer,
@@ -360,7 +567,8 @@ void HomeActivity::render(RenderLock&&) {
[this](int index) { return std::string(I18N.get(menuEntries[index].label)); },
[this](int index) { return menuEntries[index].icon; });
const auto labels = mappedInput.mapLabels("", tr(STR_SELECT), tr(STR_DIR_UP), tr(STR_DIR_DOWN));
const auto labels = isCarousel ? mappedInput.mapLabels("", tr(STR_SELECT), tr(STR_DIR_LEFT), tr(STR_DIR_RIGHT))
: mappedInput.mapLabels("", tr(STR_SELECT), tr(STR_DIR_UP), tr(STR_DIR_DOWN));
GUI.drawButtonHints(renderer, labels.btn1, labels.btn2, labels.btn3, labels.btn4);
renderer.displayBuffer();
@@ -368,6 +576,9 @@ void HomeActivity::render(RenderLock&&) {
if (!firstRenderDone) {
firstRenderDone = true;
requestUpdate();
} else if (!recentsLoaded && !recentsLoading) {
recentsLoading = true;
loadRecentCovers(getHomeCoverRenderHeight(computeHomeScreenLayout(metrics, contentRect.height, menuCount)));
}
}
src/activities/home/HomeActivity.h
+7 -5
View File
@@ -32,20 +32,22 @@ class HomeActivity final : public Activity {
ButtonNavigator buttonNavigator;
int selectorIndex = 0;
int lastCarouselBookIndex = 0; // remembered position when leaving carousel row
bool recentsLoading = false;
bool recentsLoaded = false;
bool firstRenderDone = false;
bool hasOpdsServers = false;
bool coverRendered = false; // Track if cover has been rendered once
bool coverBufferStored = false; // Track if cover buffer is stored
bool coverRendered = false;
bool coverBufferStored = false;
size_t nextRecentCoverIndex = 0;
uint8_t* coverBuffer = nullptr; // HomeActivity's own buffer for cover image
uint8_t* coverBuffer = nullptr;
std::vector<RecentBook> recentBooks;
std::vector<MenuEntry> menuEntries;
bool menuEntriesDirty = true;
std::string focusBookPath; // book path to re-select on first render, if present in recents
int focusSelectorIndex = -1; // fallback combined-selector index when focusBookPath doesn't match
std::string focusBookPath;
int focusSelectorIndex = -1;
void onSelectBook(const std::string& path);
void dispatchMenuAction(MenuAction action);
src/activities/reader/EpubReaderActivity.cpp
+5 -1
View File
@@ -29,6 +29,7 @@
#include "KOReaderCredentialStore.h"
#include "MappedInputManager.h"
#include "QrDisplayActivity.h"
#include "ReaderActivity.h"
#include "ReaderUtils.h"
#include "RecentBooksStore.h"
#include "SdCardFontGlobals.h"
@@ -207,7 +208,9 @@ void EpubReaderActivity::onEnter() {
if (!series.empty() && !epub->getSeriesIndex().empty()) {
series += " #" + epub->getSeriesIndex();
}
RECENT_BOOKS.addBook(epub->getPath(), epub->getTitle(), epub->getAuthor(), series, epub->getThumbBmpPath());
const std::string epubSidecar = ReaderActivity::sidecarCoverPath(epub->getPath());
const std::string epubCover = epubSidecar.empty() ? epub->getThumbBmpPath() : epubSidecar;
RECENT_BOOKS.addBook(epub->getPath(), epub->getTitle(), epub->getAuthor(), series, epubCover);
const RecentBook currentBook = RECENT_BOOKS.getBookByPath(epub->getPath());
bookEmbeddedStyleOverride = currentBook.embeddedStyleOverride;
bookImageRenderingOverride = currentBook.imageRenderingOverride;
@@ -241,6 +244,7 @@ void EpubReaderActivity::onExit() {
APP_STATE.readerActivityLoadCount = 0;
APP_STATE.saveToFile();
section.reset();
UITheme::getInstance().getMutableTheme().onBookWillClose(epub ? epub->getPath() : "", epub.get(), nullptr, nullptr);
epub.reset();
currentPageFootnotes.clear();
currentPageFootnotes.shrink_to_fit();
src/activities/reader/MdReaderActivity.cpp
+3 -1
View File
@@ -15,6 +15,7 @@
#include "CrossPointState.h"
#include "MappedInputManager.h"
#include "MdReaderTocSelectionActivity.h"
#include "ReaderActivity.h"
#include "ReaderUtils.h"
#include "RecentBooksStore.h"
#include "components/UITheme.h"
@@ -52,7 +53,7 @@ void MdReaderActivity::onEnter() {
auto fileName = filePath.substr(filePath.rfind('/') + 1);
APP_STATE.openEpubPath = filePath;
APP_STATE.saveToFile();
RECENT_BOOKS.addBook(filePath, fileName, "", "", "");
RECENT_BOOKS.addBook(filePath, fileName, "", "", ReaderActivity::sidecarCoverPath(filePath));
requestUpdate();
}
@@ -219,6 +220,7 @@ void MdReaderActivity::onExit() {
currentPageLines.clear();
APP_STATE.readerActivityLoadCount = 0;
APP_STATE.saveToFile();
UITheme::getInstance().getMutableTheme().onBookWillClose(txt ? txt->getPath() : "", nullptr, nullptr, txt.get());
txt.reset();
}
src/activities/reader/ReaderActivity.cpp
+15
View File
@@ -56,6 +56,21 @@ bool ReaderActivity::isImageFile(const std::string& path) {
return FsHelpers::hasBmpExtension(path) || FsHelpers::hasJpgExtension(path) || FsHelpers::hasPngExtension(path);
}
std::string ReaderActivity::sidecarCoverPath(const std::string& bookPath) {
const auto sep = bookPath.find_last_of("/\\");
const auto dot = bookPath.rfind('.');
if (dot == std::string::npos || (sep != std::string::npos && dot < sep)) return "";
const std::string base = bookPath.substr(0, dot);
for (const char* ext : {".jpg", ".jpeg", ".png", ".bmp"}) {
const std::string candidate = base + ext;
if (Storage.exists(candidate.c_str())) {
LOG_DBG("SIDECAR", "Found sidecar cover: %s", candidate.c_str());
return candidate;
}
}
return "";
}
std::unique_ptr<Epub> ReaderActivity::loadEpub(const std::string& path) {
if (!Storage.exists(path.c_str())) {
LOG_ERR("READER", "File does not exist: %s", path.c_str());
src/activities/reader/ReaderActivity.h
+2
View File
@@ -30,6 +30,8 @@ class ReaderActivity final : public Activity {
void onGoBack();
public:
static std::string sidecarCoverPath(const std::string& bookPath);
explicit ReaderActivity(GfxRenderer& renderer, MappedInputManager& mappedInput, std::string initialBookPath)
: Activity("Reader", renderer, mappedInput), initialBookPath(std::move(initialBookPath)) {}
void onEnter() override;
src/activities/reader/TxtReaderActivity.cpp
+3 -1
View File
@@ -13,6 +13,7 @@
#include "CrossPointState.h"
#include "GlobalBookmarkIndex.h"
#include "MappedInputManager.h"
#include "ReaderActivity.h"
#include "ReaderUtils.h"
#include "RecentBooksStore.h"
#include "StarredPagesActivity.h"
@@ -112,7 +113,7 @@ void TxtReaderActivity::onEnter() {
auto fileName = filePath.substr(filePath.rfind('/') + 1);
APP_STATE.openEpubPath = filePath;
APP_STATE.saveToFile();
RECENT_BOOKS.addBook(filePath, fileName, "", "", "");
RECENT_BOOKS.addBook(filePath, fileName, "", "", ReaderActivity::sidecarCoverPath(filePath));
// Trigger first update
requestUpdate();
@@ -134,6 +135,7 @@ void TxtReaderActivity::onExit() {
currentPageLines.clear();
APP_STATE.readerActivityLoadCount = 0;
APP_STATE.saveToFile();
UITheme::getInstance().getMutableTheme().onBookWillClose(txt ? txt->getPath() : "", nullptr, nullptr, txt.get());
txt.reset();
}
src/activities/reader/XtcReaderActivity.cpp
+7 -1
View File
@@ -17,9 +17,11 @@
#include "CrossPointSettings.h"
#include "CrossPointState.h"
#include "MappedInputManager.h"
#include "ReaderActivity.h"
#include "ReaderUtils.h"
#include "RecentBooksStore.h"
#include "XtcReaderChapterSelectionActivity.h"
#include "components/UITheme.h"
#include "fontIds.h"
void XtcReaderActivity::onEnter() {
@@ -41,7 +43,9 @@ void XtcReaderActivity::onEnter() {
// Save current XTC as last opened book and add to recent books
APP_STATE.openEpubPath = xtc->getPath();
APP_STATE.saveToFile();
RECENT_BOOKS.addBook(xtc->getPath(), xtc->getTitle(), xtc->getAuthor(), "", xtc->getThumbBmpPath());
const std::string xtcSidecar = ReaderActivity::sidecarCoverPath(xtc->getPath());
const std::string xtcCover = xtcSidecar.empty() ? xtc->getThumbBmpPath() : xtcSidecar;
RECENT_BOOKS.addBook(xtc->getPath(), xtc->getTitle(), xtc->getAuthor(), "", xtcCover);
// Trigger first update
requestUpdate();
@@ -52,6 +56,8 @@ void XtcReaderActivity::onExit() {
APP_STATE.readerActivityLoadCount = 0;
APP_STATE.saveToFile();
UITheme::getInstance().getMutableTheme().onBookWillClose(xtc ? xtc->getPath() : "", nullptr, xtc.get(), nullptr);
xtc.reset();
}