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

Updates for node details

Browse source
This commit is contained in:
Garth Vander Houwen 2022-09-13 07:10:02 -07:00
parent 01b22180b7
commit f5463e3633
2 changed files with 17 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Meshtastic/MeshtasticApp.swift
View file

@ -31,7 +31,7 @@ struct MeshtasticAppleApp: App {
saveQR = true
}
print("User wants to open URL: \(channelUrl?.relativeString)")
print("User wants to open URL: \(String(describing: channelUrl?.relativeString))")
}
.sheet(isPresented: $saveQR) {

31
Meshtastic/Views/Nodes/NodeDetail.swift
View file

@ -23,7 +23,7 @@ struct NodeDetail: View {
let hwModelString = node.user?.hwModel ?? "UNSET"
ZStack {
NavigationStack {
GeometryReader { bounds in
@ -64,7 +64,7 @@ struct NodeDetail: View {
)
}
.ignoresSafeArea(.all, edges: [.leading, .trailing])
.frame(idealWidth: bounds.size.width, minHeight: bounds.size.height / 1.6)
.frame(idealWidth: bounds.size.width, minHeight: bounds.size.height / 2)
}
}
Text("Sats: \(mostRecent.satsInView)").offset( y:-40)
@ -399,45 +399,47 @@ struct NodeDetail: View {
Text("MAC Address: ")
Text(String(node.user?.macaddr?.macAddressString ?? "not a valid mac address")).foregroundColor(.gray)
}
.padding([.bottom], 0)
}
List {
VStack {
if (node.positions?.count ?? 0) > 0 {
Divider()
NavigationLink {
LocationHistory(node: node)
} label: {
Image(systemName: "building.columns")
.symbolRenderingMode(.hierarchical)
.font(.title)
Text("Position History \(node.positions?.count ?? 0) Points")
Text("Position History (\(node.positions?.count ?? 0) Points)")
.font(.title3)
}
.fixedSize(horizontal: false, vertical: true)
}
if (node.telemetries?.count ?? 0) > 0 {
Divider()
NavigationLink {
TelemetryLog(node: node)
} label: {
Image(systemName: "chart.xyaxis.line")
.symbolRenderingMode(.hierarchical)
.font(.title)
Text("Telemetry Log \(node.telemetries?.count ?? 0) Readings")
Text("Telemetry Log (\(node.telemetries?.count ?? 0) Readings)")
.font(.title3)
}
.fixedSize(horizontal: false, vertical: true)
Divider()
}
}
.listStyle(GroupedListStyle())
.frame(minHeight: 170)
.padding(0)
}
.offset( y: (node.myInfo?.hasGps ?? false ? 0 : -40))
.offset( y:-40)
}
.edgesIgnoringSafeArea([.leading, .trailing])
}
@ -462,7 +464,6 @@ struct NodeDetail: View {
self.initialLoad = false
}
}
}
}