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

Use a table for position grid on iPad and mac

Browse source
This commit is contained in:
Garth Vander Houwen 2022-10-04 12:11:55 -07:00
parent c52bc91a8e
commit 2419169026
2 changed files with 79 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -89,12 +89,8 @@ struct NodeDetail: View {
VStack(alignment: .center) {
Text("AKA").font(.largeTitle)
.foregroundColor(.gray).fixedSize()
.offset(y:5)
CircleText(text: node.user?.shortName ?? "???", color: .accentColor, circleSize: 75, fontSize: 26)
}
.padding()
Divider()
@ -105,15 +101,14 @@ struct NodeDetail: View {
Image(hwModelString)
.resizable()
.aspectRatio(contentMode: .fill)
.frame(width: 200, height: 200)
.frame(width: 75, height: 75)
.cornerRadius(5)
Text(String(hwModelString))
.foregroundColor(.gray)
.font(.largeTitle).fixedSize()
.font(.title).fixedSize()
}
}
.padding()
if node.snr > 0 {

123
Meshtastic/Views/Nodes/PositionLog.swift
View file

@ -21,57 +21,88 @@ struct PositionLog: View {
var body: some View {
NavigationStack {
ScrollView {
Grid(alignment: .topLeading, horizontalSpacing: 2) {
if UIDevice.current.userInterfaceIdiom == .pad || UIDevice.current.userInterfaceIdiom == .mac {
//Add a table for mac and ipad
}
GridRow {
Text("Lat / Long")
.font(.caption2)
.fontWeight(.bold)
Text("Sat")
.font(.caption2)
.fontWeight(.bold)
Text("Alt")
.font(.caption2)
.fontWeight(.bold)
Text("Spd")
.font(.caption2)
.fontWeight(.bold)
Text("Hd")
.font(.caption2)
.fontWeight(.bold)
Text("Timestamp")
.font(.caption2)
.fontWeight(.bold)
}
Divider()
ForEach(node.positions!.reversed() as! [PositionEntity], id: \.self) { (mappin: PositionEntity) in
GridRow {
Text("\(String(mappin.latitude ?? 0)) \(String(mappin.longitude ?? 0))")
.font(.caption2)
Text(String(mappin.satsInView))
.font(.caption2)
Text(String(mappin.altitude))
.font(.caption2)
Text(String(mappin.speed))
.font(.caption2)
Text(String(mappin.heading))
.font(.caption2)
Text(mappin.time?.formattedDate(format: "MM/dd/yy hh:mm") ?? "Unknown time")
.font(.caption2)
if UIDevice.current.userInterfaceIdiom == .pad || UIDevice.current.userInterfaceIdiom == .mac {
//Add a table for mac and ipad
VStack {
// Speed, Heading, Timestamp"
Table(node.positions!.reversed() as! [PositionEntity]) {
TableColumn("SeqNo") { position in
Text(String(position.seqNo))
}
.width(75)
TableColumn("Latitude") { position in
Text(String(format: "%.6f", position.latitude ?? 0))
}
TableColumn("Longitude") { position in
Text(String(format: "%.6f", position.longitude ?? 0))
}
TableColumn("Altitude") { position in
Text(String(position.altitude))
}
.width(75)
TableColumn("Sats") { position in
Text(String(position.satsInView))
}
.width(75)
TableColumn("Speed") { position in
Text(String(position.speed))
}
.width(75)
TableColumn("Heading") { position in
Text(String(position.heading))
}
TableColumn("Time Stamp") { position in
Text(position.time?.formattedDate(format: "MM/dd/yy hh:mm") ?? "Unknown time")
}
}
}
.padding(.leading, 15)
.padding(.trailing, 5)
} else {
ScrollView {
// Use a grid on iOS as a table only shows a single column
Grid(alignment: .topLeading, horizontalSpacing: 2) {
GridRow {
Text("Latitude")
.font(.caption2)
.fontWeight(.bold)
Text("Longitude")
.font(.caption2)
.fontWeight(.bold)
Text("Sats")
.font(.caption2)
.fontWeight(.bold)
Text("Alt")
.font(.caption2)
.fontWeight(.bold)
Text("Timestamp")
.font(.caption2)
.fontWeight(.bold)
}
Divider()
ForEach(node.positions!.reversed() as! [PositionEntity], id: \.self) { (mappin: PositionEntity) in
GridRow {
Text(String(mappin.latitude ?? 0))
.font(.caption2)
Text(String(mappin.longitude ?? 0))
.font(.caption2)
Text(String(mappin.satsInView))
.font(.caption2)
Text(String(mappin.altitude))
.font(.caption2)
Text(mappin.time?.formattedDate(format: "MM/dd/yy hh:mm") ?? "Unknown time")
.font(.caption2)
}
}
}
.padding(.leading, 15)
.padding(.trailing, 5)
}
}
HStack {
Button(role: .destructive) {