From 768508aafe69bd54c30e6e91a8768f64f708487d Mon Sep 17 00:00:00 2001
From: Willy-JL <49810075+Willy-JL@users.noreply.github.com>
Date: Thu, 27 Mar 2025 03:28:42 +0000
Subject: [PATCH] GUI: Add submenu_remove_item()

---
 applications/services/gui/modules/submenu.c | 19 +++++++++++++++++++
 applications/services/gui/modules/submenu.h |  8 ++++++++
 targets/f18/api_symbols.csv                 |  3 ++-
 targets/f7/api_symbols.csv                  |  3 ++-
 4 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/applications/services/gui/modules/submenu.c b/applications/services/gui/modules/submenu.c
index 5b1bdccda..cdc1ecc28 100644
--- a/applications/services/gui/modules/submenu.c
+++ b/applications/services/gui/modules/submenu.c
@@ -235,6 +235,25 @@ void submenu_change_item_label(Submenu* submenu, uint32_t index, const char* lab
         true);
 }
 
+void submenu_remove_item(Submenu* submenu, uint32_t index) {
+    furi_check(submenu);
+
+    with_view_model(
+        submenu->view,
+        SubmenuModel * model,
+        {
+            SubmenuItemArray_it_t it;
+            for(SubmenuItemArray_it(it, model->items); !SubmenuItemArray_end_p(it);
+                SubmenuItemArray_next(it)) {
+                if(index == SubmenuItemArray_cref(it)->index) {
+                    SubmenuItemArray_remove(model->items, it);
+                    break;
+                }
+            }
+        },
+        true);
+}
+
 void submenu_reset(Submenu* submenu) {
     furi_check(submenu);
 
diff --git a/applications/services/gui/modules/submenu.h b/applications/services/gui/modules/submenu.h
index e435f94a2..0408d52c0 100644
--- a/applications/services/gui/modules/submenu.h
+++ b/applications/services/gui/modules/submenu.h
@@ -61,6 +61,14 @@ void submenu_add_item(
  */
 void submenu_change_item_label(Submenu* submenu, uint32_t index, const char* label);
 
+/** Remove item from submenu
+ *
+ * @param      submenu           Submenu instance
+ * @param      index             menu item index, used for callback, may be
+ *                               the same with other items, first one is removed
+ */
+void submenu_remove_item(Submenu* submenu, uint32_t index);
+
 /** Remove all items from submenu
  *
  * @param      submenu  Submenu instance
diff --git a/targets/f18/api_symbols.csv b/targets/f18/api_symbols.csv
index 2074fa131..f9cb8b5d4 100644
--- a/targets/f18/api_symbols.csv
+++ b/targets/f18/api_symbols.csv
@@ -1,5 +1,5 @@
 entry,status,name,type,params
-Version,+,82.1,,
+Version,+,82.2,,
 Header,+,applications/services/bt/bt_service/bt.h,,
 Header,+,applications/services/bt/bt_service/bt_keys_storage.h,,
 Header,+,applications/services/cli/cli.h,,
@@ -2712,6 +2712,7 @@ Function,+,submenu_change_item_label,void,"Submenu*, uint32_t, const char*"
 Function,+,submenu_free,void,Submenu*
 Function,+,submenu_get_selected_item,uint32_t,Submenu*
 Function,+,submenu_get_view,View*,Submenu*
+Function,+,submenu_remove_item,void,"Submenu*, uint32_t"
 Function,+,submenu_reset,void,Submenu*
 Function,+,submenu_set_header,void,"Submenu*, const char*"
 Function,+,submenu_set_selected_item,void,"Submenu*, uint32_t"
diff --git a/targets/f7/api_symbols.csv b/targets/f7/api_symbols.csv
index 1168a6eea..a8ce8c145 100644
--- a/targets/f7/api_symbols.csv
+++ b/targets/f7/api_symbols.csv
@@ -1,5 +1,5 @@
 entry,status,name,type,params
-Version,+,82.1,,
+Version,+,82.2,,
 Header,+,applications/drivers/subghz/cc1101_ext/cc1101_ext_interconnect.h,,
 Header,+,applications/services/bt/bt_service/bt.h,,
 Header,+,applications/services/bt/bt_service/bt_keys_storage.h,,
@@ -3561,6 +3561,7 @@ Function,+,submenu_change_item_label,void,"Submenu*, uint32_t, const char*"
 Function,+,submenu_free,void,Submenu*
 Function,+,submenu_get_selected_item,uint32_t,Submenu*
 Function,+,submenu_get_view,View*,Submenu*
+Function,+,submenu_remove_item,void,"Submenu*, uint32_t"
 Function,+,submenu_reset,void,Submenu*
 Function,+,submenu_set_header,void,"Submenu*, const char*"
 Function,+,submenu_set_selected_item,void,"Submenu*, uint32_t"