From 402f89b91e38c8c3d43576c8bb688a34f19e5425 Mon Sep 17 00:00:00 2001 From: Jake-B Date: Mon, 27 Oct 2025 13:18:31 -0400 Subject: [PATCH] Merge fixes and new way to show IP on Connect view --- Meshtastic/Views/Connect/Connect.swift | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/Meshtastic/Views/Connect/Connect.swift b/Meshtastic/Views/Connect/Connect.swift index d1709726..bb43ae04 100644 --- a/Meshtastic/Views/Connect/Connect.swift +++ b/Meshtastic/Views/Connect/Connect.swift @@ -63,22 +63,10 @@ struct Connect: View { } Text("Connection Name").font(.callout)+Text(": \(connectedDevice.name.addingVariationSelectors)") .font(.callout).foregroundColor(Color.gray) - HStack { + HStack(alignment: .firstTextBaseline) { + TransportIcon(transportType: connectedDevice.transportType) if connectedDevice.transportType == .ble { - // baseline aligned looks better for the signal meter - HStack(alignment: .firstTextBaseline) { - TransportIcon(transportType: connectedDevice.transportType) - connectedDevice.getSignalStrength().map { SignalStrengthIndicator(signalStrength: $0, width: 5, height: 20) } - } - } else if connectedDevice.transportType == .tcp { - // Not baseline aligned looks better for the connection string - HStack { - TransportIcon(transportType: connectedDevice.transportType) - Text("\(connectedDevice.connectionDetails ?? connectedDevice.identifier)") - .foregroundColor(.gray) - } - } else { - TransportIcon(transportType: connectedDevice.transportType) + connectedDevice.getSignalStrength().map { SignalStrengthIndicator(signalStrength: $0, width: 5, height: 20) } } Spacer() }