From badc658cbae1c7e0b73cfa5dcf31be5ce3ec1ce7 Mon Sep 17 00:00:00 2001 From: Garth Vander Houwen Date: Fri, 29 Mar 2024 17:56:54 -0700 Subject: [PATCH] Clean up admin drop down list --- Meshtastic/Views/Settings/Settings.swift | 30 ++++++++++++++++-------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/Meshtastic/Views/Settings/Settings.swift b/Meshtastic/Views/Settings/Settings.swift index 3db5cb86..ec2c747f 100644 --- a/Meshtastic/Views/Settings/Settings.swift +++ b/Meshtastic/Views/Settings/Settings.swift @@ -109,17 +109,27 @@ struct Settings: View { } ForEach(nodes) { node in - if !node.viaMqtt { - if node.num == bleManager.connectedPeripheral?.num ?? 0 { - Text("BLE Config: \(node.user?.longName ?? "unknown".localized)") - .tag(Int(node.num)) - } else if node.metadata != nil { - Text("Remote Config: \(node.user?.longName ?? "unknown".localized)") - .tag(Int(node.num)) - } else if hasAdmin { - Text("Request Admin: \(node.user?.longName ?? "unknown".localized)") - .tag(Int(node.num)) + if node.num == bleManager.connectedPeripheral?.num ?? 0 { + Label { + Text("BLE: \(node.user?.longName ?? "unknown".localized)") + } icon: { + Image(systemName: "antenna.radiowaves.left.and.right") } + .tag(Int(node.num)) + } else if node.metadata != nil { + Label { + Text("Remote: \(node.user?.longName ?? "unknown".localized)") + } icon: { + Image(systemName: "av.remote") + } + .tag(Int(node.num)) + } else if hasAdmin { + Label { + Text("Request Admin: \(node.user?.longName ?? "unknown".localized)") + } icon: { + Image(systemName: "rectangle.and.hand.point.up.left") + } + .tag(Int(node.num)) } } }