Xuan-Son NguyenandZach Nelson
a94f6ca80b
## Summary Ref comment: https://github.com/crosspoint-reader/crosspoint-reader/pull/1010#pullrequestreview-3828854640 This PR introduces `ActivityManager`, which mirrors the same concept of Activity in Android, where an activity represents a single screen of the UI. The manager is responsible for launching activities, and ensuring that only one activity is active at a time. Main differences from Android's ActivityManager: - No concept of Bundle or Intent extras - No onPause/onResume, since we don't have a concept of background activities - onActivityResult is implemented via a callback instead of a separate method, for simplicity ## Key changes - Single `renderTask` shared across all activities - No more sub-activity, we manage them using a stack; Results can be passed via `startActivityForResult` and `setResult` - Activity can call `finish()` to destroy themself, but the actual deletion will be handled by `ActivityManager` to avoid `delete this` pattern As a bonus: the manager will automatically call `requestUpdate()` when returning from another activity ## Example usage **BEFORE**: ```cpp // caller enterNewActivity(new WifiSelectionActivity(renderer, mappedInput, [this](const bool connected) { onWifiSelectionComplete(connected); })); // subactivity onComplete(true); // will eventually call exitActivity(), which deletes the caller instance (dangerous behavior) ``` **AFTER**: (mirrors the `startActivityForResult` and `setResult` from android) ```cpp // caller startActivityForResult(new NetworkModeSelectionActivity(renderer, mappedInput), [this](const ActivityResult& result) { onNetworkModeSelected(result.selectedNetworkMode); }); // subactivity ActivityResult result; result.isCancelled = false; result.selectedNetworkMode = mode; setResult(result); finish(); // signals to ActivityManager to go back to last activity AFTER this function returns ``` TODO: - [x] Reconsider if the `Intent` is really necessary or it should be removed (note: it's inspired by [Intent](https://developer.android.com/guide/components/intents-common) from Android API) ==> I decided to keep this pattern fr clarity - [x] Verify if behavior is still correct (i.e. back from sub-activity) - [x] Refactor the `ActivityWithSubactivity` to just simple `Activity` --> We are using a stack for keeping track of sub-activity now - [x] Use single task for rendering --> avoid allocating 8KB stack per activity - [x] Implement the idea of [Activity result](https://developer.android.com/training/basics/intents/result) --> Allow sub-activity like Wifi to report back the status (connected, failed, etc) --- ### AI Usage While CrossPoint doesn't have restrictions on AI tools in contributing, please be transparent about their usage as it helps set the right context for reviewers. Did you use AI tools to help write this code? **PARTIALLY**, some repetitive migrations are done by Claude, but I'm the one how ultimately approve it --------- Co-authored-by: Zach Nelson <zach@zdnelson.com>
95 lines
3.0 KiB
C++
95 lines
3.0 KiB
C++
#include "EpubReaderPercentSelectionActivity.h"
|
|
|
|
#include <GfxRenderer.h>
|
|
#include <I18n.h>
|
|
|
|
#include "MappedInputManager.h"
|
|
#include "components/UITheme.h"
|
|
#include "fontIds.h"
|
|
|
|
namespace {
|
|
// Fine/coarse slider step sizes for percent adjustments.
|
|
constexpr int kSmallStep = 1;
|
|
constexpr int kLargeStep = 10;
|
|
} // namespace
|
|
|
|
void EpubReaderPercentSelectionActivity::onEnter() {
|
|
Activity::onEnter();
|
|
// Set up rendering task and mark first frame dirty.
|
|
requestUpdate();
|
|
}
|
|
|
|
void EpubReaderPercentSelectionActivity::onExit() { Activity::onExit(); }
|
|
|
|
void EpubReaderPercentSelectionActivity::adjustPercent(const int delta) {
|
|
// Apply delta and clamp within 0-100.
|
|
percent += delta;
|
|
if (percent < 0) {
|
|
percent = 0;
|
|
} else if (percent > 100) {
|
|
percent = 100;
|
|
}
|
|
requestUpdate();
|
|
}
|
|
|
|
void EpubReaderPercentSelectionActivity::loop() {
|
|
// Back cancels, confirm selects, arrows adjust the percent.
|
|
if (mappedInput.wasReleased(MappedInputManager::Button::Back)) {
|
|
ActivityResult result;
|
|
result.isCancelled = true;
|
|
setResult(std::move(result));
|
|
finish();
|
|
return;
|
|
}
|
|
|
|
if (mappedInput.wasReleased(MappedInputManager::Button::Confirm)) {
|
|
setResult(PercentResult{percent});
|
|
finish();
|
|
return;
|
|
}
|
|
|
|
buttonNavigator.onPressAndContinuous({MappedInputManager::Button::Left}, [this] { adjustPercent(-kSmallStep); });
|
|
buttonNavigator.onPressAndContinuous({MappedInputManager::Button::Right}, [this] { adjustPercent(kSmallStep); });
|
|
|
|
buttonNavigator.onPressAndContinuous({MappedInputManager::Button::Up}, [this] { adjustPercent(kLargeStep); });
|
|
buttonNavigator.onPressAndContinuous({MappedInputManager::Button::Down}, [this] { adjustPercent(-kLargeStep); });
|
|
}
|
|
|
|
void EpubReaderPercentSelectionActivity::render(RenderLock&&) {
|
|
renderer.clearScreen();
|
|
|
|
// Title and numeric percent value.
|
|
renderer.drawCenteredText(UI_12_FONT_ID, 15, tr(STR_GO_TO_PERCENT), true, EpdFontFamily::BOLD);
|
|
|
|
const std::string percentText = std::to_string(percent) + "%";
|
|
renderer.drawCenteredText(UI_12_FONT_ID, 90, percentText.c_str(), true, EpdFontFamily::BOLD);
|
|
|
|
// Draw slider track.
|
|
const int screenWidth = renderer.getScreenWidth();
|
|
constexpr int barWidth = 360;
|
|
constexpr int barHeight = 16;
|
|
const int barX = (screenWidth - barWidth) / 2;
|
|
const int barY = 140;
|
|
|
|
renderer.drawRect(barX, barY, barWidth, barHeight);
|
|
|
|
// Fill slider based on percent.
|
|
const int fillWidth = (barWidth - 4) * percent / 100;
|
|
if (fillWidth > 0) {
|
|
renderer.fillRect(barX + 2, barY + 2, fillWidth, barHeight - 4);
|
|
}
|
|
|
|
// Draw a simple knob centered at the current percent.
|
|
const int knobX = barX + 2 + fillWidth - 2;
|
|
renderer.fillRect(knobX, barY - 4, 4, barHeight + 8, true);
|
|
|
|
// Hint text for step sizes.
|
|
renderer.drawCenteredText(SMALL_FONT_ID, barY + 30, tr(STR_PERCENT_STEP_HINT), true);
|
|
|
|
// Button hints follow the current front button layout.
|
|
const auto labels = mappedInput.mapLabels(tr(STR_BACK), tr(STR_SELECT), "-", "+");
|
|
GUI.drawButtonHints(renderer, labels.btn1, labels.btn2, labels.btn3, labels.btn4);
|
|
|
|
renderer.displayBuffer();
|
|
}
|