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
61 lines
2.1 KiB
C++
61 lines
2.1 KiB
C++
#include <Tactility/app/AppRegistration.h>
|
|
#include <Tactility/service/loader/Loader.h>
|
|
#include <Tactility/lvgl/Toolbar.h>
|
|
|
|
#include <Tactility/Assets.h>
|
|
|
|
#include <lvgl.h>
|
|
#include <algorithm>
|
|
|
|
namespace tt::app::applist {
|
|
|
|
class AppListApp final : public App {
|
|
|
|
static void onAppPressed(lv_event_t* e) {
|
|
const auto* manifest = static_cast<const AppManifest*>(lv_event_get_user_data(e));
|
|
start(manifest->appId);
|
|
}
|
|
|
|
static void createAppWidget(const std::shared_ptr<AppManifest>& manifest, lv_obj_t* list) {
|
|
const void* icon = !manifest->appIcon.empty() ? manifest->appIcon.c_str() : TT_ASSETS_APP_ICON_FALLBACK;
|
|
lv_obj_t* btn = lv_list_add_button(list, icon, manifest->appName.c_str());
|
|
lv_obj_add_event_cb(btn, &onAppPressed, LV_EVENT_SHORT_CLICKED, manifest.get());
|
|
}
|
|
|
|
public:
|
|
|
|
void onShow(TT_UNUSED AppContext& app, lv_obj_t* parent) override {
|
|
auto* toolbar = lvgl::toolbar_create(parent, app);
|
|
lv_obj_align(toolbar, LV_ALIGN_TOP_MID, 0, 0);
|
|
|
|
lv_obj_t* list = lv_list_create(parent);
|
|
lv_obj_set_width(list, LV_PCT(100));
|
|
lv_obj_align_to(list, toolbar, LV_ALIGN_OUT_BOTTOM_MID, 0, 0);
|
|
|
|
auto toolbar_height = lv_obj_get_height(toolbar);
|
|
auto parent_content_height = lv_obj_get_content_height(parent);
|
|
lv_obj_set_height(list, parent_content_height - toolbar_height);
|
|
|
|
auto manifests = getApps();
|
|
std::ranges::sort(manifests, SortAppManifestByName);
|
|
|
|
for (const auto& manifest: manifests) {
|
|
bool is_valid_category = (manifest->appCategory == Category::User) || (manifest->appCategory == Category::System);
|
|
bool is_visible = (manifest->appFlags & AppManifest::Flags::Hidden) == 0u;
|
|
if (is_valid_category && is_visible) {
|
|
createAppWidget(manifest, list);
|
|
}
|
|
}
|
|
}
|
|
};
|
|
|
|
extern const AppManifest manifest = {
|
|
.appId = "AppList",
|
|
.appName = "Apps",
|
|
.appCategory = Category::System,
|
|
.appFlags = AppManifest::Flags::Hidden,
|
|
.createApp = create<AppListApp>,
|
|
};
|
|
|
|
} // namespace
|