Ken Van Hoeylandt
f6cdabf3c0
## App state Improved app state management in `LoaderService` and `GuiService`: - Re-ordered some of the state transitions - Hardened `GuiService` for repeated events (that might trigger a re-render of an app that's already rendered) - Validate state transitions in `LoaderService` and crash if an app transitions from the wrong state to the next one. ## LoaderService - Removed `tt::loader::` functions and expose `LoaderService` interface publicly. - Implement `stopAll()` and `stopAll(id)` which stops all instances of an app, including any apps that were launched by it. - Rename `stop()` functions to `stopTop()` - Created `stopTop(id)` which only stops the top-most app when the app id matches. - Moved `loader::LoaderEvent` to `loader::LoaderService::Event` - Changed app instance `std::stack` to `std::vector` ## Improvements - `ElfApp`: error 22 now shows a hint that `main()` might be missing - Starting, installing and uninstalling apps now stops any running app (and its children) on the stack ## Bugfixes - `HttpdReq` out of memory issue now shows an error message and doesn't crash anymore (this would happen on devices without PSRAM with WiFi active, when an app was installed) - `GuiService::hideApp()` lock should not wait for timeout and now waits indefinitely - `Buildscript/release-sdk-current.sh` deletes the previous local release before building a new one ## Code correctness - App classes were made `final` - Apps that had a `void start()` now have a `LaunchId start()` - `tt::app::State`: renamed `Started` to `Created` and `Stopped` to `Destroyed` to properly reflect earlier name changes
80 lines
2.1 KiB
C++
80 lines
2.1 KiB
C++
#include "Tactility/app/fileselection/FileSelectionPrivate.h"
|
|
#include "Tactility/app/fileselection/View.h"
|
|
#include "Tactility/app/fileselection/State.h"
|
|
#include "Tactility/app/AppContext.h"
|
|
|
|
#include <Tactility/Assets.h>
|
|
#include <Tactility/service/loader/Loader.h>
|
|
|
|
#include <memory>
|
|
|
|
namespace tt::app::fileselection {
|
|
|
|
constexpr auto* TAG = "FileSelection";
|
|
|
|
extern const AppManifest manifest;
|
|
|
|
std::string getResultPath(const Bundle& bundle) {
|
|
std::string result;
|
|
if (bundle.optString("path", result)) {
|
|
return result;
|
|
} else {
|
|
return "";
|
|
}
|
|
}
|
|
|
|
Mode getMode(const Bundle& bundle) {
|
|
int32_t mode = static_cast<int32_t>(Mode::ExistingOrNew);
|
|
bundle.optInt32("mode", mode);
|
|
return static_cast<Mode>(mode);
|
|
}
|
|
|
|
void setMode(Bundle& bundle, Mode mode) {
|
|
auto mode_int = static_cast<int32_t>(mode);
|
|
bundle.putInt32("mode", mode_int);
|
|
}
|
|
|
|
class FileSelection : public App {
|
|
std::unique_ptr<View> view;
|
|
std::shared_ptr<State> state;
|
|
|
|
public:
|
|
FileSelection() {
|
|
state = std::make_shared<State>();
|
|
view = std::make_unique<View>(state, [this](const std::string& path) {
|
|
auto bundle = std::make_unique<Bundle>();
|
|
bundle->putString("path", path);
|
|
setResult(Result::Ok, std::move(bundle));
|
|
stop(manifest.appId);
|
|
});
|
|
}
|
|
|
|
void onShow(AppContext& appContext, lv_obj_t* parent) override {
|
|
auto mode = getMode(*appContext.getParameters());
|
|
view->init(parent, mode);
|
|
}
|
|
};
|
|
|
|
extern const AppManifest manifest = {
|
|
.appId = "FileSelection",
|
|
.appName = "File Selection",
|
|
.appIcon = TT_ASSETS_APP_ICON_FILES,
|
|
.appCategory = Category::System,
|
|
.appFlags = AppManifest::Flags::Hidden,
|
|
.createApp = create<FileSelection>
|
|
};
|
|
|
|
LaunchId startForExistingFile() {
|
|
auto bundle = std::make_shared<Bundle>();
|
|
setMode(*bundle, Mode::Existing);
|
|
return start(manifest.appId, bundle);
|
|
}
|
|
|
|
LaunchId startForExistingOrNewFile() {
|
|
auto bundle = std::make_shared<Bundle>();
|
|
setMode(*bundle, Mode::ExistingOrNew);
|
|
return start(manifest.appId, bundle);
|
|
}
|
|
|
|
} // namespace
|