diff --git a/Meshtastic/Extensions/UserDefaults.swift b/Meshtastic/Extensions/UserDefaults.swift index 1a3e05b2..49757d69 100644 --- a/Meshtastic/Extensions/UserDefaults.swift +++ b/Meshtastic/Extensions/UserDefaults.swift @@ -86,7 +86,7 @@ extension UserDefaults { @UserDefault(.provideLocation, defaultValue: false) static var provideLocation: Bool - @UserDefault(.provideLocationInterval, defaultValue: 0) + @UserDefault(.provideLocationInterval, defaultValue: 30) static var provideLocationInterval: Int @UserDefault(.mapLayer, defaultValue: .standard) diff --git a/Meshtastic/Views/Helpers/IndoorAirQuality.swift b/Meshtastic/Views/Helpers/IndoorAirQuality.swift index fa90d6f5..b445275a 100644 --- a/Meshtastic/Views/Helpers/IndoorAirQuality.swift +++ b/Meshtastic/Views/Helpers/IndoorAirQuality.swift @@ -91,35 +91,35 @@ struct IndoorAirQuality_Previews: PreviewProvider { IndoorAirQuality(iaq: 351, displayMode: .dot) } } - Text(".text") - .font(.title) - IndoorAirQuality(iaq: 6, displayMode: .text) - IndoorAirQuality(iaq: 51, displayMode: .text) - IndoorAirQuality(iaq: 101, displayMode: .text) - IndoorAirQuality(iaq: 201, displayMode: .text) - IndoorAirQuality(iaq: 350, displayMode: .text) - IndoorAirQuality(iaq: 351, displayMode: .text) - Text(".gauge") - .font(.title) - HStack (alignment: .top) { - VStack{ - IndoorAirQuality(iaq: 6, displayMode: .gauge) - IndoorAirQuality(iaq: 51, displayMode: .gauge) - IndoorAirQuality(iaq: 101, displayMode: .gauge) - IndoorAirQuality(iaq: 151, displayMode: .gauge) - } - VStack{ - IndoorAirQuality(iaq: 201, displayMode: .gauge) - IndoorAirQuality(iaq: 251, displayMode: .gauge) - IndoorAirQuality(iaq: 301, displayMode: .gauge) - IndoorAirQuality(iaq: 350, displayMode: .gauge) - } - VStack{ - IndoorAirQuality(iaq: 351, displayMode: .gauge) - IndoorAirQuality(iaq: 401, displayMode: .gauge) - IndoorAirQuality(iaq: 500, displayMode: .gauge) - } - } +// Text(".text") +// .font(.title) +// IndoorAirQuality(iaq: 6, displayMode: .text) +// IndoorAirQuality(iaq: 51, displayMode: .text) +// IndoorAirQuality(iaq: 101, displayMode: .text) +// IndoorAirQuality(iaq: 201, displayMode: .text) +// IndoorAirQuality(iaq: 350, displayMode: .text) +// IndoorAirQuality(iaq: 351, displayMode: .text) +// Text(".gauge") +// .font(.title) +// HStack (alignment: .top) { +// VStack{ +// IndoorAirQuality(iaq: 6, displayMode: .gauge) +// IndoorAirQuality(iaq: 51, displayMode: .gauge) +// IndoorAirQuality(iaq: 101, displayMode: .gauge) +// IndoorAirQuality(iaq: 151, displayMode: .gauge) +// } +// VStack{ +// IndoorAirQuality(iaq: 201, displayMode: .gauge) +// IndoorAirQuality(iaq: 251, displayMode: .gauge) +// IndoorAirQuality(iaq: 301, displayMode: .gauge) +// IndoorAirQuality(iaq: 350, displayMode: .gauge) +// } +// VStack{ +// IndoorAirQuality(iaq: 351, displayMode: .gauge) +// IndoorAirQuality(iaq: 401, displayMode: .gauge) +// IndoorAirQuality(iaq: 500, displayMode: .gauge) +// } +// } }.previewLayout(.fixed(width: 300, height: 800)) } } diff --git a/Meshtastic/Views/Nodes/DeviceMetricsLog.swift b/Meshtastic/Views/Nodes/DeviceMetricsLog.swift index 07625a4e..5828f2f3 100644 --- a/Meshtastic/Views/Nodes/DeviceMetricsLog.swift +++ b/Meshtastic/Views/Nodes/DeviceMetricsLog.swift @@ -6,6 +6,7 @@ // import SwiftUI import Charts +import UIKit struct DeviceMetricsLog: View { @@ -86,8 +87,8 @@ struct DeviceMetricsLog: View { } .frame(minHeight: 250) } - let localeDateFormat = DateFormatter.dateFormat(fromTemplate: "yyMMddjmma", options: 0, locale: Locale.current) - let dateFormatString = (localeDateFormat ?? "MM/dd/YY j:mma").replacingOccurrences(of: ",", with: "") + let localeDateFormat = DateFormatter.dateFormat(fromTemplate: "yyMdjmma", options: 0, locale: Locale.current) + let dateFormatString = (localeDateFormat ?? "M/d/YY j:mma").replacingOccurrences(of: ",", with: "") if UIScreen.main.bounds.size.width > 768 && (UIDevice.current.userInterfaceIdiom == .pad || UIDevice.current.userInterfaceIdiom == .mac) { // Add a table for mac and ipad // Table(Array(deviceMetrics),id: \.self) { @@ -111,8 +112,30 @@ struct DeviceMetricsLog: View { TableColumn("uptime") { dm in let now = Date.now let later = now + TimeInterval(dm.uptimeSeconds) - let components = (now..