Mirrors/unleashed-firmware
2
0
Fork 0
mirror of https://github.com/DarkFlippers/unleashed-firmware synced 2024-11-14 00:37:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

[FL-3797] Settings refactor fixes (#3654)

Browse source
This commit is contained in:
Astra 2024-05-17 20:52:42 +09:00 committed by GitHub
parent 63403bbae2
commit 603a86dbe6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
applications/settings/desktop_settings/scenes/desktop_settings_scene_pin_disable.c
View file

@ -25,7 +25,7 @@ void desktop_settings_scene_pin_disable_on_enter(void* context) {
popup_set_context(app->popup, app); popup_set_context(app->popup, app);
popup_set_callback(app->popup, pin_disable_back_callback); popup_set_callback(app->popup, pin_disable_back_callback);
popup_set_icon(app->popup, 0, 2, &I_DolphinMafia_119x62); popup_set_icon(app->popup, 0, 2, &I_DolphinMafia_119x62);
popup_set_header(app->popup, "PIN\nDeleted!", 100, 0, AlignCenter, AlignTop); popup_set_header(app->popup, "Removed", 100, 10, AlignCenter, AlignTop);
popup_set_timeout(app->popup, 1500); popup_set_timeout(app->popup, 1500);
popup_enable_timeout(app->popup); popup_enable_timeout(app->popup);
view_dispatcher_switch_to_view(app->view_dispatcher, DesktopSettingsAppViewIdPopup); view_dispatcher_switch_to_view(app->view_dispatcher, DesktopSettingsAppViewIdPopup);

2
applications/settings/desktop_settings/scenes/desktop_settings_scene_pin_menu.c
View file

@ -37,7 +37,7 @@ void desktop_settings_scene_pin_menu_on_enter(void* context) {
submenu_add_item( submenu_add_item(
submenu, submenu,
"Disable", "Remove PIN",
SCENE_EVENT_DISABLE_PIN, SCENE_EVENT_DISABLE_PIN,
desktop_settings_scene_pin_menu_submenu_callback, desktop_settings_scene_pin_menu_submenu_callback,
app); app);

8
applications/settings/storage_settings/scenes/storage_settings_scene_formatting.c
View file

@ -51,15 +51,15 @@ void storage_settings_scene_formatting_on_enter(void* context) {
dialog_ex_set_text( dialog_ex_set_text(
dialog_ex, storage_error_get_desc(error), 64, 32, AlignCenter, AlignCenter); dialog_ex, storage_error_get_desc(error), 64, 32, AlignCenter, AlignCenter);
} else { } else {
dialog_ex_set_icon(dialog_ex, 83, 22, &I_WarningDolphinFlip_45x42); dialog_ex_set_icon(dialog_ex, 48, 6, &I_DolphinDone_80x58);
dialog_ex_set_header(dialog_ex, "Format\ncomplete!", 14, 15, AlignLeft, AlignTop); dialog_ex_set_header(dialog_ex, "Formatted", 5, 10, AlignLeft, AlignTop);
NotificationApp* notification = furi_record_open(RECORD_NOTIFICATION); NotificationApp* notification = furi_record_open(RECORD_NOTIFICATION);
notification_message(notification, &sequence_single_vibro); notification_message(notification, &sequence_single_vibro);
notification_message(notification, &sequence_set_green_255); notification_message(notification, &sequence_set_green_255);
notification_message(notification, &sequence_success); notification_message(notification, &sequence_success);
furi_record_close(RECORD_NOTIFICATION); furi_record_close(RECORD_NOTIFICATION);
} }
dialog_ex_set_center_button_text(dialog_ex, "OK"); dialog_ex_set_left_button_text(dialog_ex, "Finish");
} }
bool storage_settings_scene_formatting_on_event(void* context, SceneManagerEvent event) { bool storage_settings_scene_formatting_on_event(void* context, SceneManagerEvent event) {
@ -68,7 +68,7 @@ bool storage_settings_scene_formatting_on_event(void* context, SceneManagerEvent
if(event.type == SceneManagerEventTypeCustom) { if(event.type == SceneManagerEventTypeCustom) {
switch(event.event) { switch(event.event) {
case DialogExResultCenter: case DialogExResultLeft:
consumed = scene_manager_search_and_switch_to_previous_scene( consumed = scene_manager_search_and_switch_to_previous_scene(
app->scene_manager, StorageSettingsStart); app->scene_manager, StorageSettingsStart);
break; break;