diff --git a/applications/services/loader/loader_menu.c b/applications/services/loader/loader_menu.c index 4fec926fe..7fa94ba38 100644 --- a/applications/services/loader/loader_menu.c +++ b/applications/services/loader/loader_menu.c @@ -134,14 +134,6 @@ static void loader_menu_build_menu(LoaderMenuApp* app, LoaderMenu* menu) { } static void loader_menu_build_submenu(LoaderMenuApp* app, LoaderMenu* loader_menu) { - for(size_t i = 0; i < FLIPPER_SETTINGS_APPS_COUNT; i++) { - submenu_add_item_ex( - app->settings_menu, - FLIPPER_SETTINGS_APPS[i].name, - (uint32_t)FLIPPER_SETTINGS_APPS[i].name, - loader_menu_settings_menu_callback, - loader_menu); - } for(size_t i = 0; i < FLIPPER_EXTSETTINGS_APPS_COUNT; i++) { submenu_add_item_ex( app->settings_menu, @@ -150,6 +142,14 @@ static void loader_menu_build_submenu(LoaderMenuApp* app, LoaderMenu* loader_men loader_menu_settings_menu_callback, loader_menu); } + for(size_t i = 0; i < FLIPPER_SETTINGS_APPS_COUNT; i++) { + submenu_add_item_ex( + app->settings_menu, + FLIPPER_SETTINGS_APPS[i].name, + (uint32_t)FLIPPER_SETTINGS_APPS[i].name, + loader_menu_settings_menu_callback, + loader_menu); + } } static LoaderMenuApp* loader_menu_app_alloc(LoaderMenu* loader_menu) { diff --git a/applications/settings/about/application.fam b/applications/settings/about/application.fam index 0534c5a28..76d04f852 100644 --- a/applications/settings/about/application.fam +++ b/applications/settings/about/application.fam @@ -9,7 +9,7 @@ App( "dialogs", ], stack_size=1 * 1024, - order=1000, + order=10, fap_libs=["assets"], fap_category="assets", ) diff --git a/applications/settings/bt_settings_app/application.fam b/applications/settings/bt_settings_app/application.fam index 451c837df..67e1cf17c 100644 --- a/applications/settings/bt_settings_app/application.fam +++ b/applications/settings/bt_settings_app/application.fam @@ -8,7 +8,7 @@ App( "bt", "gui", ], - order=10, + order=20, fap_libs=["assets"], fap_category="assets", ) diff --git a/applications/settings/clock_settings/application.fam b/applications/settings/clock_settings/application.fam index d6a96d2e5..ce8a84fff 100644 --- a/applications/settings/clock_settings/application.fam +++ b/applications/settings/clock_settings/application.fam @@ -6,7 +6,7 @@ App( requires=["gui"], provides=["clock_settings_start"], stack_size=1 * 1024, - order=90, + order=30, fap_libs=["assets"], fap_category="assets", ) diff --git a/applications/settings/desktop_settings/application.fam b/applications/settings/desktop_settings/application.fam index 5e6da74de..fe658fd12 100644 --- a/applications/settings/desktop_settings/application.fam +++ b/applications/settings/desktop_settings/application.fam @@ -8,7 +8,7 @@ App( "gui", ], stack_size=1 * 1024, - order=50, + order=40, fap_libs=["assets"], fap_category="assets", ) diff --git a/applications/settings/dolphin_passport/application.fam b/applications/settings/dolphin_passport/application.fam index 142840ece..3d63ea918 100644 --- a/applications/settings/dolphin_passport/application.fam +++ b/applications/settings/dolphin_passport/application.fam @@ -9,7 +9,7 @@ App( "dolphin", ], stack_size=1 * 1024, - order=60, + order=80, fap_libs=["assets"], fap_category="assets", ) diff --git a/applications/settings/expansion_settings_app/application.fam b/applications/settings/expansion_settings_app/application.fam index e3c1881bf..a5876f5e6 100644 --- a/applications/settings/expansion_settings_app/application.fam +++ b/applications/settings/expansion_settings_app/application.fam @@ -5,7 +5,7 @@ App( entry_point="expansion_settings_app", requires=["gui"], stack_size=1 * 1024, - order=80, + order=50, fap_libs=["assets"], fap_category="assets", ) diff --git a/applications/settings/input_settings_app/application.fam b/applications/settings/input_settings_app/application.fam index b15c0956a..ebec401d5 100644 --- a/applications/settings/input_settings_app/application.fam +++ b/applications/settings/input_settings_app/application.fam @@ -5,7 +5,7 @@ App( entry_point="input_settings_app", requires=["input"], stack_size=1 * 1024, - order=100, + order=60, fap_libs=["assets"], fap_category="assets", ) diff --git a/applications/settings/notification_settings/application.fam b/applications/settings/notification_settings/application.fam index ae242c966..cdcf98e0b 100644 --- a/applications/settings/notification_settings/application.fam +++ b/applications/settings/notification_settings/application.fam @@ -5,7 +5,7 @@ App( entry_point="notification_settings_app", requires=["notification"], stack_size=1 * 1024, - order=20, + order=70, fap_libs=["assets"], fap_category="assets", ) diff --git a/applications/settings/power_settings_app/application.fam b/applications/settings/power_settings_app/application.fam index 6f3589e1a..a2906d0b7 100644 --- a/applications/settings/power_settings_app/application.fam +++ b/applications/settings/power_settings_app/application.fam @@ -10,5 +10,5 @@ App( ], flags=["InsomniaSafe"], stack_size=1 * 1024, - order=40, + order=10, ) diff --git a/applications/settings/storage_settings/application.fam b/applications/settings/storage_settings/application.fam index 1ba0ccd44..41ff6d081 100644 --- a/applications/settings/storage_settings/application.fam +++ b/applications/settings/storage_settings/application.fam @@ -5,5 +5,5 @@ App( entry_point="storage_settings_app", requires=["storage"], stack_size=2 * 1024, - order=30, + order=20, ) diff --git a/applications/settings/system/application.fam b/applications/settings/system/application.fam index 69a8f1239..b72451bc3 100644 --- a/applications/settings/system/application.fam +++ b/applications/settings/system/application.fam @@ -5,5 +5,5 @@ App( entry_point="system_settings_app", requires=["gui", "locale"], stack_size=1 * 1024, - order=70, + order=30, )