From 438efc3beb28667fdfb1d788f24e7a5523254859 Mon Sep 17 00:00:00 2001 From: Garth Vander Houwen Date: Sat, 13 Sep 2025 20:40:02 -0700 Subject: [PATCH] 2.7.2 Nav Fixes (#1401) * Bump version * iOS 26 styled keyboard toolbar Update tips backgrounds * Link the logo to the about page * Remove double logo on node list, update scary location log message, update tls toggle visibility and keyboard scroll dismiss on mqtt config * Remove redundant colorScheme check * Change background for textfield from a capsule to a RoundedRectangle * Fix device metrics crash * Add back rule marks for network colors * Remove broken navigation from circle text control. * Move rule marks out of foreach --- Meshtastic/Views/Helpers/CircleText.swift | 9 +-------- Meshtastic/Views/Messages/ChannelMessageList.swift | 2 +- Meshtastic/Views/Nodes/DeviceMetricsLog.swift | 13 ++++++------- .../Views/Nodes/Helpers/Map/PositionPopover.swift | 2 +- 4 files changed, 9 insertions(+), 17 deletions(-) diff --git a/Meshtastic/Views/Helpers/CircleText.swift b/Meshtastic/Views/Helpers/CircleText.swift index 70784d15..f51eeb73 100644 --- a/Meshtastic/Views/Helpers/CircleText.swift +++ b/Meshtastic/Views/Helpers/CircleText.swift @@ -10,16 +10,9 @@ struct CircleText: View { var text: String var color: Color var circleSize: CGFloat = 45 - var node: NodeInfoEntity? var body: some View { - if let node = node { - NavigationLink(destination: NodeDetail(node: node)) { - circleContent - } - } else { - circleContent - } + circleContent } var circleContent: some View { diff --git a/Meshtastic/Views/Messages/ChannelMessageList.swift b/Meshtastic/Views/Messages/ChannelMessageList.swift index 9cc91658..548205d0 100644 --- a/Meshtastic/Views/Messages/ChannelMessageList.swift +++ b/Meshtastic/Views/Messages/ChannelMessageList.swift @@ -98,7 +98,7 @@ struct ChannelMessageList: View { HStack(alignment: .bottom) { if currentUser { Spacer(minLength: 50) } if !currentUser { - CircleText(text: message.fromUser?.shortName ?? "?", color: Color(UIColor(hex: UInt32(message.fromUser?.num ?? 0))), circleSize: 44, node: getNodeInfo(id: Int64(message.fromUser?.num ?? 0), context: context)) + CircleText(text: message.fromUser?.shortName ?? "?", color: Color(UIColor(hex: UInt32(message.fromUser?.num ?? 0))), circleSize: 44) .padding(.all, 5) .offset(y: -7) } diff --git a/Meshtastic/Views/Nodes/DeviceMetricsLog.swift b/Meshtastic/Views/Nodes/DeviceMetricsLog.swift index 85352c5d..80d47fbd 100644 --- a/Meshtastic/Views/Nodes/DeviceMetricsLog.swift +++ b/Meshtastic/Views/Nodes/DeviceMetricsLog.swift @@ -67,13 +67,6 @@ struct DeviceMetricsLog: View { RuleMark(x: .value("Second", chartSelection, unit: .second)) .foregroundStyle(.tertiary.opacity(0.5)) } - RuleMark(y: .value("Network Status Orange", 25)) - .lineStyle(StrokeStyle(lineWidth: 1, dash: [5, 10])) - .foregroundStyle(.orange) - RuleMark(y: .value("Network Status Red", 50)) - .lineStyle(StrokeStyle(lineWidth: 1, dash: [5, 10])) - .foregroundStyle(.red) - if let airUtilTx = point.airUtilTx { Plot { PointMark( @@ -88,6 +81,12 @@ struct DeviceMetricsLog: View { } } } + RuleMark(y: .value("Network Status Orange", 25)) + .lineStyle(StrokeStyle(lineWidth: 1, dash: [5, 10])) + .foregroundStyle(.orange) + RuleMark(y: .value("Network Status Red", 50)) + .lineStyle(StrokeStyle(lineWidth: 1, dash: [5, 10])) + .foregroundStyle(.red) } .chartXAxis(content: { AxisMarks(position: .top) diff --git a/Meshtastic/Views/Nodes/Helpers/Map/PositionPopover.swift b/Meshtastic/Views/Nodes/Helpers/Map/PositionPopover.swift index 65cb56e0..846058e6 100644 --- a/Meshtastic/Views/Nodes/Helpers/Map/PositionPopover.swift +++ b/Meshtastic/Views/Nodes/Helpers/Map/PositionPopover.swift @@ -40,7 +40,7 @@ struct PositionPopover: View { } .frame(width: 90, height: 90) } - CircleText(text: position.nodePosition?.user?.shortName ?? "?", color: Color(nodeColor), circleSize: 65, node: getNodeInfo(id: Int64(position.nodePosition?.user?.num ?? 0), context: context)) + CircleText(text: position.nodePosition?.user?.shortName ?? "?", color: Color(nodeColor), circleSize: 65) } Text(position.nodePosition?.user?.longName ?? "Unknown") .font(.largeTitle)