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

V 1.26.1 Fixed connectedNode not being set bug by matching via bluetooth device name and user.id, cleanup for app settings

Browse source
This commit is contained in:
Garth Vander Houwen 2021-10-17 20:30:04 -07:00
parent 5d12cca775
commit ce4eec7900
11 changed files with 47 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

16
MeshtasticClient/Views/Nodes/NodeDetail.swift
View file

@ -39,7 +39,7 @@ struct NodeDetail: View {
MapAnnotation(
coordinate: location.coordinate,
content: {
CircleText(text: node.user.shortName, color: Color.blue)
CircleText(text: node.user.shortName, color: .accentColor)
}
)
}.frame(idealWidth: bounds.size.width, minHeight: bounds.size.height / 2)
@ -57,7 +57,7 @@ struct NodeDetail: View {
VStack(alignment: .center) {
Text("AKA").font(.title2).fixedSize()
CircleText(text: node.user.shortName, color: Color.blue)
CircleText(text: node.user.shortName, color: .accentColor)
.offset(y:10)
}
.padding([.leading, .trailing, .bottom])
@ -67,7 +67,7 @@ struct NodeDetail: View {
Image(systemName: "waveform.path")
.font(.title)
.foregroundColor(.blue)
.foregroundColor(.accentColor)
.symbolRenderingMode(.hierarchical)
Text("SNR").font(.title2).fixedSize()
Text(String(node.snr ?? 0))
@ -77,7 +77,7 @@ struct NodeDetail: View {
Divider()
}
VStack(alignment: .center) {
BatteryIcon(batteryLevel: node.position.batteryLevel, font: .title, color: Color.blue)
BatteryIcon(batteryLevel: node.position.batteryLevel, font: .title, color: .accentColor)
if node.position.batteryLevel != nil && node.position.batteryLevel! > 0 {
Text("Battery").font(.title2).fixedSize()
Text(String(node.position.batteryLevel!) + "%")
@ -109,7 +109,7 @@ struct NodeDetail: View {
HStack{
Image(systemName: "clock").font(.title2).foregroundColor(.blue)
Image(systemName: "clock").font(.title2).foregroundColor(.accentColor)
let lastHeard = Date(timeIntervalSince1970: TimeInterval(node.lastHeard))
Text("Last Heard: \(lastHeard, style: .relative) ago").font(.title3)
}.padding()
@ -118,7 +118,7 @@ struct NodeDetail: View {
if node.position.coordinate != nil {
HStack(alignment: /*@START_MENU_TOKEN@*/.center/*@END_MENU_TOKEN@*/, spacing: 14) {
Image(systemName: "mappin").font(.title).foregroundColor(.blue)
Image(systemName: "mappin").font(.title).foregroundColor(.accentColor)
VStack(alignment: .leading) {
Text("Latitude").font(.headline)
Text(String(node.position.latitude ?? 0)).font(.caption).foregroundColor(.gray)
@ -139,7 +139,7 @@ struct NodeDetail: View {
HStack (alignment: .center) {
VStack {
HStack{
Image(systemName: "person").font(.title3).foregroundColor(.blue)
Image(systemName: "person").font(.title3).foregroundColor(.accentColor)
Text("Unique Id:").font(.title3)
}
Text(node.user.id).font(.headline).foregroundColor(.gray)
@ -147,7 +147,7 @@ struct NodeDetail: View {
Divider()
VStack {
HStack {
Image(systemName: "number").font(.title3).foregroundColor(.blue)
Image(systemName: "number").font(.title3).foregroundColor(.accentColor)
Text("Node Number:").font(.title3)
}
Text(String(node.num)).font(.headline).foregroundColor(.gray)

2
MeshtasticClient/Views/Nodes/NodeMap.swift
View file

@ -52,7 +52,7 @@ struct NodeMap: View {
MapAnnotation(
coordinate: location.position.coordinate!,
content: {
CircleText(text: location.user.shortName, color: Color.blue)
CircleText(text: location.user.shortName, color: .accentColor)
}
)
}

4
MeshtasticClient/Views/Nodes/NodeRow.swift
View file

@ -9,7 +9,7 @@ struct NodeRow: View {
HStack() {
CircleText(text: node.user.shortName, color: Color.blue).offset(y: 1).padding(.trailing, 5)
CircleText(text: node.user.shortName, color: Color.accentColor).offset(y: 1).padding(.trailing, 5)
.offset(x: -15)
if UIDevice.current.userInterfaceIdiom == .pad {
@ -25,7 +25,7 @@ struct NodeRow: View {
HStack (alignment: .bottom){
Image(systemName: "clock.badge.checkmark.fill").font(.headline).foregroundColor(.blue).symbolRenderingMode(.hierarchical)
Image(systemName: "clock.badge.checkmark.fill").font(.headline).foregroundColor(.accentColor).symbolRenderingMode(.hierarchical)
if UIDevice.current.userInterfaceIdiom == .pad {