From 91a1d93ef87f8aa4dfa4712f87aa37d78d3f31a8 Mon Sep 17 00:00:00 2001 From: Garth Vander Houwen Date: Mon, 22 Apr 2024 15:17:45 -0700 Subject: [PATCH] Move uptime out of the device metrics log grid --- Meshtastic/Views/Nodes/DeviceMetricsLog.swift | 4 ++-- Meshtastic/Views/Nodes/Helpers/NodeDetail.swift | 2 +- Meshtastic/Views/Nodes/Helpers/NodeInfoItem.swift | 10 ++++++++-- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/Meshtastic/Views/Nodes/DeviceMetricsLog.swift b/Meshtastic/Views/Nodes/DeviceMetricsLog.swift index 809628f2..aa55a2b3 100644 --- a/Meshtastic/Views/Nodes/DeviceMetricsLog.swift +++ b/Meshtastic/Views/Nodes/DeviceMetricsLog.swift @@ -86,8 +86,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) { diff --git a/Meshtastic/Views/Nodes/Helpers/NodeDetail.swift b/Meshtastic/Views/Nodes/Helpers/NodeDetail.swift index 66db4dc5..e4c4886e 100644 --- a/Meshtastic/Views/Nodes/Helpers/NodeDetail.swift +++ b/Meshtastic/Views/Nodes/Helpers/NodeDetail.swift @@ -40,7 +40,7 @@ struct NodeDetail: View { .foregroundColor(Color.gray) }, icon: { - Image(systemName: "arrowshape.up.circle.fill") + Image(systemName: "checkmark.circle.fill") .foregroundColor(.green) .symbolRenderingMode(.hierarchical) .font(.title) diff --git a/Meshtastic/Views/Nodes/Helpers/NodeInfoItem.swift b/Meshtastic/Views/Nodes/Helpers/NodeInfoItem.swift index 0b381b9c..46aae43b 100644 --- a/Meshtastic/Views/Nodes/Helpers/NodeInfoItem.swift +++ b/Meshtastic/Views/Nodes/Helpers/NodeInfoItem.swift @@ -64,7 +64,10 @@ struct NodeInfoItem: View { .symbolRenderingMode(.hierarchical) Text("Node Number:").font(.title2) } - Text(String(node.num)).font(.title3).foregroundColor(.gray) + Text(String(node.num)) + .font(.title3) + .foregroundColor(.gray) + .textSelection(.enabled) } Divider() VStack { @@ -75,7 +78,10 @@ struct NodeInfoItem: View { .symbolRenderingMode(.hierarchical) Text("User Id:").font(.title2) } - Text(node.user?.userId ?? "?").font(.title3).foregroundColor(.gray) + Text(node.user?.userId ?? "?") + .font(.title3) + .foregroundColor(.gray) + .textSelection(.enabled) } } Divider()