From 582e11e78f4901fcb8d3b56c26cdae79abd9f822 Mon Sep 17 00:00:00 2001
From: Phil Oliver <3497406+poliver@users.noreply.github.com>
Date: Sun, 28 Sep 2025 13:59:12 -0400
Subject: [PATCH] Make NodeActionDialogs reusable

---
 .../java/com/geeksville/mesh/ui/node/NodeDetail.kt     |  4 +++-
 .../com/geeksville/mesh/ui/node/components/NodeMenu.kt | 10 ++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/geeksville/mesh/ui/node/NodeDetail.kt b/app/src/main/java/com/geeksville/mesh/ui/node/NodeDetail.kt
index 5006ff106..d0ae1f6e6 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/node/NodeDetail.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/node/NodeDetail.kt
@@ -640,7 +640,9 @@ private fun DeviceActions(
             displayIgnoreDialog = false
             displayRemoveDialog = false
         },
-        onAction = { onAction(NodeDetailAction.HandleNodeMenuAction(it)) },
+        onConfirmFavorite = { onAction(NodeDetailAction.HandleNodeMenuAction(NodeMenuAction.Favorite(it))) },
+        onConfirmIgnore = { onAction(NodeDetailAction.HandleNodeMenuAction(NodeMenuAction.Ignore(it))) },
+        onConfirmRemove = { onAction(NodeDetailAction.HandleNodeMenuAction(NodeMenuAction.Remove(it))) },
     )
     TitledCard(title = stringResource(R.string.actions)) {
         SettingsItem(
diff --git a/app/src/main/java/com/geeksville/mesh/ui/node/components/NodeMenu.kt b/app/src/main/java/com/geeksville/mesh/ui/node/components/NodeMenu.kt
index a3e8a0e9b..6f9a98389 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/node/components/NodeMenu.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/node/components/NodeMenu.kt
@@ -30,7 +30,9 @@ fun NodeActionDialogs(
     displayIgnoreDialog: Boolean,
     displayRemoveDialog: Boolean,
     onDismissMenuRequest: () -> Unit,
-    onAction: (NodeMenuAction) -> Unit,
+    onConfirmFavorite: (Node) -> Unit,
+    onConfirmIgnore: (Node) -> Unit,
+    onConfirmRemove: (Node) -> Unit,
 ) {
     if (displayFavoriteDialog) {
         SimpleAlertDialog(
@@ -42,7 +44,7 @@ fun NodeActionDialogs(
             ),
             onConfirm = {
                 onDismissMenuRequest()
-                onAction(NodeMenuAction.Favorite(node))
+                onConfirmFavorite(node)
             },
             onDismiss = onDismissMenuRequest,
         )
@@ -57,7 +59,7 @@ fun NodeActionDialogs(
             ),
             onConfirm = {
                 onDismissMenuRequest()
-                onAction(NodeMenuAction.Ignore(node))
+                onConfirmIgnore(node)
             },
             onDismiss = onDismissMenuRequest,
         )
@@ -68,7 +70,7 @@ fun NodeActionDialogs(
             text = R.string.remove_node_text,
             onConfirm = {
                 onDismissMenuRequest()
-                onAction(NodeMenuAction.Remove(node))
+                onConfirmRemove(node)
             },
             onDismiss = onDismissMenuRequest,
         )