Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-05-11 06:09:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Remove FAPP and fix main menu

Browse Source
This commit is contained in:
Willy-JL
2023-07-13 20:42:01 +02:00
parent 9d1987e661
commit ef907152b4
6 changed files with 31 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
applications/main/xtreme_app/application.fam
View File

@@ -1,14 +1,12 @@
App(
appid="xtreme_app",
name="Xtreme",
apptype=FlipperAppType.FAPP,
apptype=FlipperAppType.MENUEXTERNAL,
entry_point="xtreme_app",
cdefines=["APP_XTREME"],
requires=[
"gui",
"dolphin",
],
stack_size=2 * 1024,
icon="A_Xtreme_14",
order=90,
fap_libs=["assets"],
# fap_icon="",
# fap_category="",
)

11
applications/services/loader/loader.c
View File

@@ -483,15 +483,8 @@ static LoaderStatus loader_do_start_by_name(
{
const FlipperInternalApplication* app = loader_find_application_by_name(name);
if(app) {
if(app->app == NULL) {
// FAPP support
status = loader_start_external_app(
loader, furi_record_open(RECORD_STORAGE), app->appid, args, error_message);
furi_record_close(RECORD_STORAGE);
} else {
loader_start_internal_app(loader, app, args);
status = loader_make_success_status(error_message);
}
loader_start_internal_app(loader, app, args);
status = loader_make_success_status(error_message);
break;
}
}

28
applications/services/loader/loader_menu.c
View File

@@ -62,12 +62,6 @@ static void loader_menu_apps_callback(void* context, uint32_t index) {
loader_menu_start(name_or_path);
}
static void loader_menu_external_apps_callback(void* context, uint32_t index) {
UNUSED(context);
const char* path = FLIPPER_EXTERNAL_APPS[index].path;
loader_menu_start(path);
}
static void loader_menu_applications_callback(void* context, uint32_t index) {
UNUSED(index);
UNUSED(context);
@@ -98,13 +92,29 @@ static uint32_t loader_menu_exit(void* context) {
}
static void loader_menu_build_menu(LoaderMenuApp* app, LoaderMenu* menu) {
size_t i;
for(i = 0; i < FLIPPER_APPS_COUNT; i++) {
menu_add_item(
app->primary_menu,
LOADER_APPLICATIONS_NAME,
&A_Plugins_14,
0,
loader_menu_applications_callback,
(void*)menu);
for(size_t i = 0; i < FLIPPER_EXTERNAL_APPS_COUNT; i++) {
menu_add_item(
app->primary_menu,
FLIPPER_EXTERNAL_APPS[i].name,
FLIPPER_EXTERNAL_APPS[i].icon,
(uint32_t)FLIPPER_EXTERNAL_APPS[i].path,
loader_menu_apps_callback,
(void*)menu);
}
for(size_t i = 0; i < FLIPPER_APPS_COUNT; i++) {
menu_add_item(
app->primary_menu,
FLIPPER_APPS[i].name,
FLIPPER_APPS[i].icon,
i,
(uint32_t)FLIPPER_APPS[i].name,
loader_menu_apps_callback,
(void*)menu);
}