Interface improvements

applications/external/wifi_marauder_companion/scenes/wifi_marauder_scene_script_confirm_delete.c

@@ -42,6 +42,13 @@ bool wifi_marauder_scene_script_confirm_delete_on_event(void* context, SceneMana
                 storage_simply_remove(app->storage, script_path);
                 wifi_marauder_script_free(app->script);
                 app->script = NULL;
+
+                DialogMessage* message = dialog_message_alloc();
+                dialog_message_set_text(message, "Deleted!", 88, 32, AlignCenter, AlignCenter);
+                dialog_message_set_icon(message, &I_DolphinCommon_56x48, 5, 6);
+                dialog_message_set_buttons(message, NULL, "Ok", NULL);
+                dialog_message_show(app->dialogs, message);
+                dialog_message_free(message);
             }
         }
         scene_manager_previous_scene(app->scene_manager);

applications/external/wifi_marauder_companion/scenes/wifi_marauder_scene_script_stage_add.c

@@ -181,20 +181,20 @@ void wifi_marauder_scene_script_stage_add_on_enter(void* context) {
     submenu_set_header(script_stage_add_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_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);

applications/external/wifi_marauder_companion/scenes/wifi_marauder_scene_user_input.c

@@ -1,6 +1,26 @@
 #include "../wifi_marauder_app_i.h"
 
-void wifi_marauder_scene_user_input_callback(void* context) {
+bool wifi_marauder_scene_user_input_validator_number_callback(const char* text, FuriString* error, void* context) {
+    UNUSED(context);
+    for (int i = 0; text[i] != '\0'; i++) {
+        if (text[i] < '0' || text[i] > '9') {
+            furi_string_printf(error, "This is not\na valid\nnumber!");
+            return false;
+        }
+    }
+    return true;
+}
+
+bool wifi_marauder_scene_user_input_validator_file_callback(const char* text, FuriString* error, void* context) {
+    UNUSED(context);
+    if (strlen(text) == 0) {
+        furi_string_printf(error, "File name\ncannot be\nblank!");
+        return false;
+    }
+    return true;
+}
+
+void wifi_marauder_scene_user_input_ok_callback(void* context) {
     WifiMarauderApp* app = context;
 
     File* file = NULL;
@@ -62,6 +82,7 @@ void wifi_marauder_scene_user_input_on_enter(void* context) {
         // 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);
             if (app->user_input_string_reference != NULL) {
                 strncpy(app->user_input_store, *app->user_input_string_reference, strlen(*app->user_input_string_reference) + 1);
             }
@@ -69,6 +90,7 @@ void wifi_marauder_scene_user_input_on_enter(void* context) {
         // 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);
             if (app->user_input_number_reference != NULL) {
                 char number_str[32];
                 snprintf(number_str, sizeof(number_str), "%d", *app->user_input_number_reference);
@@ -78,6 +100,7 @@ void wifi_marauder_scene_user_input_on_enter(void* context) {
         // 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);
             break;
         default:
             scene_manager_previous_scene(app->scene_manager);
@@ -86,7 +109,7 @@ void wifi_marauder_scene_user_input_on_enter(void* context) {
 
     text_input_set_result_callback(
         app->user_input,
-        wifi_marauder_scene_user_input_callback,
+        wifi_marauder_scene_user_input_ok_callback,
         app,
         app->user_input_store,
         WIFI_MARAUDER_USER_INPUT_STORE_SIZE,