## 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>
165 lines
4.8 KiB
C++
165 lines
4.8 KiB
C++
#pragma once
|
|
#include <I18n.h>
|
|
|
|
#include <functional>
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
#include "activities/Activity.h"
|
|
#include "util/ButtonNavigator.h"
|
|
|
|
class CrossPointSettings;
|
|
|
|
enum class SettingType { TOGGLE, ENUM, ACTION, VALUE, STRING };
|
|
|
|
enum class SettingAction {
|
|
None,
|
|
RemapFrontButtons,
|
|
CustomiseStatusBar,
|
|
KOReaderSync,
|
|
OPDSBrowser,
|
|
Network,
|
|
ClearCache,
|
|
CheckForUpdates,
|
|
Language,
|
|
};
|
|
|
|
struct SettingInfo {
|
|
StrId nameId;
|
|
SettingType type;
|
|
uint8_t CrossPointSettings::* valuePtr = nullptr;
|
|
std::vector<StrId> enumValues;
|
|
SettingAction action = SettingAction::None;
|
|
|
|
struct ValueRange {
|
|
uint8_t min;
|
|
uint8_t max;
|
|
uint8_t step;
|
|
};
|
|
ValueRange valueRange = {};
|
|
|
|
const char* key = nullptr; // JSON API key (nullptr for ACTION types)
|
|
StrId category = StrId::STR_NONE_OPT; // Category for web UI grouping
|
|
|
|
// Direct char[] string fields (for settings stored in CrossPointSettings)
|
|
char* stringPtr = nullptr;
|
|
size_t stringMaxLen = 0;
|
|
|
|
// Dynamic accessors (for settings stored outside CrossPointSettings, e.g. KOReaderCredentialStore)
|
|
std::function<uint8_t()> valueGetter;
|
|
std::function<void(uint8_t)> valueSetter;
|
|
std::function<std::string()> stringGetter;
|
|
std::function<void(const std::string&)> stringSetter;
|
|
|
|
static SettingInfo Toggle(StrId nameId, uint8_t CrossPointSettings::* ptr, const char* key = nullptr,
|
|
StrId category = StrId::STR_NONE_OPT) {
|
|
SettingInfo s;
|
|
s.nameId = nameId;
|
|
s.type = SettingType::TOGGLE;
|
|
s.valuePtr = ptr;
|
|
s.key = key;
|
|
s.category = category;
|
|
return s;
|
|
}
|
|
|
|
static SettingInfo Enum(StrId nameId, uint8_t CrossPointSettings::* ptr, std::vector<StrId> values,
|
|
const char* key = nullptr, StrId category = StrId::STR_NONE_OPT) {
|
|
SettingInfo s;
|
|
s.nameId = nameId;
|
|
s.type = SettingType::ENUM;
|
|
s.valuePtr = ptr;
|
|
s.enumValues = std::move(values);
|
|
s.key = key;
|
|
s.category = category;
|
|
return s;
|
|
}
|
|
|
|
static SettingInfo Action(StrId nameId, SettingAction action) {
|
|
SettingInfo s;
|
|
s.nameId = nameId;
|
|
s.type = SettingType::ACTION;
|
|
s.action = action;
|
|
return s;
|
|
}
|
|
|
|
static SettingInfo Value(StrId nameId, uint8_t CrossPointSettings::* ptr, const ValueRange valueRange,
|
|
const char* key = nullptr, StrId category = StrId::STR_NONE_OPT) {
|
|
SettingInfo s;
|
|
s.nameId = nameId;
|
|
s.type = SettingType::VALUE;
|
|
s.valuePtr = ptr;
|
|
s.valueRange = valueRange;
|
|
s.key = key;
|
|
s.category = category;
|
|
return s;
|
|
}
|
|
|
|
static SettingInfo String(StrId nameId, char* ptr, size_t maxLen, const char* key = nullptr,
|
|
StrId category = StrId::STR_NONE_OPT) {
|
|
SettingInfo s;
|
|
s.nameId = nameId;
|
|
s.type = SettingType::STRING;
|
|
s.stringPtr = ptr;
|
|
s.stringMaxLen = maxLen;
|
|
s.key = key;
|
|
s.category = category;
|
|
return s;
|
|
}
|
|
|
|
static SettingInfo DynamicEnum(StrId nameId, std::vector<StrId> values, std::function<uint8_t()> getter,
|
|
std::function<void(uint8_t)> setter, const char* key = nullptr,
|
|
StrId category = StrId::STR_NONE_OPT) {
|
|
SettingInfo s;
|
|
s.nameId = nameId;
|
|
s.type = SettingType::ENUM;
|
|
s.enumValues = std::move(values);
|
|
s.valueGetter = std::move(getter);
|
|
s.valueSetter = std::move(setter);
|
|
s.key = key;
|
|
s.category = category;
|
|
return s;
|
|
}
|
|
|
|
static SettingInfo DynamicString(StrId nameId, std::function<std::string()> getter,
|
|
std::function<void(const std::string&)> setter, const char* key = nullptr,
|
|
StrId category = StrId::STR_NONE_OPT) {
|
|
SettingInfo s;
|
|
s.nameId = nameId;
|
|
s.type = SettingType::STRING;
|
|
s.stringGetter = std::move(getter);
|
|
s.stringSetter = std::move(setter);
|
|
s.key = key;
|
|
s.category = category;
|
|
return s;
|
|
}
|
|
};
|
|
|
|
class SettingsActivity final : public Activity {
|
|
ButtonNavigator buttonNavigator;
|
|
|
|
int selectedCategoryIndex = 0; // Currently selected category
|
|
int selectedSettingIndex = 0;
|
|
int settingsCount = 0;
|
|
|
|
// Per-category settings derived from shared list + device-only actions
|
|
std::vector<SettingInfo> displaySettings;
|
|
std::vector<SettingInfo> readerSettings;
|
|
std::vector<SettingInfo> controlsSettings;
|
|
std::vector<SettingInfo> systemSettings;
|
|
const std::vector<SettingInfo>* currentSettings = nullptr;
|
|
|
|
static constexpr int categoryCount = 4;
|
|
static const StrId categoryNames[categoryCount];
|
|
|
|
void enterCategory(int categoryIndex);
|
|
void toggleCurrentSetting();
|
|
|
|
public:
|
|
explicit SettingsActivity(GfxRenderer& renderer, MappedInputManager& mappedInput)
|
|
: Activity("Settings", renderer, mappedInput) {}
|
|
void onEnter() override;
|
|
void onExit() override;
|
|
void loop() override;
|
|
void render(RenderLock&&) override;
|
|
};
|