Merge pull request #159 from meshtastic/position_flags

Config Updates
This commit is contained in:
Garth Vander Houwen 2022-09-01 22:10:14 -07:00 committed by GitHub
commit abd24e45c1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 11 deletions

View file

@ -23,7 +23,7 @@ struct NodeDetail: View {
let hwModelString = node.user?.hwModel ?? "UNSET"
HStack {
ZStack {
GeometryReader { bounds in
@ -64,10 +64,10 @@ struct NodeDetail: View {
)
}
.ignoresSafeArea(.all, edges: [.leading, .trailing])
.frame(idealWidth: bounds.size.width, minHeight: bounds.size.height / 2)
.frame(idealWidth: bounds.size.width, minHeight: bounds.size.height / 1.75)
}
}
//Text("\(mostRecent.satsInView)")
Text("Sats: \(mostRecent.satsInView)").offset( y:-40)
} else {
Image(node.user?.hwModel ?? "UNSET")
@ -432,6 +432,7 @@ struct NodeDetail: View {
.frame(minHeight:170)
.padding(0)
}
.offset( y:-40)
}
.edgesIgnoringSafeArea([.leading, .trailing])
}

View file

@ -87,15 +87,9 @@ struct NodeList: View {
Image(systemName: "clock.badge.checkmark.fill").font(.title3)
.foregroundColor(.accentColor).symbolRenderingMode(.hierarchical)
if UIDevice.current.userInterfaceIdiom == .pad || UIDevice.current.userInterfaceIdiom == .mac {
LastHeardText(lastHeard: node.lastHeard).font(.subheadline).foregroundColor(.gray)
} else {
LastHeardText(lastHeard: node.lastHeard).font(.title3).foregroundColor(.gray)
}
}
if node.positions?.count ?? 0 > 0 && (bleManager.connectedPeripheral != nil && bleManager.connectedPeripheral.num != node.num) {

View file

@ -120,7 +120,7 @@ struct BluetoothConfig: View {
}
}
}
.navigationTitle("Display Config")
.navigationTitle("Bluetooth (BLE) Config")
.navigationBarItems(trailing:
ZStack {