From 49aed9517edca37e4b411d2df183bbffd7f51e9e Mon Sep 17 00:00:00 2001 From: Garth Vander Houwen Date: Sun, 5 Feb 2023 11:15:59 -0800 Subject: [PATCH] Clean up admin message log --- Meshtastic/Helpers/BLEManager.swift | 4 +-- .../Views/Settings/AdminMessageList.swift | 33 +++++++++---------- 2 files changed, 18 insertions(+), 19 deletions(-) diff --git a/Meshtastic/Helpers/BLEManager.swift b/Meshtastic/Helpers/BLEManager.swift index cf8f9510..746429ca 100644 --- a/Meshtastic/Helpers/BLEManager.swift +++ b/Meshtastic/Helpers/BLEManager.swift @@ -972,7 +972,7 @@ class BLEManager: NSObject, CBPeripheralDelegate, ObservableObject { meshPacket.decoded = dataMessage - let messageDescription = "Requested Channel \(channel.index) for \(toUser.longName ?? NSLocalizedString("unknown", comment: "Unknown"))" + let messageDescription = "🎛️ Requested Channel \(channel.index) for \(toUser.longName ?? NSLocalizedString("unknown", comment: "Unknown"))" if sendAdminMessageToRadio(meshPacket: meshPacket, adminDescription: messageDescription, fromUser: fromUser, toUser: toUser) { @@ -997,7 +997,7 @@ class BLEManager: NSObject, CBPeripheralDelegate, ObservableObject { dataMessage.wantResponse = true meshPacket.decoded = dataMessage - let messageDescription = "Saved Channel \(channel.index) for \(toUser.longName ?? NSLocalizedString("unknown", comment: "Unknown"))" + let messageDescription = "🛟 Saved Channel \(channel.index) for \(toUser.longName ?? NSLocalizedString("unknown", comment: "Unknown"))" if sendAdminMessageToRadio(meshPacket: meshPacket, adminDescription: messageDescription, fromUser: fromUser, toUser: toUser) { return Int64(meshPacket.id) diff --git a/Meshtastic/Views/Settings/AdminMessageList.swift b/Meshtastic/Views/Settings/AdminMessageList.swift index 9e597164..13d798c8 100644 --- a/Meshtastic/Views/Settings/AdminMessageList.swift +++ b/Meshtastic/Views/Settings/AdminMessageList.swift @@ -30,27 +30,26 @@ struct AdminMessageList: View { VStack (alignment: .leading) { - Text("\(am.adminDescription ?? NSLocalizedString("unknown", comment: "Unknown")) - \(Date(timeIntervalSince1970: TimeInterval(am.messageTimestamp)).formattedDate(format: dateFormatString))") + Text("\(am.adminDescription ?? NSLocalizedString("unknown", comment: "Unknown"))") + .font(.caption) + + Text("Sent \(Date(timeIntervalSince1970: TimeInterval(am.messageTimestamp)).formattedDate(format: dateFormatString))") + .foregroundColor(.gray) .font(.caption2) - HStack{ - if am.receivedACK { - - Image(systemName: "checkmark.square") - .foregroundColor(.gray) - .font(.caption) - Text("routing.acknowledged").foregroundColor(.gray).font(.caption) + Text(": \(Date(timeIntervalSince1970: TimeInterval(am.ackTimestamp)).formattedDate(format: "h:mm:ss a"))") - .foregroundColor(.gray) - .font(.caption) - - } else { - let ackErrorVal = RoutingError(rawValue: Int(am.ackError)) - Image(systemName: "square") - .foregroundColor(.gray) - .font(.caption) + HStack (spacing: 0) { + let ackErrorVal = RoutingError(rawValue: Int(am.ackError)) + + if am.ackTimestamp > 0 { Text(ackErrorVal?.display ?? "Empty Ack Error") + .foregroundColor(am.receivedACK ? .gray : .red) + .font(.caption2) + } + + if am.receivedACK && am.ackTimestamp > 0 { + Text(" \(Date(timeIntervalSince1970: TimeInterval(am.ackTimestamp)).formattedDate(format: "h:mm:ss a"))") .foregroundColor(.gray) - .font(.caption) + .font(.caption2) } } }