64d161e88b
This PR unifies navigation handling & adds system-wide support for continuous navigation. ## Summary Holding down a navigation button now continuously advances through items until the button is released. This removes the need for repeated press-and-release actions and makes navigation faster and smoother, especially in long menus or documents. When page-based navigation is available, it will navigate through pages. If not, it will progress through menu items or similar list-based UI elements. Additionally, this PR fixes inconsistencies in wrap-around behavior and navigation index calculations. Places where the navigation system was updated: - Home Page - Settings Pages - My Library Page - WiFi Selection Page - OPDS Browser Page - Keyboard - File Transfer Page - XTC Chapter Selector Page - EPUB Chapter Selector Page I’ve tested this on the device as much as possible and tried to match the existing behavior. Please let me know if I missed anything. Thanks 🙏  --- Following the request from @osteotek and @daveallie for system-wide support, the old PR (#379) has been closed in favor of this consolidated, system-wide implementation. --- ### AI Usage Did you use AI tools to help write this code? _**PARTIALLY**_ --------- Co-authored-by: Dave Allie <dave@daveallie.com>
58 lines
2.2 KiB
C++
58 lines
2.2 KiB
C++
#pragma once
|
|
#include <Epub.h>
|
|
#include <freertos/FreeRTOS.h>
|
|
#include <freertos/semphr.h>
|
|
#include <freertos/task.h>
|
|
|
|
#include <memory>
|
|
|
|
#include "../ActivityWithSubactivity.h"
|
|
#include "util/ButtonNavigator.h"
|
|
|
|
class EpubReaderChapterSelectionActivity final : public ActivityWithSubactivity {
|
|
std::shared_ptr<Epub> epub;
|
|
std::string epubPath;
|
|
TaskHandle_t displayTaskHandle = nullptr;
|
|
SemaphoreHandle_t renderingMutex = nullptr;
|
|
ButtonNavigator buttonNavigator;
|
|
int currentSpineIndex = 0;
|
|
int currentPage = 0;
|
|
int totalPagesInSpine = 0;
|
|
int selectorIndex = 0;
|
|
bool updateRequired = false;
|
|
const std::function<void()> onGoBack;
|
|
const std::function<void(int newSpineIndex)> onSelectSpineIndex;
|
|
const std::function<void(int newSpineIndex, int newPage)> onSyncPosition;
|
|
|
|
// Number of items that fit on a page, derived from logical screen height.
|
|
// This adapts automatically when switching between portrait and landscape.
|
|
int getPageItems() const;
|
|
|
|
// Total TOC items count
|
|
int getTotalItems() const;
|
|
|
|
static void taskTrampoline(void* param);
|
|
[[noreturn]] void displayTaskLoop();
|
|
void renderScreen();
|
|
|
|
public:
|
|
explicit EpubReaderChapterSelectionActivity(GfxRenderer& renderer, MappedInputManager& mappedInput,
|
|
const std::shared_ptr<Epub>& epub, const std::string& epubPath,
|
|
const int currentSpineIndex, const int currentPage,
|
|
const int totalPagesInSpine, const std::function<void()>& onGoBack,
|
|
const std::function<void(int newSpineIndex)>& onSelectSpineIndex,
|
|
const std::function<void(int newSpineIndex, int newPage)>& onSyncPosition)
|
|
: ActivityWithSubactivity("EpubReaderChapterSelection", renderer, mappedInput),
|
|
epub(epub),
|
|
epubPath(epubPath),
|
|
currentSpineIndex(currentSpineIndex),
|
|
currentPage(currentPage),
|
|
totalPagesInSpine(totalPagesInSpine),
|
|
onGoBack(onGoBack),
|
|
onSelectSpineIndex(onSelectSpineIndex),
|
|
onSyncPosition(onSyncPosition) {}
|
|
void onEnter() override;
|
|
void onExit() override;
|
|
void loop() override;
|
|
};
|