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

Merge pull request #161 from meshtastic/text_size_cleanup

Browse source 
Update node list text sizes and spacing, fix extra padding on node de…
This commit is contained in:
Garth Vander Houwen 2022-09-03 08:54:28 -07:00 • committed by GitHub
commit d828038936
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Meshtastic/Views/Helpers/LastHeardText.swift
View file

@ -13,7 +13,7 @@ struct LastHeardText: View {
var body: some View {
if (lastHeard != nil && lastHeard! >= sixMonthsAgo!){
Text("Last Heard: \(lastHeard!, style: .relative) ago")
Text("Heard: \(lastHeard!, style: .relative) ago")
} else {

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

@ -432,7 +432,7 @@ struct NodeDetail: View {
.frame(minHeight:170)
.padding(0)
}
.offset( y:-40)
.offset( y: (node.myInfo!.hasGps ? 0 : -40))
}
.edgesIgnoringSafeArea([.leading, .trailing])
}

23
Meshtastic/Views/Nodes/NodeList.swift
View file

@ -65,7 +65,7 @@ struct NodeList: View {
Text(node.user?.longName ?? "Unknown").font(.title2).offset(x: -15)
}
}
.padding(.bottom, 10)
.padding(.bottom, 5)
if connected {
@ -81,20 +81,10 @@ struct NodeList: View {
Text("Currently Connected").font(.title3).foregroundColor(Color.accentColor)
}
}
.padding(.bottom, 2)
}
Spacer()
HStack(alignment: .bottom) {
Image(systemName: "clock.badge.checkmark.fill").font(.title3)
.foregroundColor(.accentColor).symbolRenderingMode(.hierarchical)
LastHeardText(lastHeard: node.lastHeard).font(.subheadline).foregroundColor(.gray)
}
if node.positions?.count ?? 0 > 0 && (bleManager.connectedPeripheral != nil && bleManager.connectedPeripheral.num != node.num) {
Spacer()
HStack(alignment: .bottom) {
let lastPostion = node.positions!.reversed()[0] as! PositionEntity
@ -120,6 +110,15 @@ struct NodeList: View {
}
}
}
.padding(.bottom, 2)
}
HStack(alignment: .bottom) {
Image(systemName: "clock.badge.checkmark.fill").font(.headline)
.foregroundColor(.accentColor).symbolRenderingMode(.hierarchical)
LastHeardText(lastHeard: node.lastHeard).font(.subheadline).foregroundColor(.gray)
}
}
.padding([.leading, .top, .bottom])