Просмотр исходного кода

Rename start scene to main menu

Eric Betts 9 месяцев назад
Родитель
Сommit
9f91f0b211

+ 1 - 1
scenes/seos_scene_config.h

@@ -1,4 +1,4 @@
-ADD_SCENE(seos, start, Start)
+ADD_SCENE(seos, main_menu, MainMenu)
 ADD_SCENE(seos, emulate, Emulate)
 ADD_SCENE(seos, read, Read)
 ADD_SCENE(seos, file_select, FileSelect)

+ 1 - 1
scenes/seos_scene_delete.c

@@ -37,7 +37,7 @@ bool seos_scene_delete_on_event(void* context, SceneManagerEvent event) {
                 scene_manager_next_scene(seos->scene_manager, SeosSceneDeleteSuccess);
             } else {
                 scene_manager_search_and_switch_to_previous_scene(
-                    seos->scene_manager, SeosSceneStart);
+                    seos->scene_manager, SeosSceneMainMenu);
             }
             consumed = true;
         }

+ 1 - 1
scenes/seos_scene_delete_success.c

@@ -26,7 +26,7 @@ bool seos_scene_delete_success_on_event(void* context, SceneManagerEvent event)
     if(event.type == SceneManagerEventTypeCustom) {
         if(event.event == SeosCustomEventViewExit) {
             consumed = scene_manager_search_and_switch_to_previous_scene(
-                seos->scene_manager, SeosSceneStart);
+                seos->scene_manager, SeosSceneMainMenu);
         }
     }
     return consumed;

+ 1 - 1
scenes/seos_scene_file_select.c

@@ -10,7 +10,7 @@ void seos_scene_file_select_on_enter(void* context) {
         seos->flow_mode = FLOW_CRED;
         scene_manager_next_scene(seos->scene_manager, SeosSceneSavedMenu);
     } else {
-        scene_manager_search_and_switch_to_previous_scene(seos->scene_manager, SeosSceneStart);
+        scene_manager_search_and_switch_to_previous_scene(seos->scene_manager, SeosSceneMainMenu);
     }
     seos_emulator_set_loading_callback(seos_emulator, NULL, seos);
 }

+ 21 - 21
scenes/seos_scene_start.c → scenes/seos_scene_main_menu.c

@@ -1,6 +1,6 @@
 #include "../seos_i.h"
 
