meshtastic/Meshtastic-Apple
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Apple.git synced 2026-04-20 22:13:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

2.7.2 Nav Fixes (#1401)

Browse source 
* 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
This commit is contained in:
Garth Vander Houwen 2025-09-13 20:40:02 -07:00 • committed by GitHub
parent b0eeeaf874
commit 438efc3beb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 9 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Meshtastic/Views/Helpers/CircleText.swift
View file

@ -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 {

2
Meshtastic/Views/Messages/ChannelMessageList.swift
View file

@ -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)
}

13
Meshtastic/Views/Nodes/DeviceMetricsLog.swift
View file

@ -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)

2
Meshtastic/Views/Nodes/Helpers/Map/PositionPopover.swift
View file

@ -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)