From cafa394ee1c2e74dd789cd395c0f680a601e4efd Mon Sep 17 00:00:00 2001 From: Garth Vander Houwen Date: Sun, 10 Sep 2023 14:22:30 -0700 Subject: [PATCH] Move deleted file clean up node list a bit --- Meshtastic.xcodeproj/project.pbxproj | 20 ++++++------------- .../Views/Nodes/Helpers/NodeListItem.swift | 12 +++++------ .../NodeInfoViewOld.swift} | 0 3 files changed, 12 insertions(+), 20 deletions(-) rename Meshtastic/Views/{Helpers/Node/NodeInfoView.swift => Nodes/NodeInfoViewOld.swift} (100%) diff --git a/Meshtastic.xcodeproj/project.pbxproj b/Meshtastic.xcodeproj/project.pbxproj index e2e69453..b4c4f63b 100644 --- a/Meshtastic.xcodeproj/project.pbxproj +++ b/Meshtastic.xcodeproj/project.pbxproj @@ -162,7 +162,7 @@ DDDE5A1129AFE69700490C6C /* MeshActivityAttributes.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDDE5A0F29AFE69700490C6C /* MeshActivityAttributes.swift */; }; DDDE5A1329AFEAB900490C6C /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = DDDE5A1229AFEAB900490C6C /* Assets.xcassets */; }; DDDE5A1429AFEAB900490C6C /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = DDDE5A1229AFEAB900490C6C /* Assets.xcassets */; }; - DDDEE5E129DA3E1100A8E078 /* NodeInfoView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDDEE5E029DA3E1100A8E078 /* NodeInfoView.swift */; }; + DDDEE5E129DA3E1100A8E078 /* NodeInfoViewOld.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDDEE5E029DA3E1100A8E078 /* NodeInfoViewOld.swift */; }; DDE0F7C5295F77B700B8AAB3 /* AppSettingsEnums.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDE0F7C4295F77B700B8AAB3 /* AppSettingsEnums.swift */; }; DDF6B2482A9AEBF500BA6931 /* StoreForward.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDF6B2472A9AEBF500BA6931 /* StoreForward.swift */; }; DDF924CA26FBB953009FE055 /* ConnectedDevice.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDF924C926FBB953009FE055 /* ConnectedDevice.swift */; }; @@ -382,7 +382,7 @@ DDDE5A0429AF163E00490C6C /* WidgetsExtension.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = WidgetsExtension.entitlements; sourceTree = ""; }; DDDE5A0F29AFE69700490C6C /* MeshActivityAttributes.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MeshActivityAttributes.swift; sourceTree = ""; }; DDDE5A1229AFEAB900490C6C /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; - DDDEE5E029DA3E1100A8E078 /* NodeInfoView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NodeInfoView.swift; sourceTree = ""; }; + DDDEE5E029DA3E1100A8E078 /* NodeInfoViewOld.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NodeInfoViewOld.swift; sourceTree = ""; }; DDDEE5E229DBE43E00A8E078 /* MeshtasticDataModelV11.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = MeshtasticDataModelV11.xcdatamodel; sourceTree = ""; }; DDE0F7C4295F77B700B8AAB3 /* AppSettingsEnums.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppSettingsEnums.swift; sourceTree = ""; }; DDEE03EC29544A1000FCAD57 /* MeshtasticDataModelV4.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = MeshtasticDataModelV4.xcdatamodel; sourceTree = ""; }; @@ -469,11 +469,12 @@ children = ( DDDB26402AABEF7B003AFCB7 /* Helpers */, DDDB263E2AABEE20003AFCB7 /* NodeList.swift */, - 6DEDA5592A957B8E00321D2E /* DetectionSensorLog.swift */, DD769E0228D18BF0001A3F05 /* DeviceMetricsLog.swift */, - DD4F23CC28779A3C001D37CB /* EnvironmentMetricsLog.swift */, DD90860D26F69BAE00DC5189 /* NodeMap.swift */, DD73FD1028750779000852D6 /* PositionLog.swift */, + DD4F23CC28779A3C001D37CB /* EnvironmentMetricsLog.swift */, + 6DEDA5592A957B8E00321D2E /* DetectionSensorLog.swift */, + DDDEE5E029DA3E1100A8E078 /* NodeInfoViewOld.swift */, DD2E65252767A01F00E45FC5 /* NodeDetailOld.swift */, DD47E3CD26F103C600029299 /* NodeListOld.swift */, ); @@ -749,7 +750,6 @@ DDC2E18D26CE25CB0042C5E4 /* Helpers */ = { isa = PBXGroup; children = ( - DDDEE5DF29DA3DA000A8E078 /* Node */, DD5E523D298F5A7D00D21B61 /* Weather */, DD47E3D526F17ED900029299 /* CircleText.swift */, DDF924C926FBB953009FE055 /* ConnectedDevice.swift */, @@ -856,14 +856,6 @@ path = Widgets; sourceTree = ""; }; - DDDEE5DF29DA3DA000A8E078 /* Node */ = { - isa = PBXGroup; - children = ( - DDDEE5E029DA3E1100A8E078 /* NodeInfoView.swift */, - ); - path = Node; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -1138,7 +1130,7 @@ 6DA39D8E2A92DC52007E311C /* MeshtasticAppDelegate.swift in Sources */, DD47E3CE26F103C600029299 /* NodeListOld.swift in Sources */, DD5E520A298EE33B00D21B61 /* channel.pb.swift in Sources */, - DDDEE5E129DA3E1100A8E078 /* NodeInfoView.swift in Sources */, + DDDEE5E129DA3E1100A8E078 /* NodeInfoViewOld.swift in Sources */, DD8EBF43285058FA00426DCA /* DisplayConfig.swift in Sources */, DD964FC42974767D007C176F /* MapViewFitExtension.swift in Sources */, DD47E3D626F17ED900029299 /* CircleText.swift in Sources */, diff --git a/Meshtastic/Views/Nodes/Helpers/NodeListItem.swift b/Meshtastic/Views/Nodes/Helpers/NodeListItem.swift index 432901d6..f2397f26 100644 --- a/Meshtastic/Views/Nodes/Helpers/NodeListItem.swift +++ b/Meshtastic/Views/Nodes/Helpers/NodeListItem.swift @@ -34,7 +34,7 @@ struct NodeListItem: View { .fontWeight(.medium) .font(.callout) if connected { - HStack(alignment: .bottom) { + HStack { Image(systemName: "antenna.radiowaves.left.and.right.circle.fill") .font(.footnote) .symbolRenderingMode(.hierarchical) @@ -42,7 +42,7 @@ struct NodeListItem: View { Text("connected").font(.caption) } } - HStack(alignment: .bottom) { + HStack { Image(systemName: node.isOnline ? "checkmark.circle.fill" : "moon.circle.fill") .font(.footnote) .symbolRenderingMode(.hierarchical) @@ -51,7 +51,7 @@ struct NodeListItem: View { .font(.caption) } if node.positions?.count ?? 0 > 0 && connectedNode != node.num { - HStack(alignment: .bottom) { + HStack { let lastPostion = node.positions!.reversed()[0] as! PositionEntity let myCoord = CLLocation(latitude: LocationHelper.currentLocation.latitude, longitude: LocationHelper.currentLocation.longitude) if lastPostion.nodeCoordinate != nil && myCoord.coordinate.longitude != LocationHelper.DefaultLocation.longitude && myCoord.coordinate.latitude != LocationHelper.DefaultLocation.latitude { @@ -65,17 +65,17 @@ struct NodeListItem: View { } } if node.channel > 0 { - HStack(alignment: .bottom) { + HStack { Image(systemName: "fibrechannel") .font(.footnote) .symbolRenderingMode(.hierarchical) Text("Channel: \(node.channel)") - .font(.footnote) + .font(.caption) } } if !connected { - HStack(alignment: .bottom) { + HStack { let preset = ModemPresets(rawValue: Int(modemPreset)) LoRaSignalStrengthMeter(snr: node.snr, rssi: node.rssi, preset: preset ?? ModemPresets.longFast, compact: true) } diff --git a/Meshtastic/Views/Helpers/Node/NodeInfoView.swift b/Meshtastic/Views/Nodes/NodeInfoViewOld.swift similarity index 100% rename from Meshtastic/Views/Helpers/Node/NodeInfoView.swift rename to Meshtastic/Views/Nodes/NodeInfoViewOld.swift