Преглед изворни кода

No playlist

- Removes no playlist selected error from emulation screen and instead makes the start button locked if there is no playlist selected
acegoal07 пре 1 година
родитељ
комит
5765690621
4 измењених фајлова са 8 додато и 11 уклоњено
  1. 1 6
      scences/emulation.c
  2. 2 2
      scences/file_edit.c
  3. 4 2
      scences/main_menu.c
  4. 1 1
      scences/text_input.c

+ 1 - 6
scences/emulation.c

@@ -150,12 +150,7 @@ int32_t nfc_playlist_emulation_task(void* context) {
         popup_set_text(nfc_playlist->popup, "Press back", 64, 50, AlignCenter, AlignTop);
         popup_set_text(nfc_playlist->popup, "Press back", 64, 50, AlignCenter, AlignTop);
         stop_blink(nfc_playlist);
         stop_blink(nfc_playlist);
         EmulationState = NfcPlaylistEmulationState_Stopped;
         EmulationState = NfcPlaylistEmulationState_Stopped;
-    } 
-    
-    else if (!nfc_playlist->file_selected_check) {
-        popup_set_header(nfc_playlist->popup, "No playlist selected", 64, 10, AlignCenter, AlignTop);
-        popup_set_text(nfc_playlist->popup, "Press back", 64, 50, AlignCenter, AlignTop);
-    } 
+    }
     
     
     else {
     else {
         popup_set_header(nfc_playlist->popup, "Failed to open playlist", 64, 10, AlignCenter, AlignTop);
         popup_set_header(nfc_playlist->popup, "Failed to open playlist", 64, 10, AlignCenter, AlignTop);

+ 2 - 2
scences/file_edit.c

@@ -44,7 +44,7 @@ void nfc_playlist_file_edit_scene_on_enter(void* context) {
       nfc_playlist_file_edit_menu_callback,
       nfc_playlist_file_edit_menu_callback,
       nfc_playlist,
       nfc_playlist,
       !nfc_playlist->file_selected_check,
       !nfc_playlist->file_selected_check,
-      "Playlist\nNot\nSelected");
+      "No\nplaylist\nselected");
 
 
    submenu_add_lockable_item(
    submenu_add_lockable_item(
       nfc_playlist->submenu,
       nfc_playlist->submenu,
@@ -53,7 +53,7 @@ void nfc_playlist_file_edit_scene_on_enter(void* context) {
       nfc_playlist_file_edit_menu_callback,
       nfc_playlist_file_edit_menu_callback,
       nfc_playlist,
       nfc_playlist,
       !nfc_playlist->file_selected_check,
       !nfc_playlist->file_selected_check,
-      "Playlist\nNot\nSelected");
+      "No\nplaylist\nselected");
 
 
    view_dispatcher_switch_to_view(nfc_playlist->view_dispatcher, NfcPlaylistView_FileEdit);
    view_dispatcher_switch_to_view(nfc_playlist->view_dispatcher, NfcPlaylistView_FileEdit);
 }
 }

+ 4 - 2
scences/main_menu.c

@@ -45,12 +45,14 @@ void nfc_playlist_main_menu_scene_on_enter(void* context) {
 
 
     submenu_set_header(nfc_playlist->submenu, "NFC Playlist");
     submenu_set_header(nfc_playlist->submenu, "NFC Playlist");
 
 
-    submenu_add_item(
+    submenu_add_lockable_item(
         nfc_playlist->submenu,
         nfc_playlist->submenu,
         "Start",
         "Start",
         NfcPlaylistMenuSelection_Start,
         NfcPlaylistMenuSelection_Start,
         nfc_playlist_main_menu_menu_callback,
         nfc_playlist_main_menu_menu_callback,
-        nfc_playlist);
+        nfc_playlist,
+        !nfc_playlist->file_selected_check,
+        "No\nplaylist\nselected");
 
 
     submenu_add_item(
     submenu_add_item(
         nfc_playlist->submenu,
         nfc_playlist->submenu,

+ 1 - 1
scences/text_input.c

@@ -41,8 +41,8 @@ void nfc_playlist_text_input_scene_on_enter(void* context) {
 }
 }
 
 
 bool nfc_playlist_text_input_scene_on_event(void* context, SceneManagerEvent event) {
 bool nfc_playlist_text_input_scene_on_event(void* context, SceneManagerEvent event) {
-   UNUSED(event);
    UNUSED(context);
    UNUSED(context);
+   UNUSED(event);
    return false;
    return false;
 }
 }