diff --git a/CHANGELOG.md b/CHANGELOG.md index 6184d09f1..0bf9ac068 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,7 +24,7 @@ * NFC: Handle PPS request in ISO14443-4 layer (by @WillyJL) * NFC: Fixes to `READ_MULTI` and `GET_BLOCK_SECURITY` commands in ISO 15693-3 emulation (by @WillyJL & @aaronjamt) * Archive: Allow folders to be pinned (by @WillyJL) -* Apps: Build tag (**3feb2026**) - **Check out more Apps updates and fixes by following** [this link](https://github.com/xMasterX/all-the-plugins/commits/dev) +* Apps: Build tag (**10feb2026**) - **Check out more Apps updates and fixes by following** [this link](https://github.com/xMasterX/all-the-plugins/commits/dev) ## Other changes * Settings: Storage settings exit scenes properly if used via favourites (fixes issue #951) * LCD: Backlight settings bug fix (PR #962 | by @Dmitry422) diff --git a/applications/settings/power_settings_app/scenes/power_settings_scene_power_off.c b/applications/settings/power_settings_app/scenes/power_settings_scene_power_off.c index 6328a2381..073116ae5 100644 --- a/applications/settings/power_settings_app/scenes/power_settings_scene_power_off.c +++ b/applications/settings/power_settings_app/scenes/power_settings_scene_power_off.c @@ -27,7 +27,7 @@ void power_settings_scene_power_off_on_enter(void* context) { dialog, " I will be\nwaiting for\n you here...", 78, 14, AlignLeft, AlignTop); dialog_ex_set_icon(dialog, 14, 10, &I_dolph_cry_49x54); } - dialog_ex_set_left_button_text(dialog, "Cancel"); + dialog_ex_set_left_button_text(dialog, "Settings"); dialog_ex_set_right_button_text(dialog, "Power Off"); dialog_ex_set_result_callback(dialog, power_settings_scene_power_off_dialog_callback); dialog_ex_set_context(dialog, app); @@ -42,8 +42,7 @@ bool power_settings_scene_power_off_on_event(void* context, SceneManagerEvent ev if(event.type == SceneManagerEventTypeCustom) { if(event.event == DialogExResultLeft) { if(!scene_manager_previous_scene(app->scene_manager)) { - scene_manager_stop(app->scene_manager); - view_dispatcher_stop(app->view_dispatcher); + scene_manager_next_scene(app->scene_manager, PowerSettingsAppSceneStart); } } else if(event.event == DialogExResultRight) { power_off(app->power); diff --git a/applications/settings/storage_settings/scenes/storage_settings_scene_benchmark.c b/applications/settings/storage_settings/scenes/storage_settings_scene_benchmark.c index b4f52b879..a4a12caa1 100644 --- a/applications/settings/storage_settings/scenes/storage_settings_scene_benchmark.c +++ b/applications/settings/storage_settings/scenes/storage_settings_scene_benchmark.c @@ -157,7 +157,7 @@ bool storage_settings_scene_benchmark_on_event(void* context, SceneManagerEvent switch(event.event) { case DialogExResultCenter: if(app->from_favorites) { - storage_settings_scene_benchmark_on_exit(app); + scene_manager_stop(app->scene_manager); view_dispatcher_stop(app->view_dispatcher); return true; } else { @@ -169,7 +169,7 @@ bool storage_settings_scene_benchmark_on_event(void* context, SceneManagerEvent } else if(event.type == SceneManagerEventTypeBack) { if(sd_status == FSE_OK) { if(app->from_favorites) { - storage_settings_scene_benchmark_on_exit(app); + scene_manager_stop(app->scene_manager); view_dispatcher_stop(app->view_dispatcher); return true; } else { diff --git a/applications/settings/storage_settings/scenes/storage_settings_scene_benchmark_confirm.c b/applications/settings/storage_settings/scenes/storage_settings_scene_benchmark_confirm.c index 462aa4cee..db63ba631 100644 --- a/applications/settings/storage_settings/scenes/storage_settings_scene_benchmark_confirm.c +++ b/applications/settings/storage_settings/scenes/storage_settings_scene_benchmark_confirm.c @@ -49,7 +49,7 @@ bool storage_settings_scene_benchmark_confirm_on_event(void* context, SceneManag case DialogExResultLeft: case DialogExResultCenter: if(app->from_favorites) { - storage_settings_scene_benchmark_confirm_on_exit(app); + scene_manager_stop(app->scene_manager); view_dispatcher_stop(app->view_dispatcher); return true; } else { diff --git a/applications/settings/storage_settings/scenes/storage_settings_scene_factory_reset.c b/applications/settings/storage_settings/scenes/storage_settings_scene_factory_reset.c index 7fa925487..53afaf634 100644 --- a/applications/settings/storage_settings/scenes/storage_settings_scene_factory_reset.c +++ b/applications/settings/storage_settings/scenes/storage_settings_scene_factory_reset.c @@ -45,7 +45,7 @@ bool storage_settings_scene_factory_reset_on_event(void* context, SceneManagerEv case DialogExResultLeft: scene_manager_set_scene_state(app->scene_manager, StorageSettingsFactoryReset, 0); if(app->from_favorites) { - storage_settings_scene_factory_reset_on_exit(app); + scene_manager_stop(app->scene_manager); view_dispatcher_stop(app->view_dispatcher); return true; } else { diff --git a/applications/settings/storage_settings/scenes/storage_settings_scene_format_confirm.c b/applications/settings/storage_settings/scenes/storage_settings_scene_format_confirm.c index 2670f1495..550f9be10 100644 --- a/applications/settings/storage_settings/scenes/storage_settings_scene_format_confirm.c +++ b/applications/settings/storage_settings/scenes/storage_settings_scene_format_confirm.c @@ -42,7 +42,7 @@ bool storage_settings_scene_format_confirm_on_event(void* context, SceneManagerE case DialogExResultLeft: case DialogExResultCenter: if(app->from_favorites) { - storage_settings_scene_format_confirm_on_exit(app); + scene_manager_stop(app->scene_manager); view_dispatcher_stop(app->view_dispatcher); return true; } else { diff --git a/applications/settings/storage_settings/scenes/storage_settings_scene_formatting.c b/applications/settings/storage_settings/scenes/storage_settings_scene_formatting.c index 0ae18741e..85b1450c7 100644 --- a/applications/settings/storage_settings/scenes/storage_settings_scene_formatting.c +++ b/applications/settings/storage_settings/scenes/storage_settings_scene_formatting.c @@ -70,7 +70,7 @@ bool storage_settings_scene_formatting_on_event(void* context, SceneManagerEvent switch(event.event) { case DialogExResultLeft: if(app->from_favorites) { - storage_settings_scene_formatting_on_exit(app); + scene_manager_stop(app->scene_manager); view_dispatcher_stop(app->view_dispatcher); return true; } else { diff --git a/applications/settings/storage_settings/scenes/storage_settings_scene_internal_info.c b/applications/settings/storage_settings/scenes/storage_settings_scene_internal_info.c index e3e5ffe96..b7e332e47 100644 --- a/applications/settings/storage_settings/scenes/storage_settings_scene_internal_info.c +++ b/applications/settings/storage_settings/scenes/storage_settings_scene_internal_info.c @@ -57,7 +57,7 @@ bool storage_settings_scene_internal_info_on_event(void* context, SceneManagerEv switch(event.event) { case DialogExResultLeft: if(app->from_favorites) { - storage_settings_scene_internal_info_on_exit(app); + scene_manager_stop(app->scene_manager); view_dispatcher_stop(app->view_dispatcher); return true; } else { diff --git a/applications/settings/storage_settings/scenes/storage_settings_scene_sd_info.c b/applications/settings/storage_settings/scenes/storage_settings_scene_sd_info.c index d168894b4..d47d43447 100644 --- a/applications/settings/storage_settings/scenes/storage_settings_scene_sd_info.c +++ b/applications/settings/storage_settings/scenes/storage_settings_scene_sd_info.c @@ -79,7 +79,7 @@ bool storage_settings_scene_sd_info_on_event(void* context, SceneManagerEvent ev case DialogExResultLeft: case DialogExResultCenter: if(app->from_favorites) { - storage_settings_scene_sd_info_on_exit(app); + scene_manager_stop(app->scene_manager); view_dispatcher_stop(app->view_dispatcher); return true; } else { diff --git a/applications/settings/storage_settings/scenes/storage_settings_scene_unmount_confirm.c b/applications/settings/storage_settings/scenes/storage_settings_scene_unmount_confirm.c index 65049c33f..e9acb7b4b 100644 --- a/applications/settings/storage_settings/scenes/storage_settings_scene_unmount_confirm.c +++ b/applications/settings/storage_settings/scenes/storage_settings_scene_unmount_confirm.c @@ -47,7 +47,7 @@ bool storage_settings_scene_unmount_confirm_on_event(void* context, SceneManager case DialogExResultCenter: case DialogExResultLeft: if(app->from_favorites) { - storage_settings_scene_unmount_confirm_on_exit(app); + scene_manager_stop(app->scene_manager); view_dispatcher_stop(app->view_dispatcher); return true; } else { diff --git a/applications/settings/storage_settings/scenes/storage_settings_scene_unmounted.c b/applications/settings/storage_settings/scenes/storage_settings_scene_unmounted.c index 5b64adb63..6a3d98604 100644 --- a/applications/settings/storage_settings/scenes/storage_settings_scene_unmounted.c +++ b/applications/settings/storage_settings/scenes/storage_settings_scene_unmounted.c @@ -58,7 +58,7 @@ bool storage_settings_scene_unmounted_on_event(void* context, SceneManagerEvent switch(event.event) { case DialogExResultCenter: if(app->from_favorites) { - storage_settings_scene_unmounted_on_exit(app); + scene_manager_stop(app->scene_manager); view_dispatcher_stop(app->view_dispatcher); return true; } else {