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

Fix merge conflicts

Browse source
This commit is contained in:
Garth Vander Houwen 2025-02-11 09:53:25 -08:00
parent 85dcc3b890
commit 5b266a05f8
3 changed files with 159 additions and 4992 deletions
Download patch file Download diff file Expand all files Collapse all files

5121
Localizable.xcstrings
View file

File diff suppressed because it is too large Load diff

26
Meshtastic/Views/Nodes/Helpers/NodeDetail.swift
View file

@ -260,17 +260,6 @@ struct NodeDetail: View {
}
.disabled(!node.hasDeviceMetrics)
NavigationLink {
PowerMetricsLog(node: node)
} label: {
Label {
Text("Power Metrics Log")
} icon: {
Image(systemName: "bolt")
.symbolRenderingMode(.multicolor)
}
}
.disabled(!node.hasPowerMetrics)
NavigationLink {
NodeMapSwiftUI(node: node, showUserLocation: connectedNode?.num ?? 0 == node.num)
@ -320,6 +309,18 @@ struct NodeDetail: View {
}
.disabled(node.traceRoutes?.count ?? 0 == 0)
NavigationLink {
PowerMetricsLog(node: node)
} label: {
Label {
Text("Power Metrics Log")
} icon: {
Image(systemName: "bolt")
.symbolRenderingMode(.multicolor)
}
}
.disabled(!node.hasPowerMetrics)
NavigationLink {
DetectionSensorLog(node: node)
} label: {
@ -378,9 +379,6 @@ struct NodeDetail: View {
node: node
)
}
if node.hasPositions {
NavigateToButton(node: node)
}
IgnoreNodeButton(
bleManager: bleManager,
context: context,

4
Meshtastic/Views/Nodes/Helpers/NodeListItem.swift
View file

@ -102,13 +102,13 @@ struct NodeListItem: View {
.font(UIDevice.current.userInterfaceIdiom == .phone ? .callout : .caption)
.foregroundColor(.gray)
let trueBearing = getBearingBetweenTwoPoints(point1: myCoord, point2: nodeCoord)
let headingDegrees = Measurement(value: trueBearing, unit: UnitAngle.degrees).reciprocal()
let headingDegrees = Measurement(value: trueBearing, unit: UnitAngle.degrees)
Image(systemName: "location.north")
.font(.callout)
.symbolRenderingMode(.multicolor)
.clipShape(Circle())
.rotationEffect(Angle(degrees: headingDegrees.value))
let heading = Measurement(value: trueBearing, unit: UnitAngle.degrees).reciprocal()
let heading = Measurement(value: trueBearing, unit: UnitAngle.degrees)
Text("\(heading.formatted(.measurement(width: .narrow, numberFormatStyle: .number.precision(.fractionLength(0)))))")
.font(UIDevice.current.userInterfaceIdiom == .phone ? .callout : .caption)
.foregroundColor(.gray)