From 139151701e9249cfcb5cccff7266f3dff80b8321 Mon Sep 17 00:00:00 2001 From: Garth Vander Houwen Date: Sat, 20 Nov 2021 11:02:15 -0800 Subject: [PATCH] Delete unnecessary files --- Meshtastic Client.xcodeproj/project.pbxproj | 21 ++++ MeshtasticClient/Helpers/BLEManager.swift | 20 +-- .../MeshtasticClient.xcdatamodel/contents | 11 -- .../Mesh.xcdatamodel/contents | 38 ++++++ .../Model/Data/NodeInfoEntity.swift | 16 --- .../NodeInfoEntity.xcdatamodel/contents | 7 -- .../.xccurrentversion | 8 -- .../MeshtasticClient.xcdatamodel/contents | 24 ---- .../AccentColor.colorset/Contents.json | 20 +++ .../AppIcon.appiconset/1024.png | Bin .../AppIcon.appiconset/120-1.png | Bin .../AppIcon.appiconset/120.png | Bin .../AppIcon.appiconset/152.png | Bin .../AppIcon.appiconset/167.png | Bin .../AppIcon.appiconset/180.png | Bin .../Assets.xcassets/AppIcon.appiconset/20.png | Bin .../Assets.xcassets/AppIcon.appiconset/29.png | Bin .../AppIcon.appiconset/40-1.png | Bin .../AppIcon.appiconset/40-2.png | Bin .../Assets.xcassets/AppIcon.appiconset/40.png | Bin .../AppIcon.appiconset/58-1.png | Bin .../Assets.xcassets/AppIcon.appiconset/58.png | Bin .../Assets.xcassets/AppIcon.appiconset/60.png | Bin .../Assets.xcassets/AppIcon.appiconset/76.png | Bin .../AppIcon.appiconset/80-1.png | Bin .../Assets.xcassets/AppIcon.appiconset/80.png | Bin .../Assets.xcassets/AppIcon.appiconset/87.png | Bin .../AppIcon.appiconset/Contents.json | 116 ++++++++++++++++++ .../Color.colorset/Contents.json | 38 ++++++ .../Assets.xcassets/Contents.json | 6 + ...655DCEC0-309D-430A-AF50-2453B6ADB1F6-1.png | Bin ...655DCEC0-309D-430A-AF50-2453B6ADB1F6-2.png | Bin .../655DCEC0-309D-430A-AF50-2453B6ADB1F6.png | Bin .../HELTECV20.imageset/Contents.json | 0 .../TLORAV2.imageset/Contents.json | 0 .../TLORAV211p6.imageset/Contents.json | 0 .../UNSET.imageset/Contents.json | 0 .../rak4631.imageset}/Contents.json | 0 ...69e-43fcef692ef6_739x@2x.progressive-1.png | Bin ...-a69e-43fcef692ef6_739x@2x.progressive.png | Bin .../tbeam.imageset}/Contents.json | 0 .../tbeam.imageset}/tbeam-1.jpg | Bin .../tbeam.imageset}/tbeam-2.jpg | Bin .../Assets.xcassets/tbeam.imageset}/tbeam.jpg | Bin .../techo.imageset}/Contents.json | 0 .../techo.imageset}/techo-1.jpg | Bin .../techo.imageset}/techo-2.jpg | Bin .../Assets.xcassets/techo.imageset}/techo.jpg | Bin .../tlorav1.imageset}/Contents.json | 0 .../tlorav1.imageset}/tlora-1.jpeg | Bin .../tlorav1.imageset}/tlora-2.jpeg | Bin .../tlorav1.imageset}/tlora.jpeg | Bin .../Views/Messages/Messages.swift | 4 +- 53 files changed, 252 insertions(+), 77 deletions(-) delete mode 100644 MeshtasticClient/MeshtasticClient.xcdatamodeld/MeshtasticClient.xcdatamodel/contents create mode 100644 MeshtasticClient/Model/Data/Mesh.xcdatamodeld/Mesh.xcdatamodel/contents delete mode 100644 MeshtasticClient/Model/Data/NodeInfoEntity.swift delete mode 100644 MeshtasticClient/Model/Data/NodeInfoEntity.xcdatamodeld/NodeInfoEntity.xcdatamodel/contents delete mode 100644 MeshtasticClient/Model/MeshtasticClient.xcdatamodeld/.xccurrentversion delete mode 100644 MeshtasticClient/Model/MeshtasticClient.xcdatamodeld/MeshtasticClient.xcdatamodel/contents create mode 100644 MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/AccentColor.colorset/Contents.json rename {Meshtastic Watch => MeshtasticClient/Resources/Assets.xcassets}/Assets.xcassets/AppIcon.appiconset/1024.png (100%) rename {Meshtastic Watch => MeshtasticClient/Resources/Assets.xcassets}/Assets.xcassets/AppIcon.appiconset/120-1.png (100%) rename {Meshtastic Watch => MeshtasticClient/Resources/Assets.xcassets}/Assets.xcassets/AppIcon.appiconset/120.png (100%) rename {Meshtastic Watch => MeshtasticClient/Resources/Assets.xcassets}/Assets.xcassets/AppIcon.appiconset/152.png (100%) rename {Meshtastic Watch => MeshtasticClient/Resources/Assets.xcassets}/Assets.xcassets/AppIcon.appiconset/167.png (100%) rename {Meshtastic Watch => MeshtasticClient/Resources/Assets.xcassets}/Assets.xcassets/AppIcon.appiconset/180.png (100%) rename {Meshtastic Watch => MeshtasticClient/Resources/Assets.xcassets}/Assets.xcassets/AppIcon.appiconset/20.png (100%) rename {Meshtastic Watch => MeshtasticClient/Resources/Assets.xcassets}/Assets.xcassets/AppIcon.appiconset/29.png (100%) rename {Meshtastic Watch => MeshtasticClient/Resources/Assets.xcassets}/Assets.xcassets/AppIcon.appiconset/40-1.png (100%) rename {Meshtastic Watch => MeshtasticClient/Resources/Assets.xcassets}/Assets.xcassets/AppIcon.appiconset/40-2.png (100%) rename {Meshtastic Watch => MeshtasticClient/Resources/Assets.xcassets}/Assets.xcassets/AppIcon.appiconset/40.png (100%) rename {Meshtastic Watch => MeshtasticClient/Resources/Assets.xcassets}/Assets.xcassets/AppIcon.appiconset/58-1.png (100%) rename {Meshtastic Watch => MeshtasticClient/Resources/Assets.xcassets}/Assets.xcassets/AppIcon.appiconset/58.png (100%) rename {Meshtastic Watch => MeshtasticClient/Resources/Assets.xcassets}/Assets.xcassets/AppIcon.appiconset/60.png (100%) rename {Meshtastic Watch => MeshtasticClient/Resources/Assets.xcassets}/Assets.xcassets/AppIcon.appiconset/76.png (100%) rename {Meshtastic Watch => MeshtasticClient/Resources/Assets.xcassets}/Assets.xcassets/AppIcon.appiconset/80-1.png (100%) rename {Meshtastic Watch => MeshtasticClient/Resources/Assets.xcassets}/Assets.xcassets/AppIcon.appiconset/80.png (100%) rename {Meshtastic Watch => MeshtasticClient/Resources/Assets.xcassets}/Assets.xcassets/AppIcon.appiconset/87.png (100%) create mode 100644 MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/Contents.json create mode 100644 MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/Color.colorset/Contents.json create mode 100644 MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/Contents.json rename {Meshtastic Watch => MeshtasticClient/Resources/Assets.xcassets}/Assets.xcassets/HELTECV20.imageset/655DCEC0-309D-430A-AF50-2453B6ADB1F6-1.png (100%) rename {Meshtastic Watch => MeshtasticClient/Resources/Assets.xcassets}/Assets.xcassets/HELTECV20.imageset/655DCEC0-309D-430A-AF50-2453B6ADB1F6-2.png (100%) rename {Meshtastic Watch => MeshtasticClient/Resources/Assets.xcassets}/Assets.xcassets/HELTECV20.imageset/655DCEC0-309D-430A-AF50-2453B6ADB1F6.png (100%) rename {Meshtastic Watch => MeshtasticClient/Resources/Assets.xcassets}/Assets.xcassets/HELTECV20.imageset/Contents.json (100%) rename {Meshtastic Watch => MeshtasticClient/Resources/Assets.xcassets}/Assets.xcassets/TLORAV2.imageset/Contents.json (100%) rename {Meshtastic Watch => MeshtasticClient/Resources/Assets.xcassets}/Assets.xcassets/TLORAV211p6.imageset/Contents.json (100%) rename {Meshtastic Watch => MeshtasticClient/Resources/Assets.xcassets}/Assets.xcassets/UNSET.imageset/Contents.json (100%) rename {Meshtastic Watch/Assets.xcassets/RAK4631.imageset => MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/rak4631.imageset}/Contents.json (100%) rename {Meshtastic Watch/Assets.xcassets/RAK4631.imageset => MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/rak4631.imageset}/RAK7205_Enclosure-With-Solar-Panel_Top-View_01_9ed42002-fb51-4c49-a69e-43fcef692ef6_739x@2x.progressive-1.png (100%) rename {Meshtastic Watch/Assets.xcassets/RAK4631.imageset => MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/rak4631.imageset}/RAK7205_Enclosure-With-Solar-Panel_Top-View_01_9ed42002-fb51-4c49-a69e-43fcef692ef6_739x@2x.progressive.png (100%) rename {Meshtastic Watch/Assets.xcassets/TBEAM.imageset => MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/tbeam.imageset}/Contents.json (100%) rename {Meshtastic Watch/Assets.xcassets/TBEAM.imageset => MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/tbeam.imageset}/tbeam-1.jpg (100%) rename {Meshtastic Watch/Assets.xcassets/TBEAM.imageset => MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/tbeam.imageset}/tbeam-2.jpg (100%) rename {Meshtastic Watch/Assets.xcassets/TBEAM.imageset => MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/tbeam.imageset}/tbeam.jpg (100%) rename {Meshtastic Watch/Assets.xcassets/TECHO.imageset => MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/techo.imageset}/Contents.json (100%) rename {Meshtastic Watch/Assets.xcassets/TECHO.imageset => MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/techo.imageset}/techo-1.jpg (100%) rename {Meshtastic Watch/Assets.xcassets/TECHO.imageset => MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/techo.imageset}/techo-2.jpg (100%) rename {Meshtastic Watch/Assets.xcassets/TECHO.imageset => MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/techo.imageset}/techo.jpg (100%) rename {Meshtastic Watch/Assets.xcassets/TLORAV1.imageset => MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/tlorav1.imageset}/Contents.json (100%) rename {Meshtastic Watch/Assets.xcassets/TLORAV1.imageset => MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/tlorav1.imageset}/tlora-1.jpeg (100%) rename {Meshtastic Watch/Assets.xcassets/TLORAV1.imageset => MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/tlorav1.imageset}/tlora-2.jpeg (100%) rename {Meshtastic Watch/Assets.xcassets/TLORAV1.imageset => MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/tlorav1.imageset}/tlora.jpeg (100%) diff --git a/Meshtastic Client.xcodeproj/project.pbxproj b/Meshtastic Client.xcodeproj/project.pbxproj index 50ac0586..beaa3688 100644 --- a/Meshtastic Client.xcodeproj/project.pbxproj +++ b/Meshtastic Client.xcodeproj/project.pbxproj @@ -48,6 +48,8 @@ DDC2E17A26CE248F0042C5E4 /* MeshtasticClientUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDC2E17926CE248F0042C5E4 /* MeshtasticClientUITests.swift */; }; DDC2E18F26CE25FE0042C5E4 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDC2E18E26CE25FE0042C5E4 /* ContentView.swift */; }; DDC2E1A726CEB3400042C5E4 /* LocationHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDC2E1A626CEB3400042C5E4 /* LocationHelper.swift */; }; + DDD2B1562749422E00E42118 /* CodeGen in Resources */ = {isa = PBXBuildFile; fileRef = DDD2B1552749422E00E42118 /* CodeGen */; }; + DDD8976E2745E08F000258DB /* Mesh.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = DDD8976C2745E08F000258DB /* Mesh.xcdatamodeld */; }; DDF924C626FA2375009FE055 /* MessageModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDF924C526FA2375009FE055 /* MessageModel.swift */; }; DDF924CA26FBB953009FE055 /* ConnectedDevice.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDF924C926FBB953009FE055 /* ConnectedDevice.swift */; }; /* End PBXBuildFile section */ @@ -117,6 +119,8 @@ DDC2E17B26CE248F0042C5E4 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; DDC2E18E26CE25FE0042C5E4 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = ""; }; DDC2E1A626CEB3400042C5E4 /* LocationHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocationHelper.swift; sourceTree = ""; }; + DDD2B1552749422E00E42118 /* CodeGen */ = {isa = PBXFileReference; lastKnownFileType = folder; path = CodeGen; sourceTree = ""; }; + DDD8976D2745E08F000258DB /* Mesh.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = Mesh.xcdatamodel; sourceTree = ""; }; DDF924C526FA2375009FE055 /* MessageModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessageModel.swift; sourceTree = ""; }; DDF924C926FBB953009FE055 /* ConnectedDevice.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConnectedDevice.swift; sourceTree = ""; }; /* End PBXFileReference section */ @@ -203,6 +207,8 @@ DDB0209E272B0C5700F8DBAE /* Data */ = { isa = PBXGroup; children = ( + DDD2B1552749422E00E42118 /* CodeGen */, + DDD8976C2745E08F000258DB /* Mesh.xcdatamodeld */, ); path = Data; sourceTree = ""; @@ -448,6 +454,7 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + DDD2B1562749422E00E42118 /* CodeGen in Resources */, DDC2E15F26CE248F0042C5E4 /* Preview Assets.xcassets in Resources */, DDC2E15C26CE248F0042C5E4 /* Assets.xcassets in Resources */, ); @@ -492,6 +499,7 @@ DDAF8C6B26ED0DD80058C060 /* environmental_measurement.pb.swift in Sources */, DD90860C26F684AF00DC5189 /* BatteryIcon.swift in Sources */, DD4A91202708C66600501B7E /* Configuration.swift in Sources */, + DDD8976E2745E08F000258DB /* Mesh.xcdatamodeld in Sources */, DD4A911E2708C65400501B7E /* AppSettings.swift in Sources */, DDAF8C6226ED0A230058C060 /* mqtt.pb.swift in Sources */, DDF924CA26FBB953009FE055 /* ConnectedDevice.swift in Sources */, @@ -862,6 +870,19 @@ productName = SwiftProtobuf; }; /* End XCSwiftPackageProductDependency section */ + +/* Begin XCVersionGroup section */ + DDD8976C2745E08F000258DB /* Mesh.xcdatamodeld */ = { + isa = XCVersionGroup; + children = ( + DDD8976D2745E08F000258DB /* Mesh.xcdatamodel */, + ); + currentVersion = DDD8976D2745E08F000258DB /* Mesh.xcdatamodel */; + path = Mesh.xcdatamodeld; + sourceTree = ""; + versionGroupType = wrapper.xcdatamodel; + }; +/* End XCVersionGroup section */ }; rootObject = DDC2E14C26CE248E0042C5E4 /* Project object */; } diff --git a/MeshtasticClient/Helpers/BLEManager.swift b/MeshtasticClient/Helpers/BLEManager.swift index 62e01131..990e63a6 100644 --- a/MeshtasticClient/Helpers/BLEManager.swift +++ b/MeshtasticClient/Helpers/BLEManager.swift @@ -72,7 +72,7 @@ class BLEManager: NSObject, ObservableObject, CBCentralManagerDelegate, CBPeriph if central.state == .poweredOn { isSwitchedOn = true - startScanning() + //startScanning() } else { @@ -178,12 +178,12 @@ class BLEManager: NSObject, ObservableObject, CBCentralManagerDelegate, CBPeriph var newPeripheral = Peripheral(id: peripheral.identifier.uuidString, name: peripheralName, rssi: RSSI.intValue, subscribed: false, peripheral: peripheral, myInfo: nil) let peripheralIndex = peripherals.firstIndex(where: { $0.id == newPeripheral.id }) - if peripheralIndex != nil { + if peripheralIndex != nil && newPeripheral.peripheral.state != CBPeripheralState.connected { newPeripheral.myInfo = peripherals.first(where: { $0.id == newPeripheral.id })?.myInfo peripherals[peripheralIndex!] = newPeripheral - //peripherals.remove(at: peripheralIndex!) - //peripherals.append(newPeripheral) + peripherals.remove(at: peripheralIndex!) + peripherals.append(newPeripheral) print("Updating peripheral: \(peripheralName)"); } else { @@ -196,7 +196,7 @@ class BLEManager: NSObject, ObservableObject, CBCentralManagerDelegate, CBPeriph // called when a peripheral is connected func centralManager(_ central: CBCentralManager, didConnect peripheral: CBPeripheral) { - //peripheral.delegate = self + peripheral.delegate = self // Invalidate and reset connection timer count, remove any connection errors lastConnectionError = "" self.timeoutTimer!.invalidate() @@ -220,7 +220,7 @@ class BLEManager: NSObject, ObservableObject, CBCentralManagerDelegate, CBPeriph // Disconnect Peripheral Event func centralManager(_ central: CBCentralManager, didDisconnectPeripheral peripheral: CBPeripheral, error: Error?) { - connectedPeripheral.peripheral.delegate = self + peripheral.delegate = self // Start a scan so the disconnected peripheral is moved to the peripherals[] if it is awake self.startScanning() self.connectedPeripheral = nil @@ -277,7 +277,7 @@ class BLEManager: NSObject, ObservableObject, CBCentralManagerDelegate, CBPeriph // Discover Services Event func peripheral(_ peripheral: CBPeripheral, didDiscoverServices error: Error?) { - connectedPeripheral.peripheral.delegate = self + peripheral.delegate = self if let e = error { print("Discover Services error \(e)") @@ -301,7 +301,7 @@ class BLEManager: NSObject, ObservableObject, CBCentralManagerDelegate, CBPeriph // Discover Characteristics Event func peripheral(_ peripheral: CBPeripheral, didDiscoverCharacteristicsFor service: CBService, error: Error?) { - connectedPeripheral.peripheral.delegate = self + peripheral.delegate = self if let e = error { print("Discover Characteristics error \(e)") @@ -347,7 +347,7 @@ class BLEManager: NSObject, ObservableObject, CBCentralManagerDelegate, CBPeriph func peripheral(_ peripheral: CBPeripheral, didUpdateNotificationStateFor characteristic: CBCharacteristic, error: Error?) { - connectedPeripheral.peripheral.delegate = self + peripheral.delegate = self print("didUpdateNotificationStateFor char: \(characteristic.uuid.uuidString) \(characteristic.isNotifying)") if meshLoggingEnabled { MeshLogger.log("didUpdateNotificationStateFor char: \(characteristic.uuid.uuidString) \(characteristic.isNotifying)") } if let errorText = error?.localizedDescription @@ -378,7 +378,7 @@ class BLEManager: NSObject, ObservableObject, CBCentralManagerDelegate, CBPeriph // Data Read / Update Characteristic Event func peripheral(_ peripheral: CBPeripheral, didUpdateValueFor characteristic: CBCharacteristic, error: Error?) { - connectedPeripheral.peripheral.delegate = self + peripheral.delegate = self if let e = error { print("didUpdateValueFor Characteristic error \(e)") diff --git a/MeshtasticClient/MeshtasticClient.xcdatamodeld/MeshtasticClient.xcdatamodel/contents b/MeshtasticClient/MeshtasticClient.xcdatamodeld/MeshtasticClient.xcdatamodel/contents deleted file mode 100644 index 3374cb84..00000000 --- a/MeshtasticClient/MeshtasticClient.xcdatamodeld/MeshtasticClient.xcdatamodel/contents +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/MeshtasticClient/Model/Data/Mesh.xcdatamodeld/Mesh.xcdatamodel/contents b/MeshtasticClient/Model/Data/Mesh.xcdatamodeld/Mesh.xcdatamodel/contents new file mode 100644 index 00000000..9709e41c --- /dev/null +++ b/MeshtasticClient/Model/Data/Mesh.xcdatamodeld/Mesh.xcdatamodel/contents @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/MeshtasticClient/Model/Data/NodeInfoEntity.swift b/MeshtasticClient/Model/Data/NodeInfoEntity.swift deleted file mode 100644 index af2d1e98..00000000 --- a/MeshtasticClient/Model/Data/NodeInfoEntity.swift +++ /dev/null @@ -1,16 +0,0 @@ -import Foundation -import CoreData - -//extension NodeInfoEntity { -// @nonobjc public class func createFetchRequest() -> NSFetchRequest { -// return NSFetchRequest(entityName: "NodeInfoEntity") -// } - - -// @NSManaged public var id: UInt32 -// @NSManaged public var num: UInt32 -// @NSManaged public var sha: String -// @NSManaged public var url: String - - -//} diff --git a/MeshtasticClient/Model/Data/NodeInfoEntity.xcdatamodeld/NodeInfoEntity.xcdatamodel/contents b/MeshtasticClient/Model/Data/NodeInfoEntity.xcdatamodeld/NodeInfoEntity.xcdatamodel/contents deleted file mode 100644 index c442da60..00000000 --- a/MeshtasticClient/Model/Data/NodeInfoEntity.xcdatamodeld/NodeInfoEntity.xcdatamodel/contents +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/MeshtasticClient/Model/MeshtasticClient.xcdatamodeld/.xccurrentversion b/MeshtasticClient/Model/MeshtasticClient.xcdatamodeld/.xccurrentversion deleted file mode 100644 index 0e918e50..00000000 --- a/MeshtasticClient/Model/MeshtasticClient.xcdatamodeld/.xccurrentversion +++ /dev/null @@ -1,8 +0,0 @@ - - - - - _XCCurrentVersionName - MeshtasticClient.xcdatamodel - - diff --git a/MeshtasticClient/Model/MeshtasticClient.xcdatamodeld/MeshtasticClient.xcdatamodel/contents b/MeshtasticClient/Model/MeshtasticClient.xcdatamodeld/MeshtasticClient.xcdatamodel/contents deleted file mode 100644 index 95f22585..00000000 --- a/MeshtasticClient/Model/MeshtasticClient.xcdatamodeld/MeshtasticClient.xcdatamodel/contents +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/AccentColor.colorset/Contents.json b/MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/AccentColor.colorset/Contents.json new file mode 100644 index 00000000..274babba --- /dev/null +++ b/MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/AccentColor.colorset/Contents.json @@ -0,0 +1,20 @@ +{ + "colors" : [ + { + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meshtastic Watch/Assets.xcassets/AppIcon.appiconset/1024.png b/MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/1024.png similarity index 100% rename from Meshtastic Watch/Assets.xcassets/AppIcon.appiconset/1024.png rename to MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/1024.png diff --git a/Meshtastic Watch/Assets.xcassets/AppIcon.appiconset/120-1.png b/MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/120-1.png similarity index 100% rename from Meshtastic Watch/Assets.xcassets/AppIcon.appiconset/120-1.png rename to MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/120-1.png diff --git a/Meshtastic Watch/Assets.xcassets/AppIcon.appiconset/120.png b/MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/120.png similarity index 100% rename from Meshtastic Watch/Assets.xcassets/AppIcon.appiconset/120.png rename to MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/120.png diff --git a/Meshtastic Watch/Assets.xcassets/AppIcon.appiconset/152.png b/MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/152.png similarity index 100% rename from Meshtastic Watch/Assets.xcassets/AppIcon.appiconset/152.png rename to MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/152.png diff --git a/Meshtastic Watch/Assets.xcassets/AppIcon.appiconset/167.png b/MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/167.png similarity index 100% rename from Meshtastic Watch/Assets.xcassets/AppIcon.appiconset/167.png rename to MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/167.png diff --git a/Meshtastic Watch/Assets.xcassets/AppIcon.appiconset/180.png b/MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/180.png similarity index 100% rename from Meshtastic Watch/Assets.xcassets/AppIcon.appiconset/180.png rename to MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/180.png diff --git a/Meshtastic Watch/Assets.xcassets/AppIcon.appiconset/20.png b/MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/20.png similarity index 100% rename from Meshtastic Watch/Assets.xcassets/AppIcon.appiconset/20.png rename to MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/20.png diff --git a/Meshtastic Watch/Assets.xcassets/AppIcon.appiconset/29.png b/MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/29.png similarity index 100% rename from Meshtastic Watch/Assets.xcassets/AppIcon.appiconset/29.png rename to MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/29.png diff --git a/Meshtastic Watch/Assets.xcassets/AppIcon.appiconset/40-1.png b/MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/40-1.png similarity index 100% rename from Meshtastic Watch/Assets.xcassets/AppIcon.appiconset/40-1.png rename to MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/40-1.png diff --git a/Meshtastic Watch/Assets.xcassets/AppIcon.appiconset/40-2.png b/MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/40-2.png similarity index 100% rename from Meshtastic Watch/Assets.xcassets/AppIcon.appiconset/40-2.png rename to MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/40-2.png diff --git a/Meshtastic Watch/Assets.xcassets/AppIcon.appiconset/40.png b/MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/40.png similarity index 100% rename from Meshtastic Watch/Assets.xcassets/AppIcon.appiconset/40.png rename to MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/40.png diff --git a/Meshtastic Watch/Assets.xcassets/AppIcon.appiconset/58-1.png b/MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/58-1.png similarity index 100% rename from Meshtastic Watch/Assets.xcassets/AppIcon.appiconset/58-1.png rename to MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/58-1.png diff --git a/Meshtastic Watch/Assets.xcassets/AppIcon.appiconset/58.png b/MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/58.png similarity index 100% rename from Meshtastic Watch/Assets.xcassets/AppIcon.appiconset/58.png rename to MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/58.png diff --git a/Meshtastic Watch/Assets.xcassets/AppIcon.appiconset/60.png b/MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/60.png similarity index 100% rename from Meshtastic Watch/Assets.xcassets/AppIcon.appiconset/60.png rename to MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/60.png diff --git a/Meshtastic Watch/Assets.xcassets/AppIcon.appiconset/76.png b/MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/76.png similarity index 100% rename from Meshtastic Watch/Assets.xcassets/AppIcon.appiconset/76.png rename to MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/76.png diff --git a/Meshtastic Watch/Assets.xcassets/AppIcon.appiconset/80-1.png b/MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/80-1.png similarity index 100% rename from Meshtastic Watch/Assets.xcassets/AppIcon.appiconset/80-1.png rename to MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/80-1.png diff --git a/Meshtastic Watch/Assets.xcassets/AppIcon.appiconset/80.png b/MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/80.png similarity index 100% rename from Meshtastic Watch/Assets.xcassets/AppIcon.appiconset/80.png rename to MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/80.png diff --git a/Meshtastic Watch/Assets.xcassets/AppIcon.appiconset/87.png b/MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/87.png similarity index 100% rename from Meshtastic Watch/Assets.xcassets/AppIcon.appiconset/87.png rename to MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/87.png diff --git a/MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/Contents.json b/MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 00000000..1cd4ae9f --- /dev/null +++ b/MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,116 @@ +{ + "images" : [ + { + "filename" : "40-2.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "20x20" + }, + { + "filename" : "60.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "20x20" + }, + { + "filename" : "58.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "29x29" + }, + { + "filename" : "87.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "29x29" + }, + { + "filename" : "80.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "40x40" + }, + { + "filename" : "120-1.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "40x40" + }, + { + "filename" : "120.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "60x60" + }, + { + "filename" : "180.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "60x60" + }, + { + "filename" : "20.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "20x20" + }, + { + "filename" : "40-1.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "20x20" + }, + { + "filename" : "29.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "29x29" + }, + { + "filename" : "58-1.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "29x29" + }, + { + "filename" : "40.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "40x40" + }, + { + "filename" : "80-1.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "40x40" + }, + { + "filename" : "76.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "76x76" + }, + { + "filename" : "152.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "76x76" + }, + { + "filename" : "167.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "83.5x83.5" + }, + { + "filename" : "1024.png", + "idiom" : "ios-marketing", + "scale" : "1x", + "size" : "1024x1024" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/Color.colorset/Contents.json b/MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/Color.colorset/Contents.json new file mode 100644 index 00000000..22c4bb0a --- /dev/null +++ b/MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/Color.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "1.000", + "green" : "1.000", + "red" : "1.000" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "1.000", + "green" : "1.000", + "red" : "1.000" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/Contents.json b/MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/Contents.json new file mode 100644 index 00000000..73c00596 --- /dev/null +++ b/MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Meshtastic Watch/Assets.xcassets/HELTECV20.imageset/655DCEC0-309D-430A-AF50-2453B6ADB1F6-1.png b/MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/HELTECV20.imageset/655DCEC0-309D-430A-AF50-2453B6ADB1F6-1.png similarity index 100% rename from Meshtastic Watch/Assets.xcassets/HELTECV20.imageset/655DCEC0-309D-430A-AF50-2453B6ADB1F6-1.png rename to MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/HELTECV20.imageset/655DCEC0-309D-430A-AF50-2453B6ADB1F6-1.png diff --git a/Meshtastic Watch/Assets.xcassets/HELTECV20.imageset/655DCEC0-309D-430A-AF50-2453B6ADB1F6-2.png b/MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/HELTECV20.imageset/655DCEC0-309D-430A-AF50-2453B6ADB1F6-2.png similarity index 100% rename from Meshtastic Watch/Assets.xcassets/HELTECV20.imageset/655DCEC0-309D-430A-AF50-2453B6ADB1F6-2.png rename to MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/HELTECV20.imageset/655DCEC0-309D-430A-AF50-2453B6ADB1F6-2.png diff --git a/Meshtastic Watch/Assets.xcassets/HELTECV20.imageset/655DCEC0-309D-430A-AF50-2453B6ADB1F6.png b/MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/HELTECV20.imageset/655DCEC0-309D-430A-AF50-2453B6ADB1F6.png similarity index 100% rename from Meshtastic Watch/Assets.xcassets/HELTECV20.imageset/655DCEC0-309D-430A-AF50-2453B6ADB1F6.png rename to MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/HELTECV20.imageset/655DCEC0-309D-430A-AF50-2453B6ADB1F6.png diff --git a/Meshtastic Watch/Assets.xcassets/HELTECV20.imageset/Contents.json b/MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/HELTECV20.imageset/Contents.json similarity index 100% rename from Meshtastic Watch/Assets.xcassets/HELTECV20.imageset/Contents.json rename to MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/HELTECV20.imageset/Contents.json diff --git a/Meshtastic Watch/Assets.xcassets/TLORAV2.imageset/Contents.json b/MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/TLORAV2.imageset/Contents.json similarity index 100% rename from Meshtastic Watch/Assets.xcassets/TLORAV2.imageset/Contents.json rename to MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/TLORAV2.imageset/Contents.json diff --git a/Meshtastic Watch/Assets.xcassets/TLORAV211p6.imageset/Contents.json b/MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/TLORAV211p6.imageset/Contents.json similarity index 100% rename from Meshtastic Watch/Assets.xcassets/TLORAV211p6.imageset/Contents.json rename to MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/TLORAV211p6.imageset/Contents.json diff --git a/Meshtastic Watch/Assets.xcassets/UNSET.imageset/Contents.json b/MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/UNSET.imageset/Contents.json similarity index 100% rename from Meshtastic Watch/Assets.xcassets/UNSET.imageset/Contents.json rename to MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/UNSET.imageset/Contents.json diff --git a/Meshtastic Watch/Assets.xcassets/RAK4631.imageset/Contents.json b/MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/rak4631.imageset/Contents.json similarity index 100% rename from Meshtastic Watch/Assets.xcassets/RAK4631.imageset/Contents.json rename to MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/rak4631.imageset/Contents.json diff --git a/Meshtastic Watch/Assets.xcassets/RAK4631.imageset/RAK7205_Enclosure-With-Solar-Panel_Top-View_01_9ed42002-fb51-4c49-a69e-43fcef692ef6_739x@2x.progressive-1.png b/MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/rak4631.imageset/RAK7205_Enclosure-With-Solar-Panel_Top-View_01_9ed42002-fb51-4c49-a69e-43fcef692ef6_739x@2x.progressive-1.png similarity index 100% rename from Meshtastic Watch/Assets.xcassets/RAK4631.imageset/RAK7205_Enclosure-With-Solar-Panel_Top-View_01_9ed42002-fb51-4c49-a69e-43fcef692ef6_739x@2x.progressive-1.png rename to MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/rak4631.imageset/RAK7205_Enclosure-With-Solar-Panel_Top-View_01_9ed42002-fb51-4c49-a69e-43fcef692ef6_739x@2x.progressive-1.png diff --git a/Meshtastic Watch/Assets.xcassets/RAK4631.imageset/RAK7205_Enclosure-With-Solar-Panel_Top-View_01_9ed42002-fb51-4c49-a69e-43fcef692ef6_739x@2x.progressive.png b/MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/rak4631.imageset/RAK7205_Enclosure-With-Solar-Panel_Top-View_01_9ed42002-fb51-4c49-a69e-43fcef692ef6_739x@2x.progressive.png similarity index 100% rename from Meshtastic Watch/Assets.xcassets/RAK4631.imageset/RAK7205_Enclosure-With-Solar-Panel_Top-View_01_9ed42002-fb51-4c49-a69e-43fcef692ef6_739x@2x.progressive.png rename to MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/rak4631.imageset/RAK7205_Enclosure-With-Solar-Panel_Top-View_01_9ed42002-fb51-4c49-a69e-43fcef692ef6_739x@2x.progressive.png diff --git a/Meshtastic Watch/Assets.xcassets/TBEAM.imageset/Contents.json b/MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/tbeam.imageset/Contents.json similarity index 100% rename from Meshtastic Watch/Assets.xcassets/TBEAM.imageset/Contents.json rename to MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/tbeam.imageset/Contents.json diff --git a/Meshtastic Watch/Assets.xcassets/TBEAM.imageset/tbeam-1.jpg b/MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/tbeam.imageset/tbeam-1.jpg similarity index 100% rename from Meshtastic Watch/Assets.xcassets/TBEAM.imageset/tbeam-1.jpg rename to MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/tbeam.imageset/tbeam-1.jpg diff --git a/Meshtastic Watch/Assets.xcassets/TBEAM.imageset/tbeam-2.jpg b/MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/tbeam.imageset/tbeam-2.jpg similarity index 100% rename from Meshtastic Watch/Assets.xcassets/TBEAM.imageset/tbeam-2.jpg rename to MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/tbeam.imageset/tbeam-2.jpg diff --git a/Meshtastic Watch/Assets.xcassets/TBEAM.imageset/tbeam.jpg b/MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/tbeam.imageset/tbeam.jpg similarity index 100% rename from Meshtastic Watch/Assets.xcassets/TBEAM.imageset/tbeam.jpg rename to MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/tbeam.imageset/tbeam.jpg diff --git a/Meshtastic Watch/Assets.xcassets/TECHO.imageset/Contents.json b/MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/techo.imageset/Contents.json similarity index 100% rename from Meshtastic Watch/Assets.xcassets/TECHO.imageset/Contents.json rename to MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/techo.imageset/Contents.json diff --git a/Meshtastic Watch/Assets.xcassets/TECHO.imageset/techo-1.jpg b/MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/techo.imageset/techo-1.jpg similarity index 100% rename from Meshtastic Watch/Assets.xcassets/TECHO.imageset/techo-1.jpg rename to MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/techo.imageset/techo-1.jpg diff --git a/Meshtastic Watch/Assets.xcassets/TECHO.imageset/techo-2.jpg b/MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/techo.imageset/techo-2.jpg similarity index 100% rename from Meshtastic Watch/Assets.xcassets/TECHO.imageset/techo-2.jpg rename to MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/techo.imageset/techo-2.jpg diff --git a/Meshtastic Watch/Assets.xcassets/TECHO.imageset/techo.jpg b/MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/techo.imageset/techo.jpg similarity index 100% rename from Meshtastic Watch/Assets.xcassets/TECHO.imageset/techo.jpg rename to MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/techo.imageset/techo.jpg diff --git a/Meshtastic Watch/Assets.xcassets/TLORAV1.imageset/Contents.json b/MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/tlorav1.imageset/Contents.json similarity index 100% rename from Meshtastic Watch/Assets.xcassets/TLORAV1.imageset/Contents.json rename to MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/tlorav1.imageset/Contents.json diff --git a/Meshtastic Watch/Assets.xcassets/TLORAV1.imageset/tlora-1.jpeg b/MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/tlorav1.imageset/tlora-1.jpeg similarity index 100% rename from Meshtastic Watch/Assets.xcassets/TLORAV1.imageset/tlora-1.jpeg rename to MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/tlorav1.imageset/tlora-1.jpeg diff --git a/Meshtastic Watch/Assets.xcassets/TLORAV1.imageset/tlora-2.jpeg b/MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/tlorav1.imageset/tlora-2.jpeg similarity index 100% rename from Meshtastic Watch/Assets.xcassets/TLORAV1.imageset/tlora-2.jpeg rename to MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/tlorav1.imageset/tlora-2.jpeg diff --git a/Meshtastic Watch/Assets.xcassets/TLORAV1.imageset/tlora.jpeg b/MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/tlorav1.imageset/tlora.jpeg similarity index 100% rename from Meshtastic Watch/Assets.xcassets/TLORAV1.imageset/tlora.jpeg rename to MeshtasticClient/Resources/Assets.xcassets/Assets.xcassets/tlorav1.imageset/tlora.jpeg diff --git a/MeshtasticClient/Views/Messages/Messages.swift b/MeshtasticClient/Views/Messages/Messages.swift index 1a035287..5befe82b 100644 --- a/MeshtasticClient/Views/Messages/Messages.swift +++ b/MeshtasticClient/Views/Messages/Messages.swift @@ -193,7 +193,9 @@ struct Messages: View { .navigationBarItems(trailing: ZStack { - ConnectedDevice(bluetoothOn: bleManager.isSwitchedOn, deviceConnected: bleManager.connectedPeripheral != nil, name: (bleManager.connectedNode != nil) ? bleManager.connectedNode.user.shortName : ((bleManager.connectedPeripheral != nil) ? bleManager.connectedPeripheral.name : "Unknown") ) + if bleManager != nil && bleManager.messageData != nil && bleManager.connectedPeripheral != nil { + // ConnectedDevice(bluetoothOn: bleManager.isSwitchedOn, deviceConnected: bleManager.connectedPeripheral != nil, name: (bleManager.connectedNode != nil) ? bleManager.connectedNode.user.shortName : ((bleManager.connectedPeripheral != nil) ? bleManager.connectedPeripheral.name : "Unknown") ) + } }) .onAppear {