From c1c2f3730ae807ef251e27f1ac3181ddf33746f6 Mon Sep 17 00:00:00 2001
From: Garth Vander Houwen <garthvh@yahoo.com>
Date: Sat, 18 Sep 2021 21:11:54 -0700
Subject: [PATCH] Add node map preview clean up old code

---
 .../Views/Bluetooth/Connect.swift             | 30 ++++++++++++-------
 MeshtasticClient/Views/Nodes/NodeDetail.swift |  8 ++---
 MeshtasticClient/Views/Nodes/NodeList.swift   |  2 +-
 MeshtasticClient/Views/Nodes/NodeMap.swift    |  9 ++++++
 4 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/MeshtasticClient/Views/Bluetooth/Connect.swift b/MeshtasticClient/Views/Bluetooth/Connect.swift
index 50c1cb25..a5f62de3 100644
--- a/MeshtasticClient/Views/Bluetooth/Connect.swift
+++ b/MeshtasticClient/Views/Bluetooth/Connect.swift
@@ -92,17 +92,25 @@ struct Connect: View {
                 }
             }
             .navigationTitle("Bluetooth Radios")
-            //.navigationBarItems(leading:
-                //HStack {
-                    //Button(action: {
-                    //    self.bleManager.startScanning()
-                    //}) {
-                    //    Image(systemName: "arrow.clockwise.circle").imageScale(.large)
-                    //}}, trailing:
-                //HStack {
-                    
-                //}
-            //)
+            .navigationBarItems(trailing:
+                HStack {
+                    Button(action: {
+                        self.bleManager.startScanning()
+                    }) {
+                        Image(systemName: "arrow.clockwise.circle").imageScale(.large)
+                    }}
+            )
         }.navigationViewStyle(StackNavigationViewStyle())
     }
 }
+
+struct Connect_Previews: PreviewProvider {
+    static let modelData = ModelData()
+    static let bleManager = BLEManager()
+
+    static var previews: some View {
+        Connect(bleManager: bleManager)
+            .environmentObject(ModelData())
+            
+    }
+}
diff --git a/MeshtasticClient/Views/Nodes/NodeDetail.swift b/MeshtasticClient/Views/Nodes/NodeDetail.swift
index e38ff8d0..5e9047ac 100644
--- a/MeshtasticClient/Views/Nodes/NodeDetail.swift
+++ b/MeshtasticClient/Views/Nodes/NodeDetail.swift
@@ -6,15 +6,12 @@ A view showing the details for a node.
 import SwiftUI
 import MapKit
 import CoreLocation
-import CoreBluetooth
 
 struct NodeDetail: View {
     
     @EnvironmentObject var modelData: ModelData
     var node: NodeInfoModel
     
-    var coord = CLLocationCoordinate2D()
-    
     struct MapLocation: Identifiable {
           let id = UUID()
           let name: String
@@ -27,7 +24,6 @@ struct NodeDetail: View {
             
             VStack {
                 
-                // Map or Device Image
                 if(node.position.coordinate != nil) {
                     
                     let nodeCoordinatePosition = CLLocationCoordinate2D(latitude: node.position.latitude!, longitude: node.position.longitude!)
@@ -63,7 +59,9 @@ struct NodeDetail: View {
                         
                         Image(node.user.hwModel.lowercased())
                             .resizable()
-                            .frame(width: 70, height: 70)
+                            .frame(width:70, height: 70)
+                            .cornerRadius(5)
+                            
                         Text("Model: " + String(node.user.hwModel))
                             .font(.title)
                     }
diff --git a/MeshtasticClient/Views/Nodes/NodeList.swift b/MeshtasticClient/Views/Nodes/NodeList.swift
index c2ad3c3d..16b036e0 100644
--- a/MeshtasticClient/Views/Nodes/NodeList.swift
+++ b/MeshtasticClient/Views/Nodes/NodeList.swift
@@ -26,7 +26,7 @@ struct NodeList: View {
            
             List {
                 Toggle(isOn: $showLocationOnly) {
-                    Text("Nodes with Location only")
+                    Text("Nodes with location only")
                 }
                 ForEach(filteredDevices.sorted(by: { $0.lastHeard > $1.lastHeard })) { node in
                     NavigationLink(destination: NodeDetail(node: node)) {
diff --git a/MeshtasticClient/Views/Nodes/NodeMap.swift b/MeshtasticClient/Views/Nodes/NodeMap.swift
index f7d41716..e91b1dd8 100644
--- a/MeshtasticClient/Views/Nodes/NodeMap.swift
+++ b/MeshtasticClient/Views/Nodes/NodeMap.swift
@@ -56,3 +56,12 @@ struct NodeMap: View {
         }.navigationViewStyle(StackNavigationViewStyle())
     }
 }
+
+struct NodeMap_Previews: PreviewProvider {
+    static let modelData = ModelData()
+
+    static var previews: some View {
+        NodeMap()
+            .environmentObject(modelData)
+    }
+}