mirror of
https://github.com/meshtastic/Meshtastic-Apple.git
synced 2026-04-20 22:13:56 +00:00
revert the last heard text changes on the list view, since that impacts performace
This commit is contained in:
parent
179dec259b
commit
6dd7d60b3c
2 changed files with 11 additions and 12 deletions
|
|
@ -8,15 +8,9 @@ import SwiftUI
|
|||
struct LastHeardText: View {
|
||||
var lastHeard: Date?
|
||||
|
||||
static let formatter: RelativeDateTimeFormatter = {
|
||||
let formatter = RelativeDateTimeFormatter()
|
||||
formatter.unitsStyle = .full
|
||||
return formatter
|
||||
}()
|
||||
|
||||
var body: some View {
|
||||
if let lastHeard, lastHeard.timeIntervalSince1970 > 0, let text = Self.formatter.string(for: lastHeard) {
|
||||
Text(text)
|
||||
if let lastHeard, lastHeard.timeIntervalSince1970 > 0 {
|
||||
Text(lastHeard.formatted())
|
||||
} else {
|
||||
Text("unknown")
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,6 +10,11 @@ import CoreLocation
|
|||
import OSLog
|
||||
|
||||
struct NodeDetail: View {
|
||||
private static let relativeFormatter: RelativeDateTimeFormatter = {
|
||||
let formatter = RelativeDateTimeFormatter()
|
||||
formatter.unitsStyle = .full
|
||||
return formatter
|
||||
}()
|
||||
|
||||
@Environment(\.managedObjectContext) var context
|
||||
@EnvironmentObject var bleManager: BLEManager
|
||||
|
|
@ -129,7 +134,7 @@ struct NodeDetail: View {
|
|||
}
|
||||
}
|
||||
|
||||
if let firstHeard = node.firstHeard {
|
||||
if let firstHeard = node.firstHeard, let text = Self.relativeFormatter.string(for: firstHeard) {
|
||||
HStack {
|
||||
Label {
|
||||
Text("First heard")
|
||||
|
|
@ -139,12 +144,12 @@ struct NodeDetail: View {
|
|||
}
|
||||
Spacer()
|
||||
|
||||
LastHeardText(lastHeard: firstHeard)
|
||||
Text(text)
|
||||
.textSelection(.enabled)
|
||||
}
|
||||
}
|
||||
|
||||
if let lastHeard = node.lastHeard {
|
||||
if let lastHeard = node.lastHeard, let text = Self.relativeFormatter.string(for: lastHeard) {
|
||||
HStack {
|
||||
Label {
|
||||
Text("Last heard")
|
||||
|
|
@ -154,7 +159,7 @@ struct NodeDetail: View {
|
|||
}
|
||||
Spacer()
|
||||
|
||||
LastHeardText(lastHeard: lastHeard)
|
||||
Text(text)
|
||||
.textSelection(.enabled)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue