From 03515e0511acf90f987b4f42089d6a1b0f80cba3 Mon Sep 17 00:00:00 2001 From: Garth Vander Houwen Date: Thu, 1 Sep 2022 20:40:08 -0700 Subject: [PATCH 1/2] Sats and smaller time text on node details --- Meshtastic/Views/Nodes/NodeDetail.swift | 7 ++++--- Meshtastic/Views/Nodes/NodeList.swift | 8 +------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/Meshtastic/Views/Nodes/NodeDetail.swift b/Meshtastic/Views/Nodes/NodeDetail.swift index fc73b616..7b52ebae 100644 --- a/Meshtastic/Views/Nodes/NodeDetail.swift +++ b/Meshtastic/Views/Nodes/NodeDetail.swift @@ -23,7 +23,7 @@ struct NodeDetail: View { let hwModelString = node.user?.hwModel ?? "UNSET" - HStack { + ZStack { GeometryReader { bounds in @@ -64,10 +64,10 @@ struct NodeDetail: View { ) } .ignoresSafeArea(.all, edges: [.leading, .trailing]) - .frame(idealWidth: bounds.size.width, minHeight: bounds.size.height / 2) + .frame(idealWidth: bounds.size.width, minHeight: bounds.size.height / 1.75) } } - //Text("\(mostRecent.satsInView)") + Text("Sats: \(mostRecent.satsInView)").offset( y:-40) } else { Image(node.user?.hwModel ?? "UNSET") @@ -432,6 +432,7 @@ struct NodeDetail: View { .frame(minHeight:170) .padding(0) } + .offset( y:-40) } .edgesIgnoringSafeArea([.leading, .trailing]) } diff --git a/Meshtastic/Views/Nodes/NodeList.swift b/Meshtastic/Views/Nodes/NodeList.swift index 0828e7e8..1f0b571f 100644 --- a/Meshtastic/Views/Nodes/NodeList.swift +++ b/Meshtastic/Views/Nodes/NodeList.swift @@ -87,15 +87,9 @@ struct NodeList: View { Image(systemName: "clock.badge.checkmark.fill").font(.title3) .foregroundColor(.accentColor).symbolRenderingMode(.hierarchical) - - if UIDevice.current.userInterfaceIdiom == .pad || UIDevice.current.userInterfaceIdiom == .mac { LastHeardText(lastHeard: node.lastHeard).font(.subheadline).foregroundColor(.gray) - - } else { - - LastHeardText(lastHeard: node.lastHeard).font(.title3).foregroundColor(.gray) - } + } if node.positions?.count ?? 0 > 0 && (bleManager.connectedPeripheral != nil && bleManager.connectedPeripheral.num != node.num) { From 7a3929793d5df116476928e7d45b35cb2b1b08b9 Mon Sep 17 00:00:00 2001 From: Garth Vander Houwen Date: Thu, 1 Sep 2022 22:08:45 -0700 Subject: [PATCH 2/2] Fix heading on bluetooth config --- Meshtastic/Views/Settings/Config/BluetoothConfig.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Meshtastic/Views/Settings/Config/BluetoothConfig.swift b/Meshtastic/Views/Settings/Config/BluetoothConfig.swift index e75e4f1d..a67dcf66 100644 --- a/Meshtastic/Views/Settings/Config/BluetoothConfig.swift +++ b/Meshtastic/Views/Settings/Config/BluetoothConfig.swift @@ -120,7 +120,7 @@ struct BluetoothConfig: View { } } } - .navigationTitle("Display Config") + .navigationTitle("Bluetooth (BLE) Config") .navigationBarItems(trailing: ZStack {