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

Use new method to decide button press

Browse Source
This commit is contained in:
jpirnay
2026-04-27 20:56:06 +02:00
parent 1d8f03f757
commit 1f6ddddd59
1 changed files with 65 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/activities/home/RecentBooksActivity.cpp
+65 -59
View File
@@ -8,7 +8,6 @@
#include <algorithm> #include <algorithm>
#include "../ActivityManager.h" #include "../ActivityManager.h"
#include "../reader/ReaderUtils.h"
#include "../util/ConfirmationActivity.h" #include "../util/ConfirmationActivity.h"
#include "BookInfoActivity.h" #include "BookInfoActivity.h"
#include "CrossPointState.h" #include "CrossPointState.h"
@@ -54,67 +53,74 @@ void RecentBooksActivity::onExit() {
void RecentBooksActivity::loop() { void RecentBooksActivity::loop() {
const int pageItems = UITheme::getInstance().getNumberOfItemsPerPage(renderer, true, false, true, true); const int pageItems = UITheme::getInstance().getNumberOfItemsPerPage(renderer, true, false, true, true);
if (mappedInput.wasReleased(MappedInputManager::Button::Confirm) && !recentBooks.empty() && ButtonEventManager::ButtonEvent ev;
selectorIndex < static_cast<int>(recentBooks.size())) { while (buttonEvents.consumeEvent(ev)) {
// Long-press Confirm signals "open with KOReader sync" only for EPUBs. if (ev.button == MappedInputManager::Button::Confirm &&
// Short-press is unchanged direct open. (ev.type == ButtonEventManager::PressType::Short || ev.type == ButtonEventManager::PressType::Long)) {
const bool longPress = mappedInput.getHeldTime() >= ReaderUtils::GO_HOME_MS && KOREADER_STORE.hasCredentials(); if (recentBooks.empty() || selectorIndex >= recentBooks.size()) {
const std::string& selectedPath = recentBooks[selectorIndex].path; return;
const bool isEpubBook = FsHelpers::hasEpubExtension(selectedPath);
LOG_DBG("RBA", "Selected recent book: %s (sync=%d epub=%d)", selectedPath.c_str(), longPress ? 1 : 0,
isEpubBook ? 1 : 0);
if (longPress && isEpubBook) {
auto& sync = APP_STATE.koReaderSyncSession;
sync.autoPullEpubPath = selectedPath;
sync.exitToHomeAfterSync = false;
APP_STATE.saveToFile();
}
ReturnHint hint;
hint.target = ReturnTo::RecentBooks;
hint.selectIndex = static_cast<int>(selectorIndex);
activityManager.replaceWithReader(recentBooks[selectorIndex].path, std::move(hint));
return;
}
if (mappedInput.wasReleased(MappedInputManager::Button::Back)) {
onGoHome();
}
// Left button: remove selected book from recent list
if (!recentBooks.empty() && selectorIndex < recentBooks.size() &&
mappedInput.wasReleased(MappedInputManager::Button::Left)) {
const std::string bookPath = recentBooks[selectorIndex].path;
const std::string bookTitle = recentBooks[selectorIndex].title;
auto handler = [this, bookPath](const ActivityResult& res) {
if (!res.isCancelled) {
LOG_DBG("RBA", "Removing from recent books: %s", bookPath.c_str());
RECENT_BOOKS.removeBook(bookPath);
loadRecentBooks();
if (recentBooks.empty()) {
selectorIndex = 0;
} else if (selectorIndex >= recentBooks.size()) {
selectorIndex = recentBooks.size() - 1;
}
requestUpdate(true);
} else {
LOG_DBG("RBA", "Remove cancelled by user");
} }
}; // Long-press Confirm signals "open with KOReader sync" only for EPUBs.
// Short-press is unchanged direct open.
std::string heading = tr(STR_REMOVE) + std::string("? "); const bool longPress = (ev.type == ButtonEventManager::PressType::Long) && KOREADER_STORE.hasCredentials();
startActivityForResult(std::make_unique<ConfirmationActivity>(renderer, mappedInput, heading, bookTitle), handler); const std::string& selectedPath = recentBooks[selectorIndex].path;
return; const bool isEpubBook = FsHelpers::hasEpubExtension(selectedPath);
} LOG_DBG("RBA", "Selected recent book: %s (sync=%d epub=%d)", selectedPath.c_str(), longPress ? 1 : 0,
isEpubBook ? 1 : 0);
if (mappedInput.wasReleased(MappedInputManager::Button::Right) && !recentBooks.empty() && if (longPress && isEpubBook) {
selectorIndex < static_cast<int>(recentBooks.size())) { auto& sync = APP_STATE.koReaderSyncSession;
const std::string& path = recentBooks[selectorIndex].path; sync.autoPullEpubPath = selectedPath;
if (FsHelpers::hasEpubExtension(path) || FsHelpers::hasXtcExtension(path)) { sync.exitToHomeAfterSync = false;
startActivityForResult(std::make_unique<BookInfoActivity>(renderer, mappedInput, path), APP_STATE.saveToFile();
[this](const ActivityResult&) { requestUpdate(); }); }
ReturnHint hint;
hint.target = ReturnTo::RecentBooks;
hint.selectIndex = static_cast<int>(selectorIndex);
activityManager.replaceWithReader(recentBooks[selectorIndex].path, std::move(hint));
return; return;
} }
if (ev.button == MappedInputManager::Button::Back && ev.type == ButtonEventManager::PressType::Short) {
onGoHome();
return;
}
if (ev.button == MappedInputManager::Button::Left && ev.type == ButtonEventManager::PressType::Short) {
if (recentBooks.empty() || selectorIndex >= recentBooks.size()) return;
const std::string bookPath = recentBooks[selectorIndex].path;
const std::string bookTitle = recentBooks[selectorIndex].title;
auto handler = [this, bookPath](const ActivityResult& res) {
if (!res.isCancelled) {
LOG_DBG("RBA", "Removing from recent books: %s", bookPath.c_str());
RECENT_BOOKS.removeBook(bookPath);
loadRecentBooks();
if (recentBooks.empty()) {
selectorIndex = 0;
} else if (selectorIndex >= recentBooks.size()) {
selectorIndex = recentBooks.size() - 1;
}
requestUpdate(true);
} else {
LOG_DBG("RBA", "Remove cancelled by user");
}
};
std::string heading = tr(STR_REMOVE) + std::string("? ");
startActivityForResult(std::make_unique<ConfirmationActivity>(renderer, mappedInput, heading, bookTitle),
handler);
return;
}
if (ev.button == MappedInputManager::Button::Right && ev.type == ButtonEventManager::PressType::Short) {
if (recentBooks.empty() || selectorIndex >= recentBooks.size()) return;
const std::string& path = recentBooks[selectorIndex].path;
if (FsHelpers::hasEpubExtension(path) || FsHelpers::hasXtcExtension(path)) {
startActivityForResult(std::make_unique<BookInfoActivity>(renderer, mappedInput, path),
[this](const ActivityResult&) { requestUpdate(); });
return;
}
}
} }
int listSize = static_cast<int>(recentBooks.size()); int listSize = static_cast<int>(recentBooks.size());