Removes error screen and fixes rename

nfc_playlist.c

@@ -77,7 +77,6 @@ static NfcPlaylist* nfc_playlist_alloc() {
    view_dispatcher_add_view(nfc_playlist->view_dispatcher, NfcPlaylistView_Popup, popup_get_view(nfc_playlist->popup));
    view_dispatcher_add_view(nfc_playlist->view_dispatcher, NfcPlaylistView_FileSelect, file_browser_get_view(nfc_playlist->file_browser));
    view_dispatcher_add_view(nfc_playlist->view_dispatcher, NfcPlaylistView_FileEdit, submenu_get_view(nfc_playlist->submenu));
-   view_dispatcher_add_view(nfc_playlist->view_dispatcher, NfcPlaylistView_FileExistsError, popup_get_view(nfc_playlist->popup));
    view_dispatcher_add_view(nfc_playlist->view_dispatcher, NfcPlaylistView_TextInput, text_input_get_view(nfc_playlist->text_input));
    return nfc_playlist;
 }
@@ -90,7 +89,6 @@ static void nfc_playlist_free(NfcPlaylist* nfc_playlist) {
    view_dispatcher_remove_view(nfc_playlist->view_dispatcher, NfcPlaylistView_Popup);
    view_dispatcher_remove_view(nfc_playlist->view_dispatcher, NfcPlaylistView_FileSelect);
    view_dispatcher_remove_view(nfc_playlist->view_dispatcher, NfcPlaylistView_FileEdit);
-   view_dispatcher_remove_view(nfc_playlist->view_dispatcher, NfcPlaylistView_FileExistsError);
    view_dispatcher_remove_view(nfc_playlist->view_dispatcher, NfcPlaylistView_TextInput);
    view_dispatcher_free(nfc_playlist->view_dispatcher);
    variable_item_list_free(nfc_playlist->variable_item_list);

nfc_playlist.h

@@ -20,7 +20,6 @@ typedef enum {
    NfcPlaylistView_Popup,
    NfcPlaylistView_FileSelect,
    NfcPlaylistView_FileEdit,
-   NfcPlaylistView_FileExistsError,
    NfcPlaylistView_TextInput
 } NfcPlayScenesView;
 
@@ -30,7 +29,6 @@ typedef enum {
    NfcPlaylistScene_EmulatingPopup,
    NfcPlaylistScene_FileSelect,
    NfcPlaylistScene_FileEdit,
-   NfcPlaylistScene_FileExistsError,
    NfcPlaylistScene_TextInput,
    NfcPlaylistScene_count
 } NfcPlaylistScene;

nfc_playlist_i.h

@@ -4,5 +4,4 @@
 #include "scences/emulation.h"
 #include "scences/file_select.h"
 #include "scences/file_edit.h"
-#include "scences/file_exists_error.h"
 #include "scences/text_input.h"

scences/file_edit.c

@@ -52,7 +52,7 @@ void nfc_playlist_file_edit_scene_on_enter(void* context) {
       NfcPlaylistMenuSelection_RenamePlaylist,
       nfc_playlist_file_edit_menu_callback,
       nfc_playlist,
-      true,
+      !nfc_playlist->settings.file_selected_check,
       "No\nplaylist\nselected");
 
    view_dispatcher_switch_to_view(nfc_playlist->view_dispatcher, NfcPlaylistView_FileEdit);

scences/file_exists_error.c

@@ -1,25 +0,0 @@
-#include "nfc_playlist.h"
-#include "scences/file_exists_error.h"
-
-void nfc_playlist_file_exists_error_scene_on_enter(void* context) {
-   NfcPlaylist* nfc_playlist = context;
-   popup_reset(nfc_playlist->popup);
-   popup_set_header(nfc_playlist->popup, "ERROR File Already Exists", 64, 10, AlignCenter, AlignTop);
-   popup_set_text(nfc_playlist->popup, "The file already exists, Press back to try again", 64, 50, AlignCenter, AlignTop);
-   popup_set_context(nfc_playlist->popup, nfc_playlist);
-   view_dispatcher_switch_to_view(nfc_playlist->view_dispatcher, NfcPlaylistView_FileExistsError);
-   start_blink(nfc_playlist, NfcPlaylistLedState_Error);
-}
-
-bool nfc_playlist_file_exists_error_scene_on_event(void* context, SceneManagerEvent event) {
-   UNUSED(event);
-   UNUSED(context);
-   return false;
-}
-
-void nfc_playlist_file_exists_error_scene_on_exit(void* context) {
-   NfcPlaylist* nfc_playlist = context;
-   stop_blink(nfc_playlist);
-   popup_reset(nfc_playlist->popup);
-   scene_manager_previous_scene(nfc_playlist->scene_manager);
-}

scences/file_exists_error.h

@@ -1,11 +0,0 @@
-#pragma once
-#include <furi.h>
-#include <gui/gui.h>
-#include <gui/modules/popup.h>
-#include <gui/view_dispatcher.h>
-#include <gui/scene_manager.h>
-#include <lib/led/nfc_playlist_led.h>
-
-void nfc_playlist_file_exists_error_scene_on_enter(void* context);
-bool nfc_playlist_file_exists_error_scene_on_event(void* context, SceneManagerEvent event);
-void nfc_playlist_file_exists_error_scene_on_exit(void* context);

scences/text_input.c

@@ -21,8 +21,6 @@ void nfc_playlist_text_input_menu_callback(void* context) {
    if (!storage_file_exists(storage, new_file_name)) {
       storage_common_rename_safe(storage, furi_string_get_cstr(nfc_playlist->settings.file_path), new_file_name);
       nfc_playlist->settings.file_path = furi_string_alloc_set_str(new_file_name);
-   } else {
-      scene_manager_next_scene(nfc_playlist->scene_manager, NfcPlaylistScene_FileExistsError);
    }
 
    free(new_file_name);