Skip to content

Commit cd66660

Browse files
acegoal07acegoal07
committed
Further cut backs
1 parent 8ad052b commit cd66660

13 files changed

+34
-47
lines changed

‎nfc_playlist.c

+20-20
Original file line numberDiff line numberDiff line change
@@ -39,16 +39,16 @@ static NfcPlaylist* nfc_playlist_alloc() {
3939
view_dispatcher_set_event_callback_context(nfc_playlist->view_dispatcher, nfc_playlist);
4040
view_dispatcher_set_custom_event_callback(nfc_playlist->view_dispatcher, nfc_playlist_custom_callback);
4141
view_dispatcher_set_navigation_event_callback(nfc_playlist->view_dispatcher, nfc_playlist_back_event_callback);
42-
view_dispatcher_add_view(nfc_playlist->view_dispatcher, NfcPlaylistView_Menu, submenu_get_view(nfc_playlist->submenu));
43-
view_dispatcher_add_view(nfc_playlist->view_dispatcher, NfcPlaylistView_Settings, variable_item_list_get_view(nfc_playlist->variable_item_list));
44-
view_dispatcher_add_view(nfc_playlist->view_dispatcher, NfcPlaylistView_Popup, popup_get_view(nfc_playlist->popup));
45-
view_dispatcher_add_view(nfc_playlist->view_dispatcher, NfcPlaylistView_PlaylistSelect, file_browser_get_view(nfc_playlist->playlist_file_browser));
46-
view_dispatcher_add_view(nfc_playlist->view_dispatcher, NfcPlaylistView_FileEdit, submenu_get_view(nfc_playlist->submenu));
47-
view_dispatcher_add_view(nfc_playlist->view_dispatcher, NfcPlaylistView_FileRename, text_input_get_view(nfc_playlist->text_input));
48-
view_dispatcher_add_view(nfc_playlist->view_dispatcher, NfcPlaylistView_ConfirmDelete, widget_get_view(nfc_playlist->widget));
49-
view_dispatcher_add_view(nfc_playlist->view_dispatcher, NfcPlaylistView_ViewPlaylistContent, widget_get_view(nfc_playlist->widget));
50-
view_dispatcher_add_view(nfc_playlist->view_dispatcher, NfcPlaylistView_NfcSelect, file_browser_get_view(nfc_playlist->nfc_file_browser));
51-
view_dispatcher_add_view(nfc_playlist->view_dispatcher, NfcPlaylistView_NameNewFile, text_input_get_view(nfc_playlist->text_input));
42+
view_dispatcher_add_view(nfc_playlist->view_dispatcher, NfcPlaylistScene_MainMenu, submenu_get_view(nfc_playlist->submenu));
43+
view_dispatcher_add_view(nfc_playlist->view_dispatcher, NfcPlaylistScene_Settings, variable_item_list_get_view(nfc_playlist->variable_item_list));
44+
view_dispatcher_add_view(nfc_playlist->view_dispatcher, NfcPlaylistScene_Emulation, popup_get_view(nfc_playlist->popup));
45+
view_dispatcher_add_view(nfc_playlist->view_dispatcher, NfcPlaylistScene_PlaylistSelect, file_browser_get_view(nfc_playlist->playlist_file_browser));
46+
view_dispatcher_add_view(nfc_playlist->view_dispatcher, NfcPlaylistScene_FileEdit, submenu_get_view(nfc_playlist->submenu));
47+
view_dispatcher_add_view(nfc_playlist->view_dispatcher, NfcPlaylistScene_FileRename, text_input_get_view(nfc_playlist->text_input));
48+
view_dispatcher_add_view(nfc_playlist->view_dispatcher, NfcPlaylistScene_ConfirmDelete, widget_get_view(nfc_playlist->widget));
49+
view_dispatcher_add_view(nfc_playlist->view_dispatcher, NfcPlaylistScene_ViewPlaylistContent, widget_get_view(nfc_playlist->widget));
50+
view_dispatcher_add_view(nfc_playlist->view_dispatcher, NfcPlaylistScene_NfcSelect, file_browser_get_view(nfc_playlist->nfc_file_browser));
51+
view_dispatcher_add_view(nfc_playlist->view_dispatcher, NfcPlaylistScene_NameNewFile, text_input_get_view(nfc_playlist->text_input));
5252

5353
Storage* storage = furi_record_open(RECORD_STORAGE);
5454
if (!storage_common_exists(storage, PLAYLIST_DIR)) {
@@ -62,16 +62,16 @@ static NfcPlaylist* nfc_playlist_alloc() {
6262
static void nfc_playlist_free(NfcPlaylist* nfc_playlist) {
6363
furi_assert(nfc_playlist);
6464

65-
view_dispatcher_remove_view(nfc_playlist->view_dispatcher, NfcPlaylistView_Menu);
66-
view_dispatcher_remove_view(nfc_playlist->view_dispatcher, NfcPlaylistView_Settings);
67-
view_dispatcher_remove_view(nfc_playlist->view_dispatcher, NfcPlaylistView_Popup);
68-
view_dispatcher_remove_view(nfc_playlist->view_dispatcher, NfcPlaylistView_PlaylistSelect);
69-
view_dispatcher_remove_view(nfc_playlist->view_dispatcher, NfcPlaylistView_FileEdit);
70-
view_dispatcher_remove_view(nfc_playlist->view_dispatcher, NfcPlaylistView_FileRename);
71-
view_dispatcher_remove_view(nfc_playlist->view_dispatcher, NfcPlaylistView_ConfirmDelete);
72-
view_dispatcher_remove_view(nfc_playlist->view_dispatcher, NfcPlaylistView_ViewPlaylistContent);
73-
view_dispatcher_remove_view(nfc_playlist->view_dispatcher, NfcPlaylistView_NfcSelect);
74-
view_dispatcher_remove_view(nfc_playlist->view_dispatcher, NfcPlaylistView_NameNewFile);
65+
view_dispatcher_remove_view(nfc_playlist->view_dispatcher, NfcPlaylistScene_MainMenu);
66+
view_dispatcher_remove_view(nfc_playlist->view_dispatcher, NfcPlaylistScene_Settings);
67+
view_dispatcher_remove_view(nfc_playlist->view_dispatcher, NfcPlaylistScene_Emulation);
68+
view_dispatcher_remove_view(nfc_playlist->view_dispatcher, NfcPlaylistScene_PlaylistSelect);
69+
view_dispatcher_remove_view(nfc_playlist->view_dispatcher, NfcPlaylistScene_FileEdit);
70+
view_dispatcher_remove_view(nfc_playlist->view_dispatcher, NfcPlaylistScene_FileRename);
71+
view_dispatcher_remove_view(nfc_playlist->view_dispatcher, NfcPlaylistScene_ConfirmDelete);
72+
view_dispatcher_remove_view(nfc_playlist->view_dispatcher, NfcPlaylistScene_ViewPlaylistContent);
73+
view_dispatcher_remove_view(nfc_playlist->view_dispatcher, NfcPlaylistScene_NfcSelect);
74+
view_dispatcher_remove_view(nfc_playlist->view_dispatcher, NfcPlaylistScene_NameNewFile);
7575

7676
scene_manager_free(nfc_playlist->scene_manager);
7777
view_dispatcher_free(nfc_playlist->view_dispatcher);

‎nfc_playlist.h

-13
Original file line numberDiff line numberDiff line change
@@ -28,19 +28,6 @@
2828

2929
#include "scenes/nfc_playlist_scene.h"
3030

31-
typedef enum {
32-
NfcPlaylistView_Menu,
33-
NfcPlaylistView_Settings,
34-
NfcPlaylistView_Popup,
35-
NfcPlaylistView_PlaylistSelect,
36-
NfcPlaylistView_FileEdit,
37-
NfcPlaylistView_FileRename,
38-
NfcPlaylistView_ConfirmDelete,
39-
NfcPlaylistView_ViewPlaylistContent,
40-
NfcPlaylistView_NfcSelect,
41-
NfcPlaylistView_NameNewFile
42-
} NfcPlayScenesView;
43-
4431
typedef struct {
4532
FuriString* file_path;
4633
bool playlist_selected;

‎scenes/nfc_playlist_scene_config.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ADD_SCENE(nfc_playlist, confirm_delete, ConfirmDelete)
2-
ADD_SCENE(nfc_playlist, emulation, EmulatingPopup)
2+
ADD_SCENE(nfc_playlist, emulation, Emulation)
33
ADD_SCENE(nfc_playlist, file_edit, FileEdit)
44
ADD_SCENE(nfc_playlist, file_rename, FileRename)
55
ADD_SCENE(nfc_playlist, main_menu, MainMenu)

‎scenes/nfc_playlist_scene_confirm_delete.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ void nfc_playlist_confirm_delete_scene_on_enter(void* context) {
2121

2222
furi_string_free(temp_str);
2323

24-
view_dispatcher_switch_to_view(nfc_playlist->view_dispatcher, NfcPlaylistView_ConfirmDelete);
24+
view_dispatcher_switch_to_view(nfc_playlist->view_dispatcher, NfcPlaylistScene_ConfirmDelete);
2525
}
2626

2727
bool nfc_playlist_confirm_delete_scene_on_event(void* context, SceneManagerEvent event) {

‎scenes/nfc_playlist_scene_emulation.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ int32_t nfc_playlist_emulation_task(void* context) {
1616

1717
popup_reset(nfc_playlist->popup);
1818
popup_set_context(nfc_playlist->popup, nfc_playlist);
19-
view_dispatcher_switch_to_view(nfc_playlist->view_dispatcher, NfcPlaylistView_Popup);
19+
view_dispatcher_switch_to_view(nfc_playlist->view_dispatcher, NfcPlaylistScene_Emulation);
2020

2121
if (file_stream_open(stream, furi_string_get_cstr(nfc_playlist->settings.file_path), FSAM_READ, FSOM_OPEN_EXISTING)) {
2222
EmulationState = NfcPlaylistEmulationState_Emulating;

‎scenes/nfc_playlist_scene_file_edit.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ void nfc_playlist_file_edit_scene_on_enter(void* context) {
6161
furi_string_empty(nfc_playlist->settings.file_path),
6262
"No\nplaylist\nselected");
6363

64-
view_dispatcher_switch_to_view(nfc_playlist->view_dispatcher, NfcPlaylistView_FileEdit);
64+
view_dispatcher_switch_to_view(nfc_playlist->view_dispatcher, NfcPlaylistScene_FileEdit);
6565
}
6666

6767
bool nfc_playlist_file_edit_scene_on_event(void* context, SceneManagerEvent event) {

‎scenes/nfc_playlist_scene_file_rename.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ void nfc_playlist_file_rename_scene_on_enter(void* context) {
3131
text_input_set_header_text(nfc_playlist->text_input, "Enter new file name");
3232
text_input_set_minimum_length(nfc_playlist->text_input, 1);
3333
text_input_set_result_callback(nfc_playlist->text_input, nfc_playlist_file_rename_menu_callback, nfc_playlist, nfc_playlist->text_input_output, 50, true);
34-
view_dispatcher_switch_to_view(nfc_playlist->view_dispatcher, NfcPlaylistView_FileRename);
34+
view_dispatcher_switch_to_view(nfc_playlist->view_dispatcher, NfcPlaylistScene_FileRename);
3535
}
3636

3737
bool nfc_playlist_file_rename_scene_on_event(void* context, SceneManagerEvent event) {

‎scenes/nfc_playlist_scene_main_menu.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include "../nfc_playlist.h"
22

33
typedef enum {
4-
NfcPlaylistEvent_ShowEmulatingPopup,
4+
NfcPlaylistEvent_ShowEmulation,
55
NfcPlaylistEvent_ShowPlaylistSelect,
66
NfcPlaylistEvent_ShowFileEdit,
77
NfcPlaylistEvent_ShowSettings
@@ -61,16 +61,16 @@ void nfc_playlist_main_menu_scene_on_enter(void* context) {
6161
NfcPlaylistMenuSelection_Settings,
6262
nfc_playlist_main_menu_menu_callback,
6363
nfc_playlist);
64-
view_dispatcher_switch_to_view(nfc_playlist->view_dispatcher, NfcPlaylistView_Menu);
64+
view_dispatcher_switch_to_view(nfc_playlist->view_dispatcher, NfcPlaylistScene_MainMenu);
6565
}
6666

6767
bool nfc_playlist_main_menu_scene_on_event(void* context, SceneManagerEvent event) {
6868
NfcPlaylist* nfc_playlist = context;
6969
bool consumed = false;
7070
if (event.type == SceneManagerEventTypeCustom) {
7171
switch(event.event) {
72-
case NfcPlaylistEvent_ShowEmulatingPopup:
73-
scene_manager_next_scene(nfc_playlist->scene_manager, NfcPlaylistScene_EmulatingPopup);
72+
case NfcPlaylistEvent_ShowEmulation:
73+
scene_manager_next_scene(nfc_playlist->scene_manager, NfcPlaylistScene_Emulation);
7474
consumed = true;
7575
break;
7676
case NfcPlaylistEvent_ShowPlaylistSelect:

‎scenes/nfc_playlist_scene_name_new_file.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ void nfc_playlist_name_new_file_scene_on_enter(void* context) {
2424
text_input_set_header_text(nfc_playlist->text_input, "Enter file name");
2525
text_input_set_minimum_length(nfc_playlist->text_input, 1);
2626
text_input_set_result_callback(nfc_playlist->text_input, nfc_playlist_name_new_file_menu_callback, nfc_playlist, nfc_playlist->text_input_output, 50, true);
27-
view_dispatcher_switch_to_view(nfc_playlist->view_dispatcher, NfcPlaylistView_FileRename);
27+
view_dispatcher_switch_to_view(nfc_playlist->view_dispatcher, NfcPlaylistScene_FileRename);
2828
}
2929

3030
bool nfc_playlist_name_new_file_scene_on_event(void* context, SceneManagerEvent event) {

‎scenes/nfc_playlist_scene_nfc_select.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ void nfc_playlist_nfc_select_scene_on_enter(void* context) {
4242
true,
4343
&I_Nfc_10px,
4444
true);
45-
view_dispatcher_switch_to_view(nfc_playlist->view_dispatcher, NfcPlaylistView_PlaylistSelect);
45+
view_dispatcher_switch_to_view(nfc_playlist->view_dispatcher, NfcPlaylistScene_PlaylistSelect);
4646
file_browser_set_callback(nfc_playlist->playlist_file_browser, nfc_playlist_nfc_select_menu_callback, nfc_playlist);
4747
FuriString* tmp_str = furi_string_alloc_set_str("/ext/nfc/");
4848
file_browser_start(nfc_playlist->playlist_file_browser, tmp_str);

‎scenes/nfc_playlist_scene_playlist_select.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ void nfc_playlist_playlist_select_scene_on_enter(void* context) {
1717
true,
1818
&I_Nfc_10px,
1919
true);
20-
view_dispatcher_switch_to_view(nfc_playlist->view_dispatcher, NfcPlaylistView_PlaylistSelect);
20+
view_dispatcher_switch_to_view(nfc_playlist->view_dispatcher, NfcPlaylistScene_PlaylistSelect);
2121
file_browser_set_callback(nfc_playlist->playlist_file_browser, nfc_playlist_playlist_select_menu_callback, nfc_playlist);
2222
FuriString* tmp_str = furi_string_alloc_set_str(PLAYLIST_LOCATION);
2323
file_browser_start(nfc_playlist->playlist_file_browser, tmp_str);

‎scenes/nfc_playlist_scene_settings.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ void nfc_playlist_settings_scene_on_enter(void* context) {
8080
variable_item_set_current_value_text(credits, "Credits");
8181

8282
variable_item_list_set_enter_callback(nfc_playlist->variable_item_list, nfc_playlist_settings_menu_callback, nfc_playlist);
83-
view_dispatcher_switch_to_view(nfc_playlist->view_dispatcher, NfcPlaylistView_Settings);
83+
view_dispatcher_switch_to_view(nfc_playlist->view_dispatcher, NfcPlaylistScene_Settings);
8484
furi_string_free(tmp_str);
8585
}
8686

‎scenes/nfc_playlist_scene_view_playlist_content.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ void nfc_playlist_view_playlist_content_scene_on_enter(void* context) {
2424
storage_file_free(file);
2525
furi_record_close(RECORD_STORAGE);
2626

27-
view_dispatcher_switch_to_view(nfc_playlist->view_dispatcher, NfcPlaylistView_ViewPlaylistContent);
27+
view_dispatcher_switch_to_view(nfc_playlist->view_dispatcher, NfcPlaylistScene_ViewPlaylistContent);
2828
}
2929

3030
bool nfc_playlist_view_playlist_content_scene_on_event(void* context, SceneManagerEvent event) {

0 commit comments

Comments
 (0)