From 8977dfd18bfcf2759a97e1475913724ba5db23da Mon Sep 17 00:00:00 2001 From: Garth Vander Houwen Date: Tue, 26 Jul 2022 21:52:36 -0700 Subject: [PATCH] Bump version to 1.3.27 --- Meshtastic.xcodeproj/project.pbxproj | 4 ++-- Meshtastic/Views/Bluetooth/Connect.swift | 2 +- Meshtastic/Views/Settings/AdminMessageList.swift | 6 +++--- Meshtastic/Views/Settings/Config/DeviceConfig.swift | 7 ++++--- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/Meshtastic.xcodeproj/project.pbxproj b/Meshtastic.xcodeproj/project.pbxproj index 42c3eeb2..be06040b 100644 --- a/Meshtastic.xcodeproj/project.pbxproj +++ b/Meshtastic.xcodeproj/project.pbxproj @@ -875,7 +875,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.3.25; + MARKETING_VERSION = 1.3.27; PRODUCT_BUNDLE_IDENTIFIER = gvh.MeshtasticClient; PRODUCT_NAME = "$(TARGET_NAME)"; SUPPORTS_MACCATALYST = YES; @@ -907,7 +907,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.3.25; + MARKETING_VERSION = 1.3.27; PRODUCT_BUNDLE_IDENTIFIER = gvh.MeshtasticClient; PRODUCT_NAME = "$(TARGET_NAME)"; SUPPORTS_MACCATALYST = YES; diff --git a/Meshtastic/Views/Bluetooth/Connect.swift b/Meshtastic/Views/Bluetooth/Connect.swift index 5268c5e2..b8e59b63 100644 --- a/Meshtastic/Views/Bluetooth/Connect.swift +++ b/Meshtastic/Views/Bluetooth/Connect.swift @@ -22,7 +22,7 @@ struct Connect: View { @State var isPreferredRadio: Bool = false @State var firmwareVersion = "0.0.0" - @State var minimumVersion = "1.3.25" + @State var minimumVersion = "1.3.27" @State var invalidVersion = false diff --git a/Meshtastic/Views/Settings/AdminMessageList.swift b/Meshtastic/Views/Settings/AdminMessageList.swift index e2353961..d52e3fd7 100644 --- a/Meshtastic/Views/Settings/AdminMessageList.swift +++ b/Meshtastic/Views/Settings/AdminMessageList.swift @@ -29,7 +29,7 @@ struct AdminMessageList: View { HStack { - Text("\(am.adminDescription ?? "Unknown") - \(Date(timeIntervalSince1970: TimeInterval(am.messageTimestamp)), style: .date) \(Date(timeIntervalSince1970: TimeInterval(am.messageTimestamp)), style: .time)") + Text("\(am.adminDescription ?? "Unknown") - \(Date(timeIntervalSince1970: TimeInterval(am.messageTimestamp)), style: .date) \(Date(timeIntervalSince1970: TimeInterval(am.messageTimestamp)).formattedDate(format: "h:mm:ss a"))") .font(.caption) if am.receivedACK { @@ -37,10 +37,10 @@ struct AdminMessageList: View { Image(systemName: "checkmark.square") .foregroundColor(.gray) .font(.caption) - Text("Acknowledged: \(Date(timeIntervalSince1970: TimeInterval(am.messageTimestamp)), style: .time)") + Text("Acknowledged: \(Date(timeIntervalSince1970: TimeInterval(am.ackTimestamp)).formattedDate(format: "h:mm:ss a"))") .foregroundColor(.gray) .font(.caption) - + } else { Image(systemName: "square") .foregroundColor(.gray) diff --git a/Meshtastic/Views/Settings/Config/DeviceConfig.swift b/Meshtastic/Views/Settings/Config/DeviceConfig.swift index 08f7c457..32d2cff2 100644 --- a/Meshtastic/Views/Settings/Config/DeviceConfig.swift +++ b/Meshtastic/Views/Settings/Config/DeviceConfig.swift @@ -6,7 +6,7 @@ // import SwiftUI -// Default of 0 is One Minute +// Default of 0 is Client enum DeviceRoles: Int, CaseIterable, Identifiable { case client = 0 @@ -53,8 +53,8 @@ struct DeviceConfig: View { var node: NodeInfoEntity? - @State private var isPresentingFactoryResetConfirm: Bool = false - @State private var isPresentingSaveConfirm: Bool = false + @State private var isPresentingFactoryResetConfirm = false + @State private var isPresentingSaveConfirm = false @State var initialLoad: Bool = true @State var hasChanges = false @@ -191,6 +191,7 @@ struct DeviceConfig: View { } } .onChange(of: serialEnabled) { newSerial in + if node != nil && node!.deviceConfig != nil { if newSerial != node!.deviceConfig!.serialEnabled { hasChanges = true }