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>
53 lines
2.0 KiB
C++
53 lines
2.0 KiB
C++
#pragma once
|
|
|
|
#include <functional>
|
|
#include <vector>
|
|
|
|
#include "MappedInputManager.h"
|
|
|
|
class ButtonNavigator final {
|
|
using Callback = std::function<void()>;
|
|
using Buttons = std::vector<MappedInputManager::Button>;
|
|
|
|
const uint16_t continuousStartMs;
|
|
const uint16_t continuousIntervalMs;
|
|
uint32_t lastContinuousNavTime = 0;
|
|
static const MappedInputManager* mappedInput;
|
|
|
|
[[nodiscard]] bool shouldNavigateContinuously() const;
|
|
|
|
public:
|
|
explicit ButtonNavigator(const uint16_t continuousIntervalMs = 500, const uint16_t continuousStartMs = 500)
|
|
: continuousStartMs(continuousStartMs), continuousIntervalMs(continuousIntervalMs) {}
|
|
|
|
static void setMappedInputManager(const MappedInputManager& mappedInputManager) { mappedInput = &mappedInputManager; }
|
|
|
|
void onNext(const Callback& callback);
|
|
void onPrevious(const Callback& callback);
|
|
void onPressAndContinuous(const Buttons& buttons, const Callback& callback);
|
|
|
|
void onNextPress(const Callback& callback);
|
|
void onPreviousPress(const Callback& callback);
|
|
void onPress(const Buttons& buttons, const Callback& callback);
|
|
|
|
void onNextRelease(const Callback& callback);
|
|
void onPreviousRelease(const Callback& callback);
|
|
void onRelease(const Buttons& buttons, const Callback& callback);
|
|
|
|
void onNextContinuous(const Callback& callback);
|
|
void onPreviousContinuous(const Callback& callback);
|
|
void onContinuous(const Buttons& buttons, const Callback& callback);
|
|
|
|
[[nodiscard]] static int nextIndex(int currentIndex, int totalItems);
|
|
[[nodiscard]] static int previousIndex(int currentIndex, int totalItems);
|
|
|
|
[[nodiscard]] static int nextPageIndex(int currentIndex, int totalItems, int itemsPerPage);
|
|
[[nodiscard]] static int previousPageIndex(int currentIndex, int totalItems, int itemsPerPage);
|
|
|
|
[[nodiscard]] static Buttons getNextButtons() {
|
|
return {MappedInputManager::Button::Down, MappedInputManager::Button::Right};
|
|
}
|
|
[[nodiscard]] static Buttons getPreviousButtons() {
|
|
return {MappedInputManager::Button::Up, MappedInputManager::Button::Left};
|
|
}
|
|
}; |