Memory reuse by views already created

applications/external/wifi_marauder_companion/scenes/wifi_marauder_scene_script_confirm_delete.c

@@ -12,20 +12,19 @@ void wifi_marauder_scene_script_confirm_delete_widget_callback(
 
 void wifi_marauder_scene_script_confirm_delete_on_enter(void* context) {
     WifiMarauderApp* app = context;
-    Widget* widget = app->script_confirm_delete_widget;
 
-    widget_add_button_element(widget, GuiButtonTypeLeft, "No", wifi_marauder_scene_script_confirm_delete_widget_callback, app);
-    widget_add_button_element(widget, GuiButtonTypeRight, "Yes", wifi_marauder_scene_script_confirm_delete_widget_callback, app);
+    widget_add_button_element(app->widget, GuiButtonTypeLeft, "No", wifi_marauder_scene_script_confirm_delete_widget_callback, app);
+    widget_add_button_element(app->widget, GuiButtonTypeRight, "Yes", wifi_marauder_scene_script_confirm_delete_widget_callback, app);
 
-    widget_add_string_element(widget, 0, 0, AlignLeft, AlignTop, FontPrimary, "Are you sure?");
+    widget_add_string_element(app->widget, 0, 0, AlignLeft, AlignTop, FontPrimary, "Are you sure?");
     widget_add_text_box_element(
-        widget,
+        app->widget,
         0, 12, 128, 38,
         AlignCenter, AlignCenter,
         "The script will be\npermanently deleted",
         false);
 
-    view_dispatcher_switch_to_view(app->view_dispatcher, WifiMarauderAppViewScriptConfirmDelete);
+    view_dispatcher_switch_to_view(app->view_dispatcher, WifiMarauderAppViewWidget);
 }
 
 bool wifi_marauder_scene_script_confirm_delete_on_event(void* context, SceneManagerEvent event) {
@@ -60,5 +59,5 @@ bool wifi_marauder_scene_script_confirm_delete_on_event(void* context, SceneMana
 
 void wifi_marauder_scene_script_confirm_delete_on_exit(void* context) {
     WifiMarauderApp* app = context;
-    widget_reset(app->script_confirm_delete_widget);
+    widget_reset(app->widget);
 }

applications/external/wifi_marauder_companion/scenes/wifi_marauder_scene_script_edit.c

@@ -25,64 +25,64 @@ static void wifi_marauder_scene_script_edit_add_callback(void* context, uint32_t
 
 void wifi_marauder_scene_script_edit_on_enter(void* context) {
     WifiMarauderApp* app = context;
-    Submenu* script_edit_submenu = app->script_edit_submenu;
+    Submenu* submenu = app->submenu;
     WifiMarauderScript* script = app->script;
-    submenu_set_header(script_edit_submenu, script->name);
+    submenu_set_header(submenu, script->name);
 
     WifiMarauderScriptStage* current_stage = script->first_stage;
     int stage_index = 0;
     while (current_stage != NULL) {
         switch (current_stage->type) {
             case WifiMarauderScriptStageTypeScan:
-                submenu_add_item(script_edit_submenu, "Scan", stage_index, wifi_marauder_scene_script_edit_callback, app);
+                submenu_add_item(submenu, "Scan", stage_index, wifi_marauder_scene_script_edit_callback, app);
                 break;
             case WifiMarauderScriptStageTypeSelect:
-                submenu_add_item(script_edit_submenu, "Select", stage_index, wifi_marauder_scene_script_edit_callback, app);
+                submenu_add_item(submenu, "Select", stage_index, wifi_marauder_scene_script_edit_callback, app);
                 break;
             case WifiMarauderScriptStageTypeDeauth:
-                submenu_add_item(script_edit_submenu, "Deauth", stage_index, wifi_marauder_scene_script_edit_callback, app);
+                submenu_add_item(submenu, "Deauth", stage_index, wifi_marauder_scene_script_edit_callback, app);
                 break;
             case WifiMarauderScriptStageTypeProbe:
-                submenu_add_item(script_edit_submenu, "Probe", stage_index, wifi_marauder_scene_script_edit_callback, app);
+                submenu_add_item(submenu, "Probe", stage_index, wifi_marauder_scene_script_edit_callback, app);
                 break;
             case WifiMarauderScriptStageTypeSniffRaw:
-                submenu_add_item(script_edit_submenu, "Sniff raw", stage_index, wifi_marauder_scene_script_edit_callback, app);
+                submenu_add_item(submenu, "Sniff raw", stage_index, wifi_marauder_scene_script_edit_callback, app);
                 break;
             case WifiMarauderScriptStageTypeSniffBeacon:
-                submenu_add_item(script_edit_submenu, "Sniff beacon", stage_index, wifi_marauder_scene_script_edit_callback, app);
+                submenu_add_item(submenu, "Sniff beacon", stage_index, wifi_marauder_scene_script_edit_callback, app);
                 break;
             case WifiMarauderScriptStageTypeSniffDeauth:
-                submenu_add_item(script_edit_submenu, "Sniff deauth", stage_index, wifi_marauder_scene_script_edit_callback, app);
+                submenu_add_item(submenu, "Sniff deauth", stage_index, wifi_marauder_scene_script_edit_callback, app);
                 break;
             case WifiMarauderScriptStageTypeSniffEsp:
-                submenu_add_item(script_edit_submenu, "Sniff esp", stage_index, wifi_marauder_scene_script_edit_callback, app);
+                submenu_add_item(submenu, "Sniff esp", stage_index, wifi_marauder_scene_script_edit_callback, app);
                 break;
             case WifiMarauderScriptStageTypeSniffPmkid:
-                submenu_add_item(script_edit_submenu, "Sniff PMKID", stage_index, wifi_marauder_scene_script_edit_callback, app);
+                submenu_add_item(submenu, "Sniff PMKID", stage_index, wifi_marauder_scene_script_edit_callback, app);
                 break;
             case WifiMarauderScriptStageTypeSniffPwn:
-                submenu_add_item(script_edit_submenu, "Sniff pwn", stage_index, wifi_marauder_scene_script_edit_callback, app);
+                submenu_add_item(submenu, "Sniff pwn", stage_index, wifi_marauder_scene_script_edit_callback, app);
                 break;
             case WifiMarauderScriptStageTypeBeaconList:
-                submenu_add_item(script_edit_submenu, "Beacon list", stage_index, wifi_marauder_scene_script_edit_callback, app);
+                submenu_add_item(submenu, "Beacon list", stage_index, wifi_marauder_scene_script_edit_callback, app);
                 break;
             case WifiMarauderScriptStageTypeBeaconAp:
-                submenu_add_item(script_edit_submenu, "Beacon AP", stage_index, wifi_marauder_scene_script_edit_callback, app);
+                submenu_add_item(submenu, "Beacon AP", stage_index, wifi_marauder_scene_script_edit_callback, app);
                 break;
             case WifiMarauderScriptStageTypeExec:
-                submenu_add_item(script_edit_submenu, "Custom command", stage_index, wifi_marauder_scene_script_edit_callback, app);
+                submenu_add_item(submenu, "Custom command", stage_index, wifi_marauder_scene_script_edit_callback, app);
                 break;
             case WifiMarauderScriptStageTypeDelay:
-                submenu_add_item(script_edit_submenu, "Delay", stage_index, wifi_marauder_scene_script_edit_callback, app);
+                submenu_add_item(submenu, "Delay", stage_index, wifi_marauder_scene_script_edit_callback, app);
                 break;
         }
         current_stage = current_stage->next_stage;
         stage_index++;
     }
 
-    submenu_add_item(script_edit_submenu, "[+] ADD STAGE", stage_index++, wifi_marauder_scene_script_edit_add_callback, app);
-    submenu_set_selected_item(script_edit_submenu, scene_manager_get_scene_state(app->scene_manager, WifiMarauderSceneScriptEdit));
-    view_dispatcher_switch_to_view(app->view_dispatcher, WifiMarauderAppViewScriptEdit);
+    submenu_add_item(submenu, "[+] ADD STAGE", stage_index++, wifi_marauder_scene_script_edit_add_callback, app);
+    submenu_set_selected_item(submenu, scene_manager_get_scene_state(app->scene_manager, WifiMarauderSceneScriptEdit));
+    view_dispatcher_switch_to_view(app->view_dispatcher, WifiMarauderAppViewSubmenu);
 }
 
 bool wifi_marauder_scene_script_edit_on_event(void* context, SceneManagerEvent event) {
@@ -93,5 +93,5 @@ bool wifi_marauder_scene_script_edit_on_event(void* context, SceneManagerEvent e
 
 void wifi_marauder_scene_script_edit_on_exit(void* context) {
     WifiMarauderApp* app = context;
-    submenu_reset(app->script_edit_submenu);
+    submenu_reset(app->submenu);
 }

applications/external/wifi_marauder_companion/scenes/wifi_marauder_scene_script_edit_list.c

@@ -113,29 +113,27 @@ static void wifi_marauder_scene_script_stage_edit_list_clear_callback(void* cont
 
     wifi_marauder_scene_script_stage_edit_list_deallocate_items(app);
 
-    submenu_reset(app->script_stage_edit_list_submenu);
-    submenu_add_item(app->script_stage_edit_list_submenu, "[+] ADD ITEM", 99, wifi_marauder_scene_script_stage_edit_list_add_callback, app);
-    submenu_add_item(app->script_stage_edit_list_submenu, "[*] SAVE ITEMS", 99, wifi_marauder_scene_script_stage_edit_list_save_callback, app);
-    submenu_add_item(app->script_stage_edit_list_submenu, "[-] CLEAR LIST", 99, wifi_marauder_scene_script_stage_edit_list_clear_callback, app);
+    submenu_reset(app->submenu);
+    submenu_add_item(app->submenu, "[+] ADD ITEM", 99, wifi_marauder_scene_script_stage_edit_list_add_callback, app);
+    submenu_add_item(app->submenu, "[*] SAVE ITEMS", 99, wifi_marauder_scene_script_stage_edit_list_save_callback, app);
+    submenu_add_item(app->submenu, "[-] CLEAR LIST", 99, wifi_marauder_scene_script_stage_edit_list_clear_callback, app);
 }
 
 void wifi_marauder_scene_script_stage_edit_list_on_enter(void* context) {
     WifiMarauderApp* app = context;
-    Submenu* script_stage_edit_list_submenu = app->script_stage_edit_list_submenu;
-
     int item_index = 0;
     WifiMarauderScriptStageListItem* current_item = app->script_stage_edit_first_item;
 
     while (current_item != NULL) {
-        submenu_add_item(script_stage_edit_list_submenu, current_item->value, item_index++, NULL, app);
+        submenu_add_item(app->submenu, current_item->value, item_index++, NULL, app);
         current_item = current_item->next_item;
     }
-    submenu_add_item(app->script_stage_edit_list_submenu, "[+] ADD ITEM", 99, wifi_marauder_scene_script_stage_edit_list_add_callback, app);
-    submenu_add_item(app->script_stage_edit_list_submenu, "[*] SAVE ITEMS", 99, wifi_marauder_scene_script_stage_edit_list_save_callback, app);
-    submenu_add_item(app->script_stage_edit_list_submenu, "[-] CLEAR LIST", 99, wifi_marauder_scene_script_stage_edit_list_clear_callback, app);
+    submenu_add_item(app->submenu, "[+] ADD ITEM", 99, wifi_marauder_scene_script_stage_edit_list_add_callback, app);
+    submenu_add_item(app->submenu, "[*] SAVE ITEMS", 99, wifi_marauder_scene_script_stage_edit_list_save_callback, app);
+    submenu_add_item(app->submenu, "[-] CLEAR LIST", 99, wifi_marauder_scene_script_stage_edit_list_clear_callback, app);
 
-    submenu_set_selected_item(script_stage_edit_list_submenu, scene_manager_get_scene_state(app->scene_manager, WifiMarauderSceneScriptStageEditList));
-    view_dispatcher_switch_to_view(app->view_dispatcher, WifiMarauderAppViewScriptStageEditList);
+    submenu_set_selected_item(app->submenu, scene_manager_get_scene_state(app->scene_manager, WifiMarauderSceneScriptStageEditList));
+    view_dispatcher_switch_to_view(app->view_dispatcher, WifiMarauderAppViewSubmenu);
 }
 
 bool wifi_marauder_scene_script_stage_edit_list_on_event(void* context, SceneManagerEvent event) {
@@ -146,5 +144,5 @@ bool wifi_marauder_scene_script_stage_edit_list_on_event(void* context, SceneMan
 
 void wifi_marauder_scene_script_stage_edit_list_on_exit(void* context) {
     WifiMarauderApp* app = context;
-    submenu_reset(app->script_stage_edit_list_submenu);
+    submenu_reset(app->submenu);
 }

applications/external/wifi_marauder_companion/scenes/wifi_marauder_scene_script_options.c

@@ -56,17 +56,17 @@ void wifi_marauder_scene_script_options_on_enter(void* context) {
         return;
     }
 
-    Submenu* script_options_submenu = app->script_options_submenu;
+    Submenu* submenu = app->submenu;
 
-    submenu_set_header(script_options_submenu, app->script->name);
-    submenu_add_item(script_options_submenu, "[>] RUN", SubmenuIndexRun, wifi_marauder_scene_script_options_callback, app);
-    submenu_add_item(script_options_submenu, "[S] SETTINGS", SubmenuIndexSettings, wifi_marauder_scene_script_options_callback, app);
-    submenu_add_item(script_options_submenu, "[+] EDIT STAGES", SubmenuIndexEditStages, wifi_marauder_scene_script_options_callback, app);
-    submenu_add_item(script_options_submenu, "[*] SAVE", SubmenuIndexSave, wifi_marauder_scene_script_options_callback, app);
-    submenu_add_item(script_options_submenu, "[X] DELETE", SubmenuIndexDelete, wifi_marauder_scene_script_options_callback, app);
+    submenu_set_header(submenu, app->script->name);
+    submenu_add_item(submenu, "[>] RUN", SubmenuIndexRun, wifi_marauder_scene_script_options_callback, app);
+    submenu_add_item(submenu, "[S] SETTINGS", SubmenuIndexSettings, wifi_marauder_scene_script_options_callback, app);
+    submenu_add_item(submenu, "[+] EDIT STAGES", SubmenuIndexEditStages, wifi_marauder_scene_script_options_callback, app);
+    submenu_add_item(submenu, "[*] SAVE", SubmenuIndexSave, wifi_marauder_scene_script_options_callback, app);
+    submenu_add_item(submenu, "[X] DELETE", SubmenuIndexDelete, wifi_marauder_scene_script_options_callback, app);
 
-    submenu_set_selected_item(script_options_submenu, scene_manager_get_scene_state(app->scene_manager, WifiMarauderSceneScriptOptions));
-    view_dispatcher_switch_to_view(app->view_dispatcher, WifiMarauderAppViewScriptOptions);
+    submenu_set_selected_item(submenu, scene_manager_get_scene_state(app->scene_manager, WifiMarauderSceneScriptOptions));
+    view_dispatcher_switch_to_view(app->view_dispatcher, WifiMarauderAppViewSubmenu);
 }
 
 bool wifi_marauder_scene_script_options_on_event(void* context, SceneManagerEvent event) {
@@ -83,5 +83,5 @@ bool wifi_marauder_scene_script_options_on_event(void* context, SceneManagerEven
 
 void wifi_marauder_scene_script_options_on_exit(void* context) {
     WifiMarauderApp* app = context;
-    submenu_reset(app->script_options_submenu);
+    submenu_reset(app->submenu);
 }

applications/external/wifi_marauder_companion/scenes/wifi_marauder_scene_script_select.c

@@ -25,7 +25,7 @@ static void wifi_marauder_scene_script_select_add_callback(void* context, uint32
 
 void wifi_marauder_scene_script_select_on_enter(void* context) {
     WifiMarauderApp* app = context;
-    Submenu* script_select_submenu = app->script_select_submenu;
+    Submenu* submenu = app->submenu;
 
     File* dir_scripts = storage_file_alloc(app->storage);
     if(storage_dir_open(dir_scripts, MARAUDER_APP_FOLDER_SCRIPTS)) {
@@ -37,7 +37,7 @@ void wifi_marauder_scene_script_select_on_enter(void* context) {
             app->script_list_count++;
         }
         if (app->script_list_count > 0) {
-            submenu_set_header(script_select_submenu, "Select a script:");
+            submenu_set_header(submenu, "Select a script:");
             app->script_list = malloc(app->script_list_count * sizeof(FuriString*));
             storage_dir_close(dir_scripts);
             storage_dir_open(dir_scripts, MARAUDER_APP_FOLDER_SCRIPTS);
@@ -46,19 +46,19 @@ void wifi_marauder_scene_script_select_on_enter(void* context) {
             while(storage_dir_read(dir_scripts, &file_info, file_path, 255)) {
                 app->script_list[script_index] = furi_string_alloc();
                 path_extract_filename_no_ext(file_path, app->script_list[script_index]);
-                submenu_add_item(script_select_submenu, furi_string_get_cstr(app->script_list[script_index]), script_index, wifi_marauder_scene_script_select_callback, app);
+                submenu_add_item(submenu, furi_string_get_cstr(app->script_list[script_index]), script_index, wifi_marauder_scene_script_select_callback, app);
                 script_index++;
             }
         } else {
-            submenu_set_header(script_select_submenu, "No script found");
+            submenu_set_header(submenu, "No script found");
         }
-        submenu_add_item(script_select_submenu, "[+] ADD SCRIPT", 99, wifi_marauder_scene_script_select_add_callback, app);
+        submenu_add_item(submenu, "[+] ADD SCRIPT", 99, wifi_marauder_scene_script_select_add_callback, app);
         storage_dir_close(dir_scripts);
     }
     storage_file_free(dir_scripts);
 
-    submenu_set_selected_item(script_select_submenu, scene_manager_get_scene_state(app->scene_manager, WifiMarauderSceneScriptSelect));
-    view_dispatcher_switch_to_view(app->view_dispatcher, WifiMarauderAppViewScriptSelect);
+    submenu_set_selected_item(submenu, scene_manager_get_scene_state(app->scene_manager, WifiMarauderSceneScriptSelect));
+    view_dispatcher_switch_to_view(app->view_dispatcher, WifiMarauderAppViewSubmenu);
 }
 
 bool wifi_marauder_scene_script_select_on_event(void* context, SceneManagerEvent event) {
@@ -69,7 +69,7 @@ bool wifi_marauder_scene_script_select_on_event(void* context, SceneManagerEvent
 
 void wifi_marauder_scene_script_select_on_exit(void* context) {
     WifiMarauderApp* app = context;
-    submenu_reset(app->script_select_submenu);
+    submenu_reset(app->submenu);
 
     for (int i = 0; i < app->script_list_count; i++) {
         furi_string_free(app->script_list[i]);

applications/external/wifi_marauder_companion/scenes/wifi_marauder_scene_script_settings.c

@@ -22,7 +22,7 @@ static void wifi_marauder_scene_script_settings_enter_callback(void* context, ui
 static void wifi_marauder_scene_script_settings_change_callback(VariableItem* item) {
     WifiMarauderApp* app = variable_item_get_context(item);
 
-    uint8_t current_option = variable_item_list_get_selected_item_index(app->script_settings_list);
+    uint8_t current_option = variable_item_list_get_selected_item_index(app->var_item_list);
     uint8_t option_value_index = variable_item_get_current_value_index(item);
 
     switch (current_option) {
@@ -39,27 +39,27 @@ static void wifi_marauder_scene_script_settings_change_callback(VariableItem* it
 
 void wifi_marauder_scene_script_settings_on_enter(void* context) {
     WifiMarauderApp* app = context;
-    VariableItemList* script_settings_list = app->script_settings_list;
-    variable_item_list_set_enter_callback(app->script_settings_list, wifi_marauder_scene_script_settings_enter_callback, app);
+    VariableItemList* var_item_list = app->var_item_list;
+    variable_item_list_set_enter_callback(app->var_item_list, wifi_marauder_scene_script_settings_enter_callback, app);
 
     // Script repeat option
-    VariableItem* repeat_item = variable_item_list_add(app->script_settings_list, "Repeat", 1, NULL, app);
+    VariableItem* repeat_item = variable_item_list_add(app->var_item_list, "Repeat", 1, NULL, app);
     char repeat_str[32];
     snprintf(repeat_str, sizeof(repeat_str), "%d", app->script->repeat);
     variable_item_set_current_value_text(repeat_item, repeat_str);
 
     // Save PCAP option
-    VariableItem* save_pcap_item = variable_item_list_add(app->script_settings_list, "Save PCAP", 3, wifi_marauder_scene_script_settings_change_callback, app);
+    VariableItem* save_pcap_item = variable_item_list_add(app->var_item_list, "Save PCAP", 3, wifi_marauder_scene_script_settings_change_callback, app);
     variable_item_set_current_value_index(save_pcap_item, app->script->save_pcap);
     variable_item_set_current_value_text(save_pcap_item, option_values[app->script->save_pcap]);
 
     // Enable board LED option
-    VariableItem* enable_led_item = variable_item_list_add(app->script_settings_list, "Enable LED", 3, wifi_marauder_scene_script_settings_change_callback, app);
+    VariableItem* enable_led_item = variable_item_list_add(app->var_item_list, "Enable LED", 3, wifi_marauder_scene_script_settings_change_callback, app);
     variable_item_set_current_value_index(enable_led_item, app->script->enable_led);
     variable_item_set_current_value_text(enable_led_item, option_values[app->script->enable_led]);
 
-    variable_item_list_set_selected_item(script_settings_list, scene_manager_get_scene_state(app->scene_manager, WifiMarauderSceneScriptSettings));
-    view_dispatcher_switch_to_view(app->view_dispatcher, WifiMarauderAppViewScriptSettings);
+    variable_item_list_set_selected_item(var_item_list, scene_manager_get_scene_state(app->scene_manager, WifiMarauderSceneScriptSettings));
+    view_dispatcher_switch_to_view(app->view_dispatcher, WifiMarauderAppViewVarItemList);
 }
 
 bool wifi_marauder_scene_script_settings_on_event(void* context, SceneManagerEvent event) {
@@ -70,5 +70,5 @@ bool wifi_marauder_scene_script_settings_on_event(void* context, SceneManagerEve
 
 void wifi_marauder_scene_script_settings_on_exit(void* context) {
     WifiMarauderApp* app = context;
-    variable_item_list_reset(app->script_settings_list);
+    variable_item_list_reset(app->var_item_list);
 }

applications/external/wifi_marauder_companion/scenes/wifi_marauder_scene_script_stage_add.c

@@ -177,27 +177,27 @@ static void wifi_marauder_scene_script_stage_add_delay_callback(void* context, u
 
 void wifi_marauder_scene_script_stage_add_on_enter(void* context) {
     WifiMarauderApp* app = context;
-    Submenu* script_stage_add_submenu = app->script_stage_add_submenu;
-    submenu_set_header(script_stage_add_submenu, "Add stage");
+    Submenu* submenu = app->submenu;
+    submenu_set_header(submenu, "Add stage");
 
     int menu_index = 0;
-    submenu_add_item(script_stage_add_submenu, "[+] Scan", menu_index++, wifi_marauder_scene_script_stage_add_scan_callback, app);
-    submenu_add_item(script_stage_add_submenu, "[+] Select", menu_index++, wifi_marauder_scene_script_stage_add_select_callback, app);
-    submenu_add_item(script_stage_add_submenu, "[+] Deauth", menu_index++, wifi_marauder_scene_script_stage_add_deauth_callback, app);
-    submenu_add_item(script_stage_add_submenu, "[+] Probe", menu_index++, wifi_marauder_scene_script_stage_add_probe_callback, app);
-    submenu_add_item(script_stage_add_submenu, "[+] Sniff RAW", menu_index++, wifi_marauder_scene_script_stage_add_sniffraw_callback, app);
-    submenu_add_item(script_stage_add_submenu, "[+] Sniff Beacon", menu_index++, wifi_marauder_scene_script_stage_add_sniffbeacon_callback, app);
-    submenu_add_item(script_stage_add_submenu, "[+] Sniff Deauth", menu_index++, wifi_marauder_scene_script_stage_add_sniffdeauth_callback, app);
-    submenu_add_item(script_stage_add_submenu, "[+] Sniff Esp", menu_index++, wifi_marauder_scene_script_stage_add_sniffesp_callback, app);
-    submenu_add_item(script_stage_add_submenu, "[+] Sniff PMKID", menu_index++, wifi_marauder_scene_script_stage_add_sniffpmkid_callback, app);
-    submenu_add_item(script_stage_add_submenu, "[+] Sniff Pwnagotchi", menu_index++, wifi_marauder_scene_script_stage_add_sniffpwn_callback, app);
-    submenu_add_item(script_stage_add_submenu, "[+] Beacon List", menu_index++, wifi_marauder_scene_script_stage_add_beaconlist_callback, app);
-    submenu_add_item(script_stage_add_submenu, "[+] Beacon AP", menu_index++, wifi_marauder_scene_script_stage_add_beaconap_callback, app);
-    submenu_add_item(script_stage_add_submenu, "[+] Custom command", menu_index++, wifi_marauder_scene_script_stage_add_exec_callback, app);
-    submenu_add_item(script_stage_add_submenu, "[+] Delay", menu_index++, wifi_marauder_scene_script_stage_add_delay_callback, app);
-
-    submenu_set_selected_item(script_stage_add_submenu, scene_manager_get_scene_state(app->scene_manager, WifiMarauderSceneScriptEdit));
-    view_dispatcher_switch_to_view(app->view_dispatcher, WifiMarauderAppViewScriptStageAdd);
+    submenu_add_item(submenu, "[+] Scan", menu_index++, wifi_marauder_scene_script_stage_add_scan_callback, app);
+    submenu_add_item(submenu, "[+] Select", menu_index++, wifi_marauder_scene_script_stage_add_select_callback, app);
+    submenu_add_item(submenu, "[+] Deauth", menu_index++, wifi_marauder_scene_script_stage_add_deauth_callback, app);
+    submenu_add_item(submenu, "[+] Probe", menu_index++, wifi_marauder_scene_script_stage_add_probe_callback, app);
+    submenu_add_item(submenu, "[+] Sniff RAW", menu_index++, wifi_marauder_scene_script_stage_add_sniffraw_callback, app);
+    submenu_add_item(submenu, "[+] Sniff Beacon", menu_index++, wifi_marauder_scene_script_stage_add_sniffbeacon_callback, app);
+    submenu_add_item(submenu, "[+] Sniff Deauth", menu_index++, wifi_marauder_scene_script_stage_add_sniffdeauth_callback, app);
+    submenu_add_item(submenu, "[+] Sniff Esp", menu_index++, wifi_marauder_scene_script_stage_add_sniffesp_callback, app);
+    submenu_add_item(submenu, "[+] Sniff PMKID", menu_index++, wifi_marauder_scene_script_stage_add_sniffpmkid_callback, app);
+    submenu_add_item(submenu, "[+] Sniff Pwnagotchi", menu_index++, wifi_marauder_scene_script_stage_add_sniffpwn_callback, app);
+    submenu_add_item(submenu, "[+] Beacon List", menu_index++, wifi_marauder_scene_script_stage_add_beaconlist_callback, app);
+    submenu_add_item(submenu, "[+] Beacon AP", menu_index++, wifi_marauder_scene_script_stage_add_beaconap_callback, app);
+    submenu_add_item(submenu, "[+] Custom command", menu_index++, wifi_marauder_scene_script_stage_add_exec_callback, app);
+    submenu_add_item(submenu, "[+] Delay", menu_index++, wifi_marauder_scene_script_stage_add_delay_callback, app);
+
+    submenu_set_selected_item(submenu, scene_manager_get_scene_state(app->scene_manager, WifiMarauderSceneScriptEdit));
+    view_dispatcher_switch_to_view(app->view_dispatcher, WifiMarauderAppViewSubmenu);
 }
 
 bool wifi_marauder_scene_script_stage_add_on_event(void* context, SceneManagerEvent event) {
@@ -208,5 +208,5 @@ bool wifi_marauder_scene_script_stage_add_on_event(void* context, SceneManagerEv
 
 void wifi_marauder_scene_script_stage_add_on_exit(void* context) {
     WifiMarauderApp* app = context;
-    submenu_reset(app->script_stage_add_submenu);
+    submenu_reset(app->submenu);
 }

applications/external/wifi_marauder_companion/scenes/wifi_marauder_scene_script_stage_edit.c

@@ -137,9 +137,9 @@ static void wifi_marauder_scene_script_stage_edit_list_enter_callback(void* cont
 
 void wifi_marauder_scene_script_stage_edit_on_enter(void* context) {
     WifiMarauderApp* app = context;
-    VariableItemList* script_stage_edit_list = app->script_stage_edit_list;
+    VariableItemList* var_item_list = app->var_item_list;
 
-    variable_item_list_set_enter_callback(app->script_stage_edit_list, wifi_marauder_scene_script_stage_edit_list_enter_callback, app);
+    variable_item_list_set_enter_callback(app->var_item_list, wifi_marauder_scene_script_stage_edit_list_enter_callback, app);
     app->script_stage_menu = wifi_marauder_script_stage_menu_create(app->script_edit_selected_stage->type);
 
     if (app->script_stage_menu->items != NULL) {
@@ -147,9 +147,9 @@ void wifi_marauder_scene_script_stage_edit_on_enter(void* context) {
             WifiMarauderScriptMenuItem* stage_item = &app->script_stage_menu->items[i];
 
             // Changes the list item to handle it in callbacks
-            VariableItem* list_item = variable_item_list_add(app->script_stage_edit_list, stage_item->name, stage_item->num_options, stage_item->change_callback, app);
+            VariableItem* list_item = variable_item_list_add(app->var_item_list, stage_item->name, stage_item->num_options, stage_item->change_callback, app);
 
-            variable_item_list_set_selected_item(app->script_stage_edit_list, i);
+            variable_item_list_set_selected_item(app->var_item_list, i);
             if (stage_item->setup_callback != NULL) {
                 stage_item->setup_callback(list_item);
             }
@@ -159,10 +159,10 @@ void wifi_marauder_scene_script_stage_edit_on_enter(void* context) {
         }
     }
 
-    variable_item_list_add(app->script_stage_edit_list, "[-] DELETE STAGE", 0, NULL, app);
+    variable_item_list_add(app->var_item_list, "[-] DELETE STAGE", 0, NULL, app);
 
-    variable_item_list_set_selected_item(script_stage_edit_list, scene_manager_get_scene_state(app->scene_manager, WifiMarauderSceneScriptStageEdit));
-    view_dispatcher_switch_to_view(app->view_dispatcher, WifiMarauderAppViewScriptStageEdit);
+    variable_item_list_set_selected_item(var_item_list, scene_manager_get_scene_state(app->scene_manager, WifiMarauderSceneScriptStageEdit));
+    view_dispatcher_switch_to_view(app->view_dispatcher, WifiMarauderAppViewVarItemList);
 }
 
 bool wifi_marauder_scene_script_stage_edit_on_event(void* context, SceneManagerEvent event) {
@@ -175,5 +175,5 @@ void wifi_marauder_scene_script_stage_edit_on_exit(void* context) {
     WifiMarauderApp* app = context;
     wifi_marauder_script_stage_menu_free(app->script_stage_menu);
     app->script_stage_menu = NULL;
-    variable_item_list_reset(app->script_stage_edit_list);
+    variable_item_list_reset(app->var_item_list);
 }

applications/external/wifi_marauder_companion/scenes/wifi_marauder_scene_user_input.c

@@ -30,14 +30,14 @@ void wifi_marauder_scene_user_input_ok_callback(void* context) {
         // Writes the string value of the reference
         case WifiMarauderUserInputTypeString:
             if (app->user_input_string_reference != NULL) {
-                strncpy(*app->user_input_string_reference, app->user_input_store, strlen(app->user_input_store) + 1);
+                strncpy(*app->user_input_string_reference, app->text_input_store, strlen(app->text_input_store) + 1);
                 app->user_input_string_reference = NULL;
             }
             break;
         // Writes the numerical value of the reference
         case WifiMarauderUserInputTypeNumber:
             if (app->user_input_number_reference != NULL) {
-                *app->user_input_number_reference = atoi(app->user_input_store);
+                *app->user_input_number_reference = atoi(app->text_input_store);
                 app->user_input_number_reference = NULL;
             }
             break;
@@ -49,13 +49,13 @@ void wifi_marauder_scene_user_input_ok_callback(void* context) {
                 app->user_input_file_dir = strdup(MARAUDER_APP_FOLDER);
             }
             if (app->user_input_file_extension != NULL) {
-                size_t file_path_len = strlen(app->user_input_file_dir) + strlen(app->user_input_store) + strlen(app->user_input_file_extension) + 3;
+                size_t file_path_len = strlen(app->user_input_file_dir) + strlen(app->text_input_store) + strlen(app->user_input_file_extension) + 3;
                 file_path = (char*)malloc(file_path_len);
-                snprintf(file_path, file_path_len, "%s/%s.%s", app->user_input_file_dir, app->user_input_store, app->user_input_file_extension);
+                snprintf(file_path, file_path_len, "%s/%s.%s", app->user_input_file_dir, app->text_input_store, app->user_input_file_extension);
             } else {
-                size_t file_path_len = strlen(app->user_input_file_dir) + strlen(app->user_input_store) + 2;
+                size_t file_path_len = strlen(app->user_input_file_dir) + strlen(app->text_input_store) + 2;
                 file_path = (char*)malloc(file_path_len);
-                snprintf(file_path, file_path_len, "%s/%s", app->user_input_file_dir, app->user_input_store);
+                snprintf(file_path, file_path_len, "%s/%s", app->user_input_file_dir, app->text_input_store);
             }
             if (storage_file_open(file, file_path, FSAM_WRITE, FSOM_CREATE_NEW)) {
                 storage_file_close(file);
@@ -81,26 +81,26 @@ void wifi_marauder_scene_user_input_on_enter(void* context) {
     switch (app->user_input_type) {
         // Loads the string value of the reference
         case WifiMarauderUserInputTypeString:
-            text_input_set_header_text(app->user_input, "Enter value:");
-            text_input_set_validator(app->user_input, NULL, app);
+            text_input_set_header_text(app->text_input, "Enter value:");
+            text_input_set_validator(app->text_input, NULL, app);
             if (app->user_input_string_reference != NULL) {
-                strncpy(app->user_input_store, *app->user_input_string_reference, strlen(*app->user_input_string_reference) + 1);
+                strncpy(app->text_input_store, *app->user_input_string_reference, strlen(*app->user_input_string_reference) + 1);
             }
             break;
         // Loads the numerical value of the reference
         case WifiMarauderUserInputTypeNumber:
-            text_input_set_header_text(app->user_input, "Enter a valid number:");
-            text_input_set_validator(app->user_input, wifi_marauder_scene_user_input_validator_number_callback, app);
+            text_input_set_header_text(app->text_input, "Enter a valid number:");
+            text_input_set_validator(app->text_input, wifi_marauder_scene_user_input_validator_number_callback, app);
             if (app->user_input_number_reference != NULL) {
                 char number_str[32];
                 snprintf(number_str, sizeof(number_str), "%d", *app->user_input_number_reference);
-                strncpy(app->user_input_store, number_str, strlen(number_str) + 1);
+                strncpy(app->text_input_store, number_str, strlen(number_str) + 1);
             }
             break;
         // File name
         case WifiMarauderUserInputTypeFileName:
-            text_input_set_header_text(app->user_input, "Enter file name:");
-            text_input_set_validator(app->user_input, wifi_marauder_scene_user_input_validator_file_callback, app);
+            text_input_set_header_text(app->text_input, "Enter file name:");
+            text_input_set_validator(app->text_input, wifi_marauder_scene_user_input_validator_file_callback, app);
             break;
         default:
             scene_manager_previous_scene(app->scene_manager);
@@ -108,14 +108,14 @@ void wifi_marauder_scene_user_input_on_enter(void* context) {
     }
 
     text_input_set_result_callback(
-        app->user_input,
+        app->text_input,
         wifi_marauder_scene_user_input_ok_callback,
         app,
-        app->user_input_store,
-        WIFI_MARAUDER_USER_INPUT_STORE_SIZE,
+        app->text_input_store,
+        WIFI_MARAUDER_TEXT_INPUT_STORE_SIZE,
         false);
 
-    view_dispatcher_switch_to_view(app->view_dispatcher, WifiMarauderAppViewUserInput);
+    view_dispatcher_switch_to_view(app->view_dispatcher, WifiMarauderAppViewTextInput);
 }
 
 bool wifi_marauder_scene_user_input_on_event(void* context, SceneManagerEvent event) {
@@ -126,6 +126,6 @@ bool wifi_marauder_scene_user_input_on_event(void* context, SceneManagerEvent ev
 
 void wifi_marauder_scene_user_input_on_exit(void* context) {
     WifiMarauderApp* app = context;
-    memset(app->user_input_store, 0, sizeof(app->user_input_store));
-    text_input_reset(app->user_input);
+    memset(app->text_input_store, 0, sizeof(app->text_input_store));
+    text_input_reset(app->text_input);
 }

applications/external/wifi_marauder_companion/script/menu/wifi_marauder_script_stage_menu_scan.c

@@ -10,7 +10,7 @@ void wifi_marauder_scan_stage_type_change_callback(VariableItem* item) {
     WifiMarauderApp* app = variable_item_get_context(item);
 
     // Get menu item
-    uint8_t current_stage_index = variable_item_list_get_selected_item_index(app->script_stage_edit_list);
+    uint8_t current_stage_index = variable_item_list_get_selected_item_index(app->var_item_list);
     const WifiMarauderScriptMenuItem* menu_item = &app->script_stage_menu->items[current_stage_index];
 
     // Defines the text of the selected option
@@ -36,7 +36,7 @@ void wifi_marauder_scan_stage_channel_change_callback(VariableItem* item) {
     WifiMarauderApp* app = variable_item_get_context(item);
 
     // Get menu item
-    uint8_t current_stage_index = variable_item_list_get_selected_item_index(app->script_stage_edit_list);
+    uint8_t current_stage_index = variable_item_list_get_selected_item_index(app->var_item_list);
     const WifiMarauderScriptMenuItem* menu_item = &app->script_stage_menu->items[current_stage_index];
 
     // Defines the text of the selected option

applications/external/wifi_marauder_companion/script/menu/wifi_marauder_script_stage_menu_select.c

@@ -10,7 +10,7 @@ void wifi_marauder_select_stage_type_change_callback(VariableItem* item) {
     WifiMarauderApp* app = variable_item_get_context(item);
 
     // Get menu item
-    uint8_t current_stage_index = variable_item_list_get_selected_item_index(app->script_stage_edit_list);
+    uint8_t current_stage_index = variable_item_list_get_selected_item_index(app->var_item_list);
     const WifiMarauderScriptMenuItem* menu_item = &app->script_stage_menu->items[current_stage_index];
 
     // Defines the text of the selected option

applications/external/wifi_marauder_companion/script/menu/wifi_marauder_script_stage_menu_sniffpmkid.c

@@ -10,7 +10,7 @@ static void wifi_marauder_sniffpmkid_stage_force_deauth_change_callback(Variable
     WifiMarauderApp* app = variable_item_get_context(item);
 
     // Get menu item
-    uint8_t current_stage_index = variable_item_list_get_selected_item_index(app->script_stage_edit_list);
+    uint8_t current_stage_index = variable_item_list_get_selected_item_index(app->var_item_list);
     const WifiMarauderScriptMenuItem* menu_item = &app->script_stage_menu->items[current_stage_index];
 
     // Defines the text of the selected option
@@ -36,7 +36,7 @@ static void wifi_marauder_sniffpmkid_stage_channel_change_callback(VariableItem*
     WifiMarauderApp* app = variable_item_get_context(item);
 
     // Get menu item
-    uint8_t current_stage_index = variable_item_list_get_selected_item_index(app->script_stage_edit_list);
+    uint8_t current_stage_index = variable_item_list_get_selected_item_index(app->var_item_list);
     const WifiMarauderScriptMenuItem* menu_item = &app->script_stage_menu->items[current_stage_index];
 
     // Defines the text of the selected option

applications/external/wifi_marauder_companion/wifi_marauder_app.c

@@ -79,41 +79,9 @@ WifiMarauderApp* wifi_marauder_app_alloc() {
         (!storage_file_exists(app->storage, SAVE_PCAP_SETTING_FILEPATH) ||
          !storage_file_exists(app->storage, SAVE_LOGS_SETTING_FILEPATH));
 
-    // User input
-    app->user_input = text_input_alloc();
-    view_dispatcher_add_view(app->view_dispatcher, WifiMarauderAppViewUserInput, text_input_get_view(app->user_input));
-
-    // Script select
-    app->script_select_submenu = submenu_alloc();
-    view_dispatcher_add_view(app->view_dispatcher, WifiMarauderAppViewScriptSelect, submenu_get_view(app->script_select_submenu));
-
-    // Script options
-    app->script_options_submenu = submenu_alloc();
-    view_dispatcher_add_view(app->view_dispatcher, WifiMarauderAppViewScriptOptions, submenu_get_view(app->script_options_submenu));
-
-    // Script confirm delete
-    app->script_confirm_delete_widget = widget_alloc();
-    view_dispatcher_add_view(app->view_dispatcher, WifiMarauderAppViewScriptConfirmDelete, widget_get_view(app->script_confirm_delete_widget));
-
-    // Script stage add
-    app->script_stage_add_submenu = submenu_alloc();
-    view_dispatcher_add_view(app->view_dispatcher, WifiMarauderAppViewScriptStageAdd, submenu_get_view(app->script_stage_add_submenu));
-
-    // Script edit
-    app->script_edit_submenu = submenu_alloc();
-    view_dispatcher_add_view(app->view_dispatcher, WifiMarauderAppViewScriptEdit, submenu_get_view(app->script_edit_submenu));
-
-    // Script stage edit
-    app->script_settings_list = variable_item_list_alloc();
-    view_dispatcher_add_view(app->view_dispatcher, WifiMarauderAppViewScriptSettings, variable_item_list_get_view(app->script_settings_list));
-
-    // Script stage edit list submenu
-    app->script_stage_edit_list_submenu = submenu_alloc();
-    view_dispatcher_add_view(app->view_dispatcher, WifiMarauderAppViewScriptStageEditList, submenu_get_view(app->script_stage_edit_list_submenu));
-
-    // Script stage edit
-    app->script_stage_edit_list = variable_item_list_alloc();
-    view_dispatcher_add_view(app->view_dispatcher, WifiMarauderAppViewScriptStageEdit, variable_item_list_get_view(app->script_stage_edit_list));
+    // Submenu
+    app->submenu = submenu_alloc();
+    view_dispatcher_add_view(app->view_dispatcher, WifiMarauderAppViewSubmenu, submenu_get_view(app->submenu));
 
     scene_manager_next_scene(app->scene_manager, WifiMarauderSceneStart);
 
@@ -172,26 +140,12 @@ void wifi_marauder_app_free(WifiMarauderApp* app) {
     view_dispatcher_remove_view(app->view_dispatcher, WifiMarauderAppViewConsoleOutput);
     view_dispatcher_remove_view(app->view_dispatcher, WifiMarauderAppViewTextInput);
     view_dispatcher_remove_view(app->view_dispatcher, WifiMarauderAppViewWidget);
-    view_dispatcher_remove_view(app->view_dispatcher, WifiMarauderAppViewScriptSelect);
-    view_dispatcher_remove_view(app->view_dispatcher, WifiMarauderAppViewScriptOptions);
-    view_dispatcher_remove_view(app->view_dispatcher, WifiMarauderAppViewScriptEdit);
-    view_dispatcher_remove_view(app->view_dispatcher, WifiMarauderAppViewScriptSettings);
-    view_dispatcher_remove_view(app->view_dispatcher, WifiMarauderAppViewScriptStageEdit);
-    view_dispatcher_remove_view(app->view_dispatcher, WifiMarauderAppViewScriptStageEditList);
-    view_dispatcher_remove_view(app->view_dispatcher, WifiMarauderAppViewUserInput);
+    view_dispatcher_remove_view(app->view_dispatcher, WifiMarauderAppViewSubmenu);
     widget_free(app->widget);
-    widget_free(app->script_confirm_delete_widget);
     text_box_free(app->text_box);
     furi_string_free(app->text_box_store);
     text_input_free(app->text_input);
-    text_input_free(app->user_input);
-    submenu_free(app->script_select_submenu);
-    submenu_free(app->script_options_submenu);
-    submenu_free(app->script_stage_add_submenu);
-    submenu_free(app->script_edit_submenu);
-    submenu_free(app->script_stage_edit_list_submenu);
-    variable_item_list_free(app->script_settings_list);
-    variable_item_list_free(app->script_stage_edit_list);
+    submenu_free(app->submenu);
     storage_file_free(app->capture_file);
     storage_file_free(app->log_file);
     storage_file_free(app->save_pcap_setting_file);

applications/external/wifi_marauder_companion/wifi_marauder_app_i.h

@@ -30,7 +30,6 @@
 
 #define WIFI_MARAUDER_TEXT_BOX_STORE_SIZE (4096)
 #define WIFI_MARAUDER_TEXT_INPUT_STORE_SIZE (512)
-#define WIFI_MARAUDER_USER_INPUT_STORE_SIZE (64)
 
 #define MARAUDER_APP_FOLDER_USER "apps_data/marauder"
 #define MARAUDER_APP_FOLDER ANY_PATH(MARAUDER_APP_FOLDER_USER)
@@ -74,6 +73,7 @@ struct WifiMarauderApp {
 
     VariableItemList* var_item_list;
     Widget* widget;
+    Submenu* submenu;
     int open_log_file_page;
     int open_log_file_num_pages;
 
@@ -90,8 +90,6 @@ struct WifiMarauderApp {
     bool is_writing_log;
 
     // User input
-    TextInput* user_input;
-    char user_input_store[WIFI_MARAUDER_USER_INPUT_STORE_SIZE + 1];
     WifiMarauderUserInputType user_input_type;
     char** user_input_string_reference;
     int* user_input_number_reference;
@@ -103,15 +101,7 @@ struct WifiMarauderApp {
     WifiMarauderScriptWorker* script_worker;
     FuriString** script_list;
     int script_list_count;
-    Submenu* script_select_submenu;
-    Submenu* script_options_submenu;
-    Submenu* script_edit_submenu;
-    Submenu* script_stage_add_submenu;
-    Submenu* script_stage_edit_list_submenu;
-    Widget* script_confirm_delete_widget;
     WifiMarauderScriptStage* script_edit_selected_stage;
-    VariableItemList* script_settings_list;
-    VariableItemList* script_stage_edit_list;
     WifiMarauderScriptStageMenu* script_stage_menu;
     WifiMarauderScriptStageListItem* script_stage_edit_first_item;
     char*** script_stage_edit_strings_reference;
@@ -151,13 +141,5 @@ typedef enum {
     WifiMarauderAppViewConsoleOutput,
     WifiMarauderAppViewTextInput,
     WifiMarauderAppViewWidget,
-    WifiMarauderAppViewUserInput,
-    WifiMarauderAppViewScriptSelect,
-    WifiMarauderAppViewScriptOptions,
-    WifiMarauderAppViewScriptEdit,
-    WifiMarauderAppViewScriptSettings,
-    WifiMarauderAppViewScriptConfirmDelete,
-    WifiMarauderAppViewScriptStageAdd,
-    WifiMarauderAppViewScriptStageEdit,
-    WifiMarauderAppViewScriptStageEditList,
+    WifiMarauderAppViewSubmenu,
 } WifiMarauderAppView;