-#define TAG "SceneStart"
+#define TAG "SceneMainMenu"
 
 enum SubmenuIndex {
     SubmenuIndexSaved,
@@ -12,91 +12,91 @@ enum SubmenuIndex {
     SubmenuIndexInspect,
 };
 
-void seos_scene_start_submenu_callback(void* context, uint32_t index) {
+void seos_scene_main_menu_submenu_callback(void* context, uint32_t index) {
     Seos* seos = context;
     view_dispatcher_send_custom_event(seos->view_dispatcher, index);
 }
 
-void seos_scene_start_on_enter(void* context) {
+void seos_scene_main_menu_on_enter(void* context) {
     Seos* seos = context;
     Submenu* submenu = seos->submenu;
     submenu_reset(submenu);
 
-    submenu_add_item(submenu, "Saved", SubmenuIndexSaved, seos_scene_start_submenu_callback, seos);
+    submenu_add_item(submenu, "Saved", SubmenuIndexSaved, seos_scene_main_menu_submenu_callback, seos);
     submenu_add_item(
-        submenu, "Read NFC", SubmenuIndexRead, seos_scene_start_submenu_callback, seos);
+        submenu, "Read NFC", SubmenuIndexRead, seos_scene_main_menu_submenu_callback, seos);
     if(seos->has_ble) {
         submenu_add_item(
             submenu,
-            "Start BLE Reader",
+            "MainMenu BLE Reader",
             SubmenuIndexBLEReader,
-            seos_scene_start_submenu_callback,
+            seos_scene_main_menu_submenu_callback,
             seos);
         submenu_add_item(
             submenu,
             "Scanners >",
             SubmenuIndexScannerMenu,
-            seos_scene_start_submenu_callback,
+            seos_scene_main_menu_submenu_callback,
             seos);
         /*
         submenu_add_item(
             submenu,
             "BLE Cred Interrogate",
             SubmenuIndexBLECredInterrogate,
-            seos_scene_start_submenu_callback,
+            seos_scene_main_menu_submenu_callback,
             seos);
             */
     }
     /*
     submenu_add_item(
-        submenu, "Inspect", SubmenuIndexInspect, seos_scene_start_submenu_callback, seos);
+        submenu, "Inspect", SubmenuIndexInspect, seos_scene_main_menu_submenu_callback, seos);
     */
-    submenu_add_item(submenu, "About", SubmenuIndexAbout, seos_scene_start_submenu_callback, seos);
+    submenu_add_item(submenu, "About", SubmenuIndexAbout, seos_scene_main_menu_submenu_callback, seos);
 
     submenu_set_selected_item(
-        seos->submenu, scene_manager_get_scene_state(seos->scene_manager, SeosSceneStart));
+        seos->submenu, scene_manager_get_scene_state(seos->scene_manager, SeosSceneMainMenu));
 
     view_dispatcher_switch_to_view(seos->view_dispatcher, SeosViewMenu);
 }
 
-bool seos_scene_start_on_event(void* context, SceneManagerEvent event) {
+bool seos_scene_main_menu_on_event(void* context, SceneManagerEvent event) {
     Seos* seos = context;
     bool consumed = false;
 
     if(event.type == SceneManagerEventTypeCustom) {
         if(event.event == SubmenuIndexRead) {
-            scene_manager_set_scene_state(seos->scene_manager, SeosSceneStart, SubmenuIndexRead);
+            scene_manager_set_scene_state(seos->scene_manager, SeosSceneMainMenu, SubmenuIndexRead);
             scene_manager_next_scene(seos->scene_manager, SeosSceneRead);
             consumed = true;
         } else if(event.event == SubmenuIndexBLEReader) {
             scene_manager_set_scene_state(
-                seos->scene_manager, SeosSceneStart, SubmenuIndexBLEReader);
+                seos->scene_manager, SeosSceneMainMenu, SubmenuIndexBLEReader);
             seos->flow_mode = FLOW_READER;
             scene_manager_next_scene(seos->scene_manager, SeosSceneBlePeripheral);
             consumed = true;
         } else if(event.event == SubmenuIndexScannerMenu) {
             scene_manager_set_scene_state(
-                seos->scene_manager, SeosSceneStart, SubmenuIndexScannerMenu);
+                seos->scene_manager, SeosSceneMainMenu, SubmenuIndexScannerMenu);
             scene_manager_next_scene(seos->scene_manager, SeosSceneScannerMenu);
             consumed = true;
         } else if(event.event == SubmenuIndexBLECredInterrogate) {
             scene_manager_set_scene_state(
-                seos->scene_manager, SeosSceneStart, SubmenuIndexBLECredInterrogate);
+                seos->scene_manager, SeosSceneMainMenu, SubmenuIndexBLECredInterrogate);
             seos->flow_mode = FLOW_READER;
             scene_manager_next_scene(seos->scene_manager, SeosSceneBleCentral);
             consumed = true;
         } else if(event.event == SubmenuIndexSaved) {
-            scene_manager_set_scene_state(seos->scene_manager, SeosSceneStart, SubmenuIndexSaved);
+            scene_manager_set_scene_state(seos->scene_manager, SeosSceneMainMenu, SubmenuIndexSaved);
             scene_manager_next_scene(seos->scene_manager, SeosSceneFileSelect);
             consumed = true;
         } else if(event.event == SubmenuIndexInspect) {
             scene_manager_set_scene_state(
-                seos->scene_manager, SeosSceneStart, SubmenuIndexInspect);
+                seos->scene_manager, SeosSceneMainMenu, SubmenuIndexInspect);
             seos->flow_mode = FLOW_INSPECT;
             scene_manager_next_scene(seos->scene_manager, SeosSceneEmulate);
             consumed = true;
         } else if(event.event == SubmenuIndexAbout) {
-            scene_manager_set_scene_state(seos->scene_manager, SeosSceneStart, SubmenuIndexAbout);
+            scene_manager_set_scene_state(seos->scene_manager, SeosSceneMainMenu, SubmenuIndexAbout);
             scene_manager_next_scene(seos->scene_manager, SeosSceneAbout);
             consumed = true;
         }
@@ -105,7 +105,7 @@ bool seos_scene_start_on_event(void* context, SceneManagerEvent event) {
     return consumed;
 }
 
-void seos_scene_start_on_exit(void* context) {
+void seos_scene_main_menu_on_exit(void* context) {
     Seos* seos = context;
 
     submenu_reset(seos->submenu);

+ 1 - 1
scenes/seos_scene_read.c

@@ -33,7 +33,7 @@ bool seos_scene_read_on_event(void* context, SceneManagerEvent event) {
             consumed = true;
         }
     } else if(event.type == SceneManagerEventTypeBack) {
-        scene_manager_search_and_switch_to_previous_scene(seos->scene_manager, SeosSceneStart);
+        scene_manager_search_and_switch_to_previous_scene(seos->scene_manager, SeosSceneMainMenu);
         consumed = true;
     }
 

+ 1 - 1
scenes/seos_scene_read_error.c

@@ -50,7 +50,7 @@ bool seos_scene_read_error_on_event(void* context, SceneManagerEvent event) {
             consumed = scene_manager_previous_scene(seos->scene_manager);
         }
     } else if(event.type == SceneManagerEventTypeBack) {
-        scene_manager_search_and_switch_to_previous_scene(seos->scene_manager, SeosSceneStart);
+        scene_manager_search_and_switch_to_previous_scene(seos->scene_manager, SeosSceneMainMenu);
         consumed = true;
     }
     return consumed;

+ 1 - 1
scenes/seos_scene_read_success.c

@@ -95,7 +95,7 @@ bool seos_scene_read_success_on_event(void* context, SceneManagerEvent event) {
             consumed = true;
         }
     } else if(event.type == SceneManagerEventTypeBack) {
-        scene_manager_search_and_switch_to_previous_scene(seos->scene_manager, SeosSceneStart);
+        scene_manager_search_and_switch_to_previous_scene(seos->scene_manager, SeosSceneMainMenu);
         consumed = true;
     }
     return consumed;

+ 1 - 1
scenes/seos_scene_save_name.c

@@ -60,7 +60,7 @@ bool seos_scene_save_name_on_event(void* context, SceneManagerEvent event) {
                 consumed = true;
             } else {
                 consumed = scene_manager_search_and_switch_to_previous_scene(
-                    seos->scene_manager, SeosSceneStart);
+                    seos->scene_manager, SeosSceneMainMenu);
             }
         }
     }

+ 1 - 1
scenes/seos_scene_save_success.c

@@ -28,7 +28,7 @@ bool seos_scene_save_success_on_event(void* context, SceneManagerEvent event) {
     if(event.type == SceneManagerEventTypeCustom) {
         if(event.event == SeosCustomEventViewExit) {
             consumed = scene_manager_search_and_switch_to_previous_scene(
-                seos->scene_manager, SeosSceneStart);
+                seos->scene_manager, SeosSceneMainMenu);
         }
     }
     return consumed;

+ 1 - 1
scenes/seos_scene_saved_menu.c

@@ -83,7 +83,7 @@ bool seos_scene_saved_menu_on_event(void* context, SceneManagerEvent event) {
         }
     } else if(event.type == SceneManagerEventTypeBack) {
         memset((void*)&seos->credential, 0, sizeof(seos->credential));
-        scene_manager_search_and_switch_to_previous_scene(seos->scene_manager, SeosSceneStart);
+        scene_manager_search_and_switch_to_previous_scene(seos->scene_manager, SeosSceneMainMenu);
         consumed = true;
     }
 

+ 3 - 3
scenes/seos_scene_scanner_menu.c

@@ -27,7 +27,7 @@ void seos_scene_scanner_menu_on_enter(void* context) {
         seos);
 
     submenu_set_selected_item(
-        seos->submenu, scene_manager_get_scene_state(seos->scene_manager, SeosSceneStart));
+        seos->submenu, scene_manager_get_scene_state(seos->scene_manager, SeosSceneMainMenu));
 
     view_dispatcher_switch_to_view(seos->view_dispatcher, SeosViewMenu);
 }
@@ -39,13 +39,13 @@ bool seos_scene_scanner_menu_on_event(void* context, SceneManagerEvent event) {
     if(event.type == SceneManagerEventTypeCustom) {
         if(event.event == SubmenuIndexBLEReaderScanner) {
             scene_manager_set_scene_state(
-                seos->scene_manager, SeosSceneStart, SubmenuIndexBLEReaderScanner);
+                seos->scene_manager, SeosSceneMainMenu, SubmenuIndexBLEReaderScanner);
             seos->flow_mode = FLOW_READER_SCANNER;
             scene_manager_next_scene(seos->scene_manager, SeosSceneBleCentral);
             consumed = true;
         } else if(event.event == SubmenuIndexBLECredScanner) {
             scene_manager_set_scene_state(
-                seos->scene_manager, SeosSceneStart, SubmenuIndexBLECredScanner);
+                seos->scene_manager, SeosSceneMainMenu, SubmenuIndexBLECredScanner);
             seos->flow_mode = FLOW_CRED_SCANNER;
             scene_manager_next_scene(seos->scene_manager, SeosSceneBleCentral);
             consumed = true;

+ 1 - 1
seos.c

@@ -291,7 +291,7 @@ int32_t seos_app(void* p) {
     UNUSED(p);
     Seos* seos = seos_alloc();
 
-    scene_manager_next_scene(seos->scene_manager, SeosSceneStart);
+    scene_manager_next_scene(seos->scene_manager, SeosSceneMainMenu);
 
     view_dispatcher_run(seos->view_dispatcher);