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

quen0n · May 17, 2024 · 603a86d · 603a86d
1 parent 63403bb
commit 603a86d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/applications/settings/desktop_settings/scenes/desktop_settings_scene_pin_disable.c b/applications/settings/desktop_settings/scenes/desktop_settings_scene_pin_disable.c
@@ -25,7 +25,7 @@ void desktop_settings_scene_pin_disable_on_enter(void* context) {
     popup_set_context(app->popup, app);
     popup_set_callback(app->popup, pin_disable_back_callback);
     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_enable_timeout(app->popup);
     view_dispatcher_switch_to_view(app->view_dispatcher, DesktopSettingsAppViewIdPopup);

diff --git a/applications/settings/desktop_settings/scenes/desktop_settings_scene_pin_menu.c b/applications/settings/desktop_settings/scenes/desktop_settings_scene_pin_menu.c
@@ -37,7 +37,7 @@ void desktop_settings_scene_pin_menu_on_enter(void* context) {
 
         submenu_add_item(
             submenu,
-            "Disable",
+            "Remove PIN",
             SCENE_EVENT_DISABLE_PIN,
             desktop_settings_scene_pin_menu_submenu_callback,
             app);

diff --git a/applications/settings/storage_settings/scenes/storage_settings_scene_formatting.c b/applications/settings/storage_settings/scenes/storage_settings_scene_formatting.c
@@ -51,15 +51,15 @@ void storage_settings_scene_formatting_on_enter(void* context) {
         dialog_ex_set_text(
             dialog_ex, storage_error_get_desc(error), 64, 32, AlignCenter, AlignCenter);
     } else {
-        dialog_ex_set_icon(dialog_ex, 83, 22, &I_WarningDolphinFlip_45x42);
-        dialog_ex_set_header(dialog_ex, "Format\ncomplete!", 14, 15, AlignLeft, AlignTop);
+        dialog_ex_set_icon(dialog_ex, 48, 6, &I_DolphinDone_80x58);
+        dialog_ex_set_header(dialog_ex, "Formatted", 5, 10, AlignLeft, AlignTop);
         NotificationApp* notification = furi_record_open(RECORD_NOTIFICATION);
         notification_message(notification, &sequence_single_vibro);
         notification_message(notification, &sequence_set_green_255);
         notification_message(notification, &sequence_success);
         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) {
@@ -68,7 +68,7 @@ bool storage_settings_scene_formatting_on_event(void* context, SceneManagerEvent
 
     if(event.type == SceneManagerEventTypeCustom) {
         switch(event.event) {
-        case DialogExResultCenter:
+        case DialogExResultLeft:
             consumed = scene_manager_search_and_switch_to_previous_scene(
                 app->scene_manager, StorageSettingsStart);
             break;