From 85bda07baeab57045e2e956b8d2c6d8eda1aeade Mon Sep 17 00:00:00 2001
From: Garth Vander Houwen <garthvh@yahoo.com>
Date: Mon, 22 Apr 2024 15:11:00 -0700
Subject: [PATCH] move uptime to node details

---
 Meshtastic/Views/Nodes/DeviceMetricsLog.swift | 40 ++-----------------
 .../Views/Nodes/Helpers/NodeDetail.swift      | 26 +++++++++++-
 2 files changed, 29 insertions(+), 37 deletions(-)

diff --git a/Meshtastic/Views/Nodes/DeviceMetricsLog.swift b/Meshtastic/Views/Nodes/DeviceMetricsLog.swift
index 5828f2f3..809628f2 100644
--- a/Meshtastic/Views/Nodes/DeviceMetricsLog.swift
+++ b/Meshtastic/Views/Nodes/DeviceMetricsLog.swift
@@ -6,7 +6,6 @@
 //
 import SwiftUI
 import Charts
-import UIKit
 
 struct DeviceMetricsLog: View {
 
@@ -87,8 +86,8 @@ struct DeviceMetricsLog: View {
 					}
 					.frame(minHeight: 250)
 				}
-				let localeDateFormat = DateFormatter.dateFormat(fromTemplate: "yyMdjmma", options: 0, locale: Locale.current)
-				let dateFormatString = (localeDateFormat ?? "M/d/YY j:mma").replacingOccurrences(of: ",", with: "")
+				let localeDateFormat = DateFormatter.dateFormat(fromTemplate: "yyMMddjmma", options: 0, locale: Locale.current)
+				let dateFormatString = (localeDateFormat ?? "MM/dd/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) {
@@ -114,28 +113,6 @@ struct DeviceMetricsLog: View {
 							let later = now + TimeInterval(dm.uptimeSeconds)
 							let components = (now..<later).formatted(.components(style: .narrow))
 							Text(components)
-							
-							let formatter = RelativeDateTimeFormatter()
-							formatter.unitsStyle = .abbreviated
-							//let formattedString = String(format: "%02ld%02ld", difference.hour!, difference.minute!)
-//print(formattedString)
-							
-//							let formatter = DateComponentsFormatter()
-//
-//							formatter.unitsStyle = .abbreviated
-//							formatter.zeroFormattingBehavior = .dropAll
-//							formatter.allowedUnits = [.day, .hour, .minute, .second]
-							//formatter.unitsStyle = .narrow
-						//	let formattedDuration = formatter.string(from: now, to: later)
-						//	print(formattedDuration) // Output: "2h 30m"
-							
-							//let formattedDuration = formatter.string(from: now, to: later)
-							//print(formattedDuration) // Output: "2h 30m"
-							
-							//let components = (now..<later).formatted(.components(style: .narrow))
-							//formatter.string(from: (now..<later).duration)
-							//Text(formattedDuration)
-							//Text(components)
 						}
 						TableColumn("timestamp") { dm in
 							Text(dm.time?.formattedDate(format: dateFormatString) ?? "unknown.age".localized)
@@ -145,11 +122,10 @@ struct DeviceMetricsLog: View {
 				} else {
 					ScrollView {
 						let columns = [
-							GridItem(.flexible(minimum: 20, maximum: 50), spacing: 0.1),
-							GridItem(.flexible(minimum: 20, maximum: 50), spacing: 0.1),
 							GridItem(.flexible(minimum: 20, maximum: 60), spacing: 0.1),
 							GridItem(.flexible(minimum: 20, maximum: 60), spacing: 0.1),
-							GridItem(.flexible(minimum: 20, maximum: 70), spacing: 0.1),
+							GridItem(.flexible(minimum: 20, maximum: 60), spacing: 0.1),
+							GridItem(.flexible(minimum: 20, maximum: 60), spacing: 0.1),
 							GridItem(.flexible(minimum: 100, maximum: .infinity), spacing: 0.1)
 						]
 						LazyVGrid(columns: columns, alignment: .leading, spacing: 1) {
@@ -166,9 +142,6 @@ struct DeviceMetricsLog: View {
 								Text("AirTm")
 									.font(.caption)
 									.fontWeight(.bold)
-								Text("uptime")
-									.font(.caption)
-									.fontWeight(.bold)
 								Text("timestamp")
 									.font(.caption)
 									.fontWeight(.bold)
@@ -188,11 +161,6 @@ struct DeviceMetricsLog: View {
 										.font(.caption)
 									Text("\(String(format: "%.2f", dm.airUtilTx))%")
 										.font(.caption)
-									let now = Date.now
-									let later = now + TimeInterval(dm.uptimeSeconds)
-									let components = (now..<later).formatted(.components(style: .condensedAbbreviated))
-									Text(components)
-										.font(.caption)
 									Text(dm.time?.formattedDate(format: dateFormatString) ?? "unknown.age".localized)
 										.font(.caption)
 								}
diff --git a/Meshtastic/Views/Nodes/Helpers/NodeDetail.swift b/Meshtastic/Views/Nodes/Helpers/NodeDetail.swift
index 1e8a5796..66db4dc5 100644
--- a/Meshtastic/Views/Nodes/Helpers/NodeDetail.swift
+++ b/Meshtastic/Views/Nodes/Helpers/NodeDetail.swift
@@ -26,10 +26,34 @@ struct NodeDetail: View {
 				VStack {
 					ScrollView {
 						NodeInfoItem(node: node)
+						let dm = node.telemetries?.filtered(using: NSPredicate(format: "metricsType == 0")).lastObject as? TelemetryEntity
+						if dm?.uptimeSeconds ?? 0 > 0 {
+							HStack(alignment: .center) {
+								let now = Date.now
+								let later = now + TimeInterval(dm!.uptimeSeconds)
+								let components = (now..<later).formatted(.components(style: .narrow))
+								Label(
+									title: {
+										Text("\("uptime".localized)")
+											.font(.title2)+Text(": \(components)")
+											.font(.title3)
+											.foregroundColor(Color.gray)
+									},
+									icon: {
+										Image(systemName: "arrowshape.up.circle.fill")
+											.foregroundColor(.green)
+											.symbolRenderingMode(.hierarchical)
+											.font(.title)
+									}
+								)
+							}
+							Divider()
+						}
 						if node.metadata != nil {
 							HStack(alignment: .center) {
 								Text("firmware.version").font(.title2)+Text(": \(node.metadata?.firmwareVersion ?? "unknown".localized)")
-									.font(.title3).foregroundColor(Color.gray)
+									.font(.title3)
+									.foregroundColor(Color.gray)
 								if connectedNode != nil && connectedNode?.myInfo?.hasAdmin ?? false && node.metadata?.time != nil && !Calendar.current.isDateInToday(node.metadata!.time!) {
 									Button {
 										let adminMessageId =  bleManager.requestDeviceMetadata(fromUser: connectedNode!.user!, toUser: node.user!, adminIndex: connectedNode!.myInfo!.adminIndex, context: context)