From 617700bd152977fd571a3d6bad5d68e73030fdde Mon Sep 17 00:00:00 2001 From: Willy-JL Date: Mon, 20 Feb 2023 19:00:38 +0000 Subject: [PATCH] Move xtreme app to main menu --- applications/main/application.fam | 1 + applications/{settings => main}/xtreme_app/application.fam | 5 +++-- .../{settings => main}/xtreme_app/scenes/xtreme_app_scene.c | 0 .../{settings => main}/xtreme_app/scenes/xtreme_app_scene.h | 0 .../xtreme_app/scenes/xtreme_app_scene_config.h | 0 .../xtreme_app/scenes/xtreme_app_scene_dolphin.c | 0 .../xtreme_app/scenes/xtreme_app_scene_graphics.c | 0 .../xtreme_app/scenes/xtreme_app_scene_misc.c | 0 .../xtreme_app/scenes/xtreme_app_scene_misc_rename.c | 0 .../xtreme_app/scenes/xtreme_app_scene_protocols.c | 0 .../xtreme_app/scenes/xtreme_app_scene_start.c | 0 .../xtreme_app/scenes/xtreme_app_scene_statusbar.c | 0 applications/{settings => main}/xtreme_app/xtreme_app.c | 0 applications/{settings => main}/xtreme_app/xtreme_app.h | 0 applications/settings/application.fam | 1 - 15 files changed, 4 insertions(+), 3 deletions(-) rename applications/{settings => main}/xtreme_app/application.fam (75%) rename applications/{settings => main}/xtreme_app/scenes/xtreme_app_scene.c (100%) rename applications/{settings => main}/xtreme_app/scenes/xtreme_app_scene.h (100%) rename applications/{settings => main}/xtreme_app/scenes/xtreme_app_scene_config.h (100%) rename applications/{settings => main}/xtreme_app/scenes/xtreme_app_scene_dolphin.c (100%) rename applications/{settings => main}/xtreme_app/scenes/xtreme_app_scene_graphics.c (100%) rename applications/{settings => main}/xtreme_app/scenes/xtreme_app_scene_misc.c (100%) rename applications/{settings => main}/xtreme_app/scenes/xtreme_app_scene_misc_rename.c (100%) rename applications/{settings => main}/xtreme_app/scenes/xtreme_app_scene_protocols.c (100%) rename applications/{settings => main}/xtreme_app/scenes/xtreme_app_scene_start.c (100%) rename applications/{settings => main}/xtreme_app/scenes/xtreme_app_scene_statusbar.c (100%) rename applications/{settings => main}/xtreme_app/xtreme_app.c (100%) rename applications/{settings => main}/xtreme_app/xtreme_app.h (100%) diff --git a/applications/main/application.fam b/applications/main/application.fam index 8c290037b..e47c0f2a1 100644 --- a/applications/main/application.fam +++ b/applications/main/application.fam @@ -14,6 +14,7 @@ App( "ibutton", "bad_kb", "u2f", + "xtreme_app", "archive", ], ) diff --git a/applications/settings/xtreme_app/application.fam b/applications/main/xtreme_app/application.fam similarity index 75% rename from applications/settings/xtreme_app/application.fam rename to applications/main/xtreme_app/application.fam index e1b7fc964..10ec953c9 100644 --- a/applications/settings/xtreme_app/application.fam +++ b/applications/main/xtreme_app/application.fam @@ -1,12 +1,13 @@ App( appid="xtreme_app", name="Xtreme FW", - apptype=FlipperAppType.SETTINGS, + apptype=FlipperAppType.APP, entry_point="xtreme_app", - stack_size=2 * 1024, requires=[ "gui", "xtreme", ], + stack_size=2 * 1024, + icon="A_Plugins_14", order=90, ) diff --git a/applications/settings/xtreme_app/scenes/xtreme_app_scene.c b/applications/main/xtreme_app/scenes/xtreme_app_scene.c similarity index 100% rename from applications/settings/xtreme_app/scenes/xtreme_app_scene.c rename to applications/main/xtreme_app/scenes/xtreme_app_scene.c diff --git a/applications/settings/xtreme_app/scenes/xtreme_app_scene.h b/applications/main/xtreme_app/scenes/xtreme_app_scene.h similarity index 100% rename from applications/settings/xtreme_app/scenes/xtreme_app_scene.h rename to applications/main/xtreme_app/scenes/xtreme_app_scene.h diff --git a/applications/settings/xtreme_app/scenes/xtreme_app_scene_config.h b/applications/main/xtreme_app/scenes/xtreme_app_scene_config.h similarity index 100% rename from applications/settings/xtreme_app/scenes/xtreme_app_scene_config.h rename to applications/main/xtreme_app/scenes/xtreme_app_scene_config.h diff --git a/applications/settings/xtreme_app/scenes/xtreme_app_scene_dolphin.c b/applications/main/xtreme_app/scenes/xtreme_app_scene_dolphin.c similarity index 100% rename from applications/settings/xtreme_app/scenes/xtreme_app_scene_dolphin.c rename to applications/main/xtreme_app/scenes/xtreme_app_scene_dolphin.c diff --git a/applications/settings/xtreme_app/scenes/xtreme_app_scene_graphics.c b/applications/main/xtreme_app/scenes/xtreme_app_scene_graphics.c similarity index 100% rename from applications/settings/xtreme_app/scenes/xtreme_app_scene_graphics.c rename to applications/main/xtreme_app/scenes/xtreme_app_scene_graphics.c diff --git a/applications/settings/xtreme_app/scenes/xtreme_app_scene_misc.c b/applications/main/xtreme_app/scenes/xtreme_app_scene_misc.c similarity index 100% rename from applications/settings/xtreme_app/scenes/xtreme_app_scene_misc.c rename to applications/main/xtreme_app/scenes/xtreme_app_scene_misc.c diff --git a/applications/settings/xtreme_app/scenes/xtreme_app_scene_misc_rename.c b/applications/main/xtreme_app/scenes/xtreme_app_scene_misc_rename.c similarity index 100% rename from applications/settings/xtreme_app/scenes/xtreme_app_scene_misc_rename.c rename to applications/main/xtreme_app/scenes/xtreme_app_scene_misc_rename.c diff --git a/applications/settings/xtreme_app/scenes/xtreme_app_scene_protocols.c b/applications/main/xtreme_app/scenes/xtreme_app_scene_protocols.c similarity index 100% rename from applications/settings/xtreme_app/scenes/xtreme_app_scene_protocols.c rename to applications/main/xtreme_app/scenes/xtreme_app_scene_protocols.c diff --git a/applications/settings/xtreme_app/scenes/xtreme_app_scene_start.c b/applications/main/xtreme_app/scenes/xtreme_app_scene_start.c similarity index 100% rename from applications/settings/xtreme_app/scenes/xtreme_app_scene_start.c rename to applications/main/xtreme_app/scenes/xtreme_app_scene_start.c diff --git a/applications/settings/xtreme_app/scenes/xtreme_app_scene_statusbar.c b/applications/main/xtreme_app/scenes/xtreme_app_scene_statusbar.c similarity index 100% rename from applications/settings/xtreme_app/scenes/xtreme_app_scene_statusbar.c rename to applications/main/xtreme_app/scenes/xtreme_app_scene_statusbar.c diff --git a/applications/settings/xtreme_app/xtreme_app.c b/applications/main/xtreme_app/xtreme_app.c similarity index 100% rename from applications/settings/xtreme_app/xtreme_app.c rename to applications/main/xtreme_app/xtreme_app.c diff --git a/applications/settings/xtreme_app/xtreme_app.h b/applications/main/xtreme_app/xtreme_app.h similarity index 100% rename from applications/settings/xtreme_app/xtreme_app.h rename to applications/main/xtreme_app/xtreme_app.h diff --git a/applications/settings/application.fam b/applications/settings/application.fam index 49695b4b3..cc4b9703d 100644 --- a/applications/settings/application.fam +++ b/applications/settings/application.fam @@ -5,7 +5,6 @@ App( provides=[ "passport", "system_settings", - "xtreme_app", "about", ], )