Ken Van Hoeylandt
ab75d2022d
Event handling: - Added unified event handling for application, system, and Wi‑Fi events. - Updated all apps to reflect event handling changes Wi-Fi: - Refactored event handling from listener interface to task & event group. - Added direct Wi‑Fi radio controls and improved event subscriptions. - Wi‑Fi screens now refresh asynchronously and handle unavailable devices more gracefully. - Enabled Wi‑Fi by default on in dts files, but radio on/off is still done by code. The main reason was reliable event subscription and consistent devicetree states. - Improved Wi‑Fi shutdown cleanup and radio-state handling. Other: - Renamed the Kernel Display app to Display.
139 lines
4.5 KiB
C++
139 lines
4.5 KiB
C++
#include <lvgl/icons/shared.h>
|
|
#include <lvgl/fonts.h>
|
|
|
|
#include <Tactility/app/appdetails/AppDetails.h>
|
|
|
|
#include <app/event.h>
|
|
#include <app/manager.h>
|
|
#include <app/manifest.h>
|
|
#include <app/scheduler.h>
|
|
|
|
#include <lvgl_window_manager/window_manager.h>
|
|
|
|
#include <tactility/check.h>
|
|
|
|
#include <lvgl/widgets/toolbar.h>
|
|
#include <lvgl.h>
|
|
#include <algorithm>
|
|
#include <cstring>
|
|
#include <vector>
|
|
|
|
namespace tt::app::appsettings {
|
|
|
|
extern const ::AppManifest manifest;
|
|
|
|
namespace {
|
|
|
|
// Set by appMain() right before window_manager_create(), read by onBackPressed().
|
|
uint32_t appSettingsInstanceId = 0;
|
|
|
|
void onAppPressed(lv_event_t* e) {
|
|
const auto* target_manifest = static_cast<const ::AppManifest*>(lv_event_get_user_data(e));
|
|
appdetails::start(target_manifest->id);
|
|
}
|
|
|
|
void onBackPressed(lv_event_t*) {
|
|
// Async, non-blocking - must NOT call app_manager_stop() directly here: that bound-waits
|
|
// (thread_join) for this app's own thread to finish, which needs the LVGL lock
|
|
// (window_manager_remove()) - but this callback runs ON the LVGL task, which would
|
|
// deadlock against itself.
|
|
AppEvent event { .type = APP_EVENT_CLOSE, .timestamp = 0, .result = {} };
|
|
app_event_emit(appSettingsInstanceId, &event);
|
|
}
|
|
|
|
void createAppWidget(const ::AppManifest* target_manifest, lv_obj_t* list) {
|
|
// The new AppManifest has no per-app icon - use a shared generic one for every entry, same
|
|
// fallback AppList.cpp uses.
|
|
lv_obj_t* btn = lv_list_add_button(list, LVGL_ICON_SHARED_TOOLBAR, target_manifest->name);
|
|
lv_obj_t* image = lv_obj_get_child(btn, 0);
|
|
lv_obj_set_style_text_font(image, lvgl_get_shared_icon_font(), LV_PART_MAIN);
|
|
lv_obj_add_event_cb(btn, &onAppPressed, LV_EVENT_SHORT_CLICKED, const_cast<::AppManifest*>(target_manifest));
|
|
}
|
|
|
|
void collectManifest(const ::AppManifest* manifest, void* context) {
|
|
auto* manifests = static_cast<std::vector<const ::AppManifest*>*>(context);
|
|
manifests->push_back(manifest);
|
|
}
|
|
|
|
void createWidgets(lv_obj_t* parent, void*) {
|
|
auto* toolbar = lvgl_toolbar_create(parent, "Installed Apps");
|
|
// The global toolbar nav callback only knows how to stop old-model apps.
|
|
lvgl_toolbar_set_nav_action(toolbar, LV_SYMBOL_CLOSE, onBackPressed, nullptr);
|
|
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);
|
|
|
|
std::vector<const ::AppManifest*> manifests;
|
|
app_manager_for_each_manifest(collectManifest, &manifests);
|
|
std::ranges::sort(manifests, [](const ::AppManifest* a, const ::AppManifest* b) {
|
|
return strcmp(a->name, b->name) < 0;
|
|
});
|
|
|
|
size_t app_count = 0;
|
|
for (const auto* target_manifest: manifests) {
|
|
if (target_manifest->location.type == APP_LOCATION_PATH) {
|
|
app_count++;
|
|
createAppWidget(target_manifest, list);
|
|
}
|
|
}
|
|
|
|
if (app_count == 0) {
|
|
auto* no_apps_label = lv_label_create(parent);
|
|
lv_label_set_text(no_apps_label, "No apps installed");
|
|
lv_obj_align(no_apps_label, LV_ALIGN_CENTER, 0, 0);
|
|
}
|
|
}
|
|
|
|
int32_t appMain(int argc, char* argv[]) {
|
|
uint32_t appInstanceId = app_scheduler_current_app_id();
|
|
appSettingsInstanceId = appInstanceId;
|
|
|
|
TaskEventGroup event_group {};
|
|
task_event_group_construct(&event_group);
|
|
|
|
AppEventSubscription sub {};
|
|
check(app_event_subscribe(&sub, &event_group) == ERROR_NONE);
|
|
|
|
WindowId window = window_manager_create(appInstanceId, createWidgets, nullptr);
|
|
|
|
bool shouldClose = false;
|
|
while (!shouldClose) {
|
|
task_event_group_wait_any(&event_group, nullptr, portMAX_DELAY);
|
|
|
|
AppEvent event {};
|
|
while (app_event_poll(&sub, &event) == ERROR_NONE) {
|
|
switch (event.type) {
|
|
case APP_EVENT_CLOSE:
|
|
shouldClose = true;
|
|
break;
|
|
default:
|
|
break;
|
|
}
|
|
if (shouldClose) break;
|
|
}
|
|
}
|
|
|
|
window_manager_remove(window);
|
|
check(app_event_unsubscribe(&sub) == ERROR_NONE);
|
|
task_event_group_destruct(&event_group);
|
|
|
|
return 0;
|
|
}
|
|
|
|
} // namespace
|
|
|
|
extern const ::AppManifest manifest = {
|
|
.id = "tactility.appsettings",
|
|
.name = "Apps",
|
|
.category = APP_CATEGORY_SETTINGS,
|
|
.location = { APP_LOCATION_MEMORY, reinterpret_cast<void*>(appMain) }
|
|
};
|
|
|
|
} // namespace
|