final tweaks

RogueMaster · Aug 22, 2024 · dd6c8ca · dd6c8ca
1 parent 0227f47
commit dd6c8ca
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 42 deletions.
diff --git a/nfc_playlist.c b/nfc_playlist.c
@@ -80,11 +80,11 @@ static void nfc_playlist_free(NfcPlaylist* nfc_playlist) {
 }
 
 void nfc_playlist_set_log_level() {
-#ifdef FURI_DEBUG
-   furi_log_set_level(FuriLogLevelTrace);
-#else
-   furi_log_set_level(FuriLogLevelInfo);
-#endif
+   #ifdef FURI_DEBUG
+      furi_log_set_level(FuriLogLevelTrace);
+   #else
+      furi_log_set_level(FuriLogLevelInfo);
+   #endif
 }
 
 int32_t nfc_playlist_main(void* p) {

diff --git a/scenes/nfc_playlist_scene_main_menu.c b/scenes/nfc_playlist_scene_main_menu.c
@@ -1,10 +1,10 @@
 #include "../nfc_playlist.h"
 
 typedef enum {
-   NfcPlaylistMenuSelection_Start,
-   NfcPlaylistMenuSelection_PlaylistSelect,
-   NfcPlaylistMenuSelection_FileEdit,
-   NfcPlaylistMenuSelection_Settings
+   NfcPlaylistMainMenu_Start,
+   NfcPlaylistMainMenu_PlaylistSelect,
+   NfcPlaylistMainMenu_FileEdit,
+   NfcPlaylistMainMenu_Settings
 } NfcPlaylistMainMenuMenuSelection;
 
 void nfc_playlist_main_menu_menu_callback(void* context, uint32_t index) {
@@ -22,7 +22,7 @@ void nfc_playlist_main_menu_scene_on_enter(void* context) {
    submenu_add_lockable_item(
       nfc_playlist->submenu,
       "Start",
-      NfcPlaylistMenuSelection_Start,
+      NfcPlaylistMainMenu_Start,
       nfc_playlist_main_menu_menu_callback,
       nfc_playlist,
       furi_string_empty(nfc_playlist->settings.playlist_path),
@@ -31,21 +31,21 @@ void nfc_playlist_main_menu_scene_on_enter(void* context) {
    submenu_add_item(
       nfc_playlist->submenu,
       "Select playlist",
-      NfcPlaylistMenuSelection_PlaylistSelect,
+      NfcPlaylistMainMenu_PlaylistSelect,
       nfc_playlist_main_menu_menu_callback,
       nfc_playlist);
 
    submenu_add_item(
       nfc_playlist->submenu,
       "Edit playlist",
-      NfcPlaylistMenuSelection_FileEdit,
+      NfcPlaylistMainMenu_FileEdit,
       nfc_playlist_main_menu_menu_callback,
       nfc_playlist);
 
    submenu_add_item(
       nfc_playlist->submenu,
       "Settings",
-      NfcPlaylistMenuSelection_Settings,
+      NfcPlaylistMainMenu_Settings,
       nfc_playlist_main_menu_menu_callback,
       nfc_playlist);
 
@@ -57,19 +57,19 @@ bool nfc_playlist_main_menu_scene_on_event(void* context, SceneManagerEvent even
    bool consumed = false;
    if (event.type == SceneManagerEventTypeCustom) {
       switch(event.event) {
-         case NfcPlaylistMenuSelection_Start:
+         case NfcPlaylistMainMenu_Start:
             scene_manager_next_scene(nfc_playlist->scene_manager, NfcPlaylistScene_Emulation);
             consumed = true;
             break;
-         case NfcPlaylistMenuSelection_PlaylistSelect:
+         case NfcPlaylistMainMenu_PlaylistSelect:
             scene_manager_next_scene(nfc_playlist->scene_manager, NfcPlaylistScene_PlaylistSelect);
             consumed = true;
             break;
-         case NfcPlaylistMenuSelection_FileEdit:
+         case NfcPlaylistMainMenu_FileEdit:
             scene_manager_next_scene(nfc_playlist->scene_manager, NfcPlaylistScene_PlaylistEdit);
             consumed = true;
             break;
-         case NfcPlaylistMenuSelection_Settings:
+         case NfcPlaylistMainMenu_Settings:
             scene_manager_next_scene(nfc_playlist->scene_manager, NfcPlaylistScene_Settings);
             consumed = true;
             break;

diff --git a/scenes/nfc_playlist_scene_nfc_move_item.c b/scenes/nfc_playlist_scene_nfc_move_item.c
@@ -56,7 +56,6 @@ void nfc_playlist_nfc_move_item_scene_on_enter(void* context) {
       nfc_playlist->settings.playlist_length,
       nfc_playlist_nfc_move_item_options_change_callback,
       nfc_playlist);
-
    variable_item_set_current_value_index(target_selector, 0);
    variable_item_set_current_value_text(target_selector, "1");
 
@@ -66,7 +65,6 @@ void nfc_playlist_nfc_move_item_scene_on_enter(void* context) {
       nfc_playlist->settings.playlist_length,
       nfc_playlist_nfc_move_item_options_change_callback,
       nfc_playlist);
-
    variable_item_set_current_value_index(destination_selector, 0);
    variable_item_set_current_value_text(destination_selector, "1");
 
@@ -98,7 +96,6 @@ bool nfc_playlist_nfc_move_item_scene_on_event(void* context, SceneManagerEvent
                   if(counter == selected_target) {
                      furi_string_trim(line);
                      furi_string_cat_printf(tmp_target_str, "%s", furi_string_get_cstr(line));
-                     furi_string_reset(line);
                      stream_rewind(stream);
                      counter = 0;
                      break;

diff --git a/scenes/nfc_playlist_scene_playlist_edit.c b/scenes/nfc_playlist_scene_playlist_edit.c
@@ -1,14 +1,14 @@
 #include "../nfc_playlist.h"
 
 typedef enum {
-   NfcPlaylistFileEdit_CreatePlaylist,
-   NfcPlaylistFileEdit_DeletePlaylist,
-   NfcPlaylistFileEdit_RenamePlaylist,
-   NfcPlaylistFileEdit_AddNfcItem,
-   NfcPlaylistFileEdit_RemoveNfcItem,
-   NfcPlaylistFileEdit_MoveNfcItem,
-   NfcPlaylistFileEdit_ViewPlaylistContent
-} NfcPlaylistFileEditMenuSelection;
+   NfcPlaylistPlaylistEdit_CreatePlaylist,
+   NfcPlaylistPlaylistEdit_DeletePlaylist,
+   NfcPlaylistPlaylistEdit_RenamePlaylist,
+   NfcPlaylistPlaylistEdit_AddNfcItem,
+   NfcPlaylistPlaylistEdit_RemoveNfcItem,
+   NfcPlaylistPlaylistEdit_MoveNfcItem,
+   NfcPlaylistPlaylistEdit_ViewPlaylistContent
+} NfcPlaylistPlaylistEditMenuSelection;
 
 void nfc_playlist_playlist_edit_menu_callback(void* context, uint32_t index) {
    NfcPlaylist* nfc_playlist = context;
@@ -25,14 +25,14 @@ void nfc_playlist_playlist_edit_scene_on_enter(void* context) {
    submenu_add_item(
       nfc_playlist->submenu,
       "Create Playlist",
-      NfcPlaylistFileEdit_CreatePlaylist,
+      NfcPlaylistPlaylistEdit_CreatePlaylist,
       nfc_playlist_playlist_edit_menu_callback,
       nfc_playlist);
 
    submenu_add_lockable_item(
       nfc_playlist->submenu,
       "Delete Playlist",
-      NfcPlaylistFileEdit_DeletePlaylist,
+      NfcPlaylistPlaylistEdit_DeletePlaylist,
       nfc_playlist_playlist_edit_menu_callback,
       nfc_playlist,
       playlist_path_empty,
@@ -41,7 +41,7 @@ void nfc_playlist_playlist_edit_scene_on_enter(void* context) {
    submenu_add_lockable_item(
       nfc_playlist->submenu,
       "Rename Playlist",
-      NfcPlaylistFileEdit_RenamePlaylist,
+      NfcPlaylistPlaylistEdit_RenamePlaylist,
       nfc_playlist_playlist_edit_menu_callback,
       nfc_playlist,
       playlist_path_empty,
@@ -50,7 +50,7 @@ void nfc_playlist_playlist_edit_scene_on_enter(void* context) {
    submenu_add_lockable_item(
       nfc_playlist->submenu,
       "Add NFC Item",
-      NfcPlaylistFileEdit_AddNfcItem,
+      NfcPlaylistPlaylistEdit_AddNfcItem,
       nfc_playlist_playlist_edit_menu_callback,
       nfc_playlist,
       playlist_path_empty,
@@ -59,7 +59,7 @@ void nfc_playlist_playlist_edit_scene_on_enter(void* context) {
    submenu_add_lockable_item(
       nfc_playlist->submenu,
       "Remove NFC Item",
-      NfcPlaylistFileEdit_RemoveNfcItem,
+      NfcPlaylistPlaylistEdit_RemoveNfcItem,
       nfc_playlist_playlist_edit_menu_callback,
       nfc_playlist,
       playlist_path_empty,
@@ -68,7 +68,7 @@ void nfc_playlist_playlist_edit_scene_on_enter(void* context) {
    submenu_add_lockable_item(
       nfc_playlist->submenu,
       "Move NFC Item",
-      NfcPlaylistFileEdit_MoveNfcItem,
+      NfcPlaylistPlaylistEdit_MoveNfcItem,
       nfc_playlist_playlist_edit_menu_callback,
       nfc_playlist,
       playlist_path_empty,
@@ -77,7 +77,7 @@ void nfc_playlist_playlist_edit_scene_on_enter(void* context) {
    submenu_add_lockable_item(
       nfc_playlist->submenu,
       "View Playlist Content",
-      NfcPlaylistFileEdit_ViewPlaylistContent,
+      NfcPlaylistPlaylistEdit_ViewPlaylistContent,
       nfc_playlist_playlist_edit_menu_callback,
       nfc_playlist,
       playlist_path_empty,
@@ -91,31 +91,31 @@ bool nfc_playlist_playlist_edit_scene_on_event(void* context, SceneManagerEvent
    bool consumed = false;
    if(event.type == SceneManagerEventTypeCustom) {
       switch(event.event) {
-         case NfcPlaylistFileEdit_CreatePlaylist:
+         case NfcPlaylistPlaylistEdit_CreatePlaylist:
             scene_manager_next_scene(nfc_playlist->scene_manager, NfcPlaylistScene_NameNewPlaylist);
             consumed = true;
             break;
-         case NfcPlaylistFileEdit_DeletePlaylist:
+         case NfcPlaylistPlaylistEdit_DeletePlaylist:
             scene_manager_next_scene(nfc_playlist->scene_manager, NfcPlaylistScene_ConfirmDelete);
             consumed = true;
             break;
-         case NfcPlaylistFileEdit_RenamePlaylist:
+         case NfcPlaylistPlaylistEdit_RenamePlaylist:
             scene_manager_next_scene(nfc_playlist->scene_manager, NfcPlaylistScene_PlaylistRename);
             consumed = true;
             break;
-         case NfcPlaylistFileEdit_AddNfcItem:
+         case NfcPlaylistPlaylistEdit_AddNfcItem:
             scene_manager_next_scene(nfc_playlist->scene_manager, NfcPlaylistScene_NfcAdd);
             consumed = true;
             break;
-         case NfcPlaylistFileEdit_RemoveNfcItem:
+         case NfcPlaylistPlaylistEdit_RemoveNfcItem:
             scene_manager_next_scene(nfc_playlist->scene_manager, NfcPlaylistScene_NfcRemove);
             consumed = true;
             break;
-         case NfcPlaylistFileEdit_MoveNfcItem:
+         case NfcPlaylistPlaylistEdit_MoveNfcItem:
             scene_manager_next_scene(nfc_playlist->scene_manager, NfcPlaylistScene_NfcMoveItem);
             consumed = true;
             break;
-         case NfcPlaylistFileEdit_ViewPlaylistContent:
+         case NfcPlaylistPlaylistEdit_ViewPlaylistContent:
             scene_manager_next_scene(nfc_playlist->scene_manager, NfcPlaylistScene_ViewPlaylistContent);
             consumed = true;
             break;