From a7f4c2e4d96f97b66e5469b4fafd9f30512cc72c Mon Sep 17 00:00:00 2001 From: Garth Vander Houwen Date: Thu, 9 Jun 2022 22:11:54 -0700 Subject: [PATCH] Rename final instances of MeshtasticClient --- Meshtastic Apple.xcodeproj/project.pbxproj | 20 +++++++++---------- MeshtasticApple/Helpers/ChannelHelper.swift | 2 +- MeshtasticApple/Info.plist | 6 +++--- MeshtasticApple/Model/MapLocation.swift | 2 +- MeshtasticApple/Model/UserSettings.swift | 2 +- .../Persistence/UserEntityExtension.swift | 2 +- MeshtasticApple/Views/Bluetooth/Connect.swift | 2 +- .../Views/Helpers/DateTimeText.swift | 2 +- .../Map/Custom/PositionAnnotationView.swift | 2 +- .../Views/Map/LocalMBTileOverlay.swift | 2 +- MeshtasticApple/Views/Map/MapView.swift | 2 +- MeshtasticApple/Views/Messages/Contacts.swift | 2 +- .../Views/Messages/UserMessageList.swift | 2 +- MeshtasticApple/Views/Nodes/NodeList.swift | 2 +- MeshtasticApple/Views/Nodes/NodeMap.swift | 3 +-- .../Views/Settings/DeviceSettings.swift | 2 +- MeshtasticApple/Views/Settings/Settings.swift | 2 +- .../Views/Settings/ShareChannel.swift | 2 +- .../MeshtasticAppleTests.swift | 7 ++++--- ...sts.swift => MeshtasticAppleUITests.swift} | 6 +++--- 20 files changed, 36 insertions(+), 36 deletions(-) rename MeshtasticAppleUITests/{MeshtasticClientUITests.swift => MeshtasticAppleUITests.swift} (92%) diff --git a/Meshtastic Apple.xcodeproj/project.pbxproj b/Meshtastic Apple.xcodeproj/project.pbxproj index 6a78b0e9..fd0460d3 100644 --- a/Meshtastic Apple.xcodeproj/project.pbxproj +++ b/Meshtastic Apple.xcodeproj/project.pbxproj @@ -56,7 +56,7 @@ DDC2E15C26CE248F0042C5E4 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = DDC2E15B26CE248F0042C5E4 /* Assets.xcassets */; }; DDC2E15F26CE248F0042C5E4 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = DDC2E15E26CE248F0042C5E4 /* Preview Assets.xcassets */; }; DDC2E16F26CE248F0042C5E4 /* MeshtasticAppleTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDC2E16E26CE248F0042C5E4 /* MeshtasticAppleTests.swift */; }; - DDC2E17A26CE248F0042C5E4 /* MeshtasticClientUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDC2E17926CE248F0042C5E4 /* MeshtasticClientUITests.swift */; }; + DDC2E17A26CE248F0042C5E4 /* MeshtasticAppleUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDC2E17926CE248F0042C5E4 /* MeshtasticAppleUITests.swift */; }; DDC2E18F26CE25FE0042C5E4 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDC2E18E26CE25FE0042C5E4 /* ContentView.swift */; }; DDC2E1A726CEB3400042C5E4 /* LocationHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDC2E1A626CEB3400042C5E4 /* LocationHelper.swift */; }; DDC3B274283F411B00AC321C /* LastHeardText.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDC3B273283F411B00AC321C /* LastHeardText.swift */; }; @@ -140,7 +140,7 @@ DDC2E16E26CE248F0042C5E4 /* MeshtasticAppleTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MeshtasticAppleTests.swift; sourceTree = ""; }; DDC2E17026CE248F0042C5E4 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; DDC2E17526CE248F0042C5E4 /* MeshtasticAppleUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = MeshtasticAppleUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; - DDC2E17926CE248F0042C5E4 /* MeshtasticClientUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MeshtasticClientUITests.swift; sourceTree = ""; }; + DDC2E17926CE248F0042C5E4 /* MeshtasticAppleUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MeshtasticAppleUITests.swift; sourceTree = ""; }; 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 = ""; }; @@ -318,7 +318,7 @@ DDC2E17826CE248F0042C5E4 /* MeshtasticAppleUITests */ = { isa = PBXGroup; children = ( - DDC2E17926CE248F0042C5E4 /* MeshtasticClientUITests.swift */, + DDC2E17926CE248F0042C5E4 /* MeshtasticAppleUITests.swift */, DDC2E17B26CE248F0042C5E4 /* Info.plist */, ); path = MeshtasticAppleUITests; @@ -629,7 +629,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - DDC2E17A26CE248F0042C5E4 /* MeshtasticClientUITests.swift in Sources */, + DDC2E17A26CE248F0042C5E4 /* MeshtasticAppleUITests.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -838,18 +838,18 @@ "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development"; CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = GCH7VS5Y9R; - INFOPLIST_FILE = MeshtasticClientTests/Info.plist; + INFOPLIST_FILE = MeshtasticAppleTests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 14.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", "@loader_path/Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = gvh.MeshtasticClientTests; + PRODUCT_BUNDLE_IDENTIFIER = gvh.MeshtasticAppleTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/MeshtasticClient.app/MeshtasticClient"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/MeshtasticApple.app/MeshtasticApple"; }; name = Debug; }; @@ -861,18 +861,18 @@ "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development"; CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = GCH7VS5Y9R; - INFOPLIST_FILE = MeshtasticClientTests/Info.plist; + INFOPLIST_FILE = MeshtasticAppleTests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 14.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", "@loader_path/Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = gvh.MeshtasticClientTests; + PRODUCT_BUNDLE_IDENTIFIER = gvh.MeshtasticAppleTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/MeshtasticClient.app/MeshtasticClient"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/MeshtasticApple.app/MeshtasticApple"; }; name = Release; }; diff --git a/MeshtasticApple/Helpers/ChannelHelper.swift b/MeshtasticApple/Helpers/ChannelHelper.swift index 0c7f42ed..5fb8903e 100644 --- a/MeshtasticApple/Helpers/ChannelHelper.swift +++ b/MeshtasticApple/Helpers/ChannelHelper.swift @@ -1,6 +1,6 @@ // // ChannelHelper.swift -// MeshtasticClient +// MeshtasticApple // // Created by Garth Vander Houwen on 6/6/22. // diff --git a/MeshtasticApple/Info.plist b/MeshtasticApple/Info.plist index ea9d0da6..8dcbdcdb 100644 --- a/MeshtasticApple/Info.plist +++ b/MeshtasticApple/Info.plist @@ -15,7 +15,7 @@ Default LSItemContentTypes - gvh.MeshtasticClient.mbtiles + gvh.MeshtasticApple.mbtiles @@ -44,7 +44,7 @@ NSBluetoothAlwaysUsageDescription We use bluetooth to connect to nearby Meshtastic Devices NSBluetoothPeripheralUsageDescription - Bluetooth is used to connect an iPhone to a user's meshtastic device to allow text messaging and location data for the mesh network. + Bluetooth is used to connect an iPhone to a user's meshtastic device to allow text messaging and location data for the mesh network. NSCameraUsageDescription We use the camera to share channels using a QR Code NSLocationUsageDescription @@ -98,7 +98,7 @@ UTTypeIconFiles UTTypeIdentifier - gvh.MeshtasticClient.mbtiles + gvh.MeshtasticApple.mbtiles UTTypeTagSpecification public.filename-extension diff --git a/MeshtasticApple/Model/MapLocation.swift b/MeshtasticApple/Model/MapLocation.swift index 58d2c770..77fd9d02 100644 --- a/MeshtasticApple/Model/MapLocation.swift +++ b/MeshtasticApple/Model/MapLocation.swift @@ -1,6 +1,6 @@ // // MapLocation.swift -// MeshtasticClient +// MeshtasticApple // // Created by Garth Vander Houwen on 12/17/21. // diff --git a/MeshtasticApple/Model/UserSettings.swift b/MeshtasticApple/Model/UserSettings.swift index 89fae4b1..c3d82509 100644 --- a/MeshtasticApple/Model/UserSettings.swift +++ b/MeshtasticApple/Model/UserSettings.swift @@ -1,6 +1,6 @@ // // UserSettings.swift -// MeshtasticClient +// MeshtasticApple // // Created by Garth Vander Houwen on 6/9/22. // diff --git a/MeshtasticApple/Persistence/UserEntityExtension.swift b/MeshtasticApple/Persistence/UserEntityExtension.swift index 23283eef..263140ba 100644 --- a/MeshtasticApple/Persistence/UserEntityExtension.swift +++ b/MeshtasticApple/Persistence/UserEntityExtension.swift @@ -1,6 +1,6 @@ // // UserEntityExtension.swift -// MeshtasticClient +// MeshtasticApple // // Created by Garth Vander Houwen on 6/3/22. // diff --git a/MeshtasticApple/Views/Bluetooth/Connect.swift b/MeshtasticApple/Views/Bluetooth/Connect.swift index ae78a1dc..ed171bf3 100644 --- a/MeshtasticApple/Views/Bluetooth/Connect.swift +++ b/MeshtasticApple/Views/Bluetooth/Connect.swift @@ -1,6 +1,6 @@ // // Connect.swift -// MeshtasticClient +// MeshtasticApple // // Created by Garth Vander Houwen on 8/18/21. // diff --git a/MeshtasticApple/Views/Helpers/DateTimeText.swift b/MeshtasticApple/Views/Helpers/DateTimeText.swift index 523f6445..cbd57004 100644 --- a/MeshtasticApple/Views/Helpers/DateTimeText.swift +++ b/MeshtasticApple/Views/Helpers/DateTimeText.swift @@ -1,6 +1,6 @@ // // DateTimeText.swift -// MeshtasticClient +// MeshtasticApple // // Created by Garth Vander Houwen on 5/30/22. // diff --git a/MeshtasticApple/Views/Map/Custom/PositionAnnotationView.swift b/MeshtasticApple/Views/Map/Custom/PositionAnnotationView.swift index f00858c6..d9744158 100644 --- a/MeshtasticApple/Views/Map/Custom/PositionAnnotationView.swift +++ b/MeshtasticApple/Views/Map/Custom/PositionAnnotationView.swift @@ -1,6 +1,6 @@ // // PositionAnnotationView.swift -// MeshtasticClient +// MeshtasticApple // // Created by Joshua Pirihi on 24/12/21. // diff --git a/MeshtasticApple/Views/Map/LocalMBTileOverlay.swift b/MeshtasticApple/Views/Map/LocalMBTileOverlay.swift index ed3f4022..83409f4b 100644 --- a/MeshtasticApple/Views/Map/LocalMBTileOverlay.swift +++ b/MeshtasticApple/Views/Map/LocalMBTileOverlay.swift @@ -1,6 +1,6 @@ // // LocalMBTileOverlay.swift -// MeshtasticClient +// MeshtasticApple // // Created by Joshua Pirihi on 16/01/22. // diff --git a/MeshtasticApple/Views/Map/MapView.swift b/MeshtasticApple/Views/Map/MapView.swift index 4f2d6431..57deab83 100644 --- a/MeshtasticApple/Views/Map/MapView.swift +++ b/MeshtasticApple/Views/Map/MapView.swift @@ -1,6 +1,6 @@ // // MapView.swift -// MeshtasticClient +// MeshtasticApple // // Created by Joshua Pirihi on 22/12/21. // diff --git a/MeshtasticApple/Views/Messages/Contacts.swift b/MeshtasticApple/Views/Messages/Contacts.swift index 66a20737..007dd6ad 100644 --- a/MeshtasticApple/Views/Messages/Contacts.swift +++ b/MeshtasticApple/Views/Messages/Contacts.swift @@ -1,6 +1,6 @@ // // Contacts.swift -// MeshtasticClient +// MeshtasticApple // // Created by Garth Vander Houwen on 12/21/21. // diff --git a/MeshtasticApple/Views/Messages/UserMessageList.swift b/MeshtasticApple/Views/Messages/UserMessageList.swift index 98340563..d3e2abb5 100644 --- a/MeshtasticApple/Views/Messages/UserMessageList.swift +++ b/MeshtasticApple/Views/Messages/UserMessageList.swift @@ -1,6 +1,6 @@ // // UserMessageList.swift -// MeshtasticClient +// MeshtasticApple // // Created by Garth Vander Houwen on 12/24/21. // diff --git a/MeshtasticApple/Views/Nodes/NodeList.swift b/MeshtasticApple/Views/Nodes/NodeList.swift index a84e9e6b..0a3d2916 100644 --- a/MeshtasticApple/Views/Nodes/NodeList.swift +++ b/MeshtasticApple/Views/Nodes/NodeList.swift @@ -1,6 +1,6 @@ // // NodeList.swift -// MeshtasticClient +// MeshtasticApple // // Created by Garth Vander Houwen on 8/7/21. // diff --git a/MeshtasticApple/Views/Nodes/NodeMap.swift b/MeshtasticApple/Views/Nodes/NodeMap.swift index 4c4d223c..0aa4516d 100644 --- a/MeshtasticApple/Views/Nodes/NodeMap.swift +++ b/MeshtasticApple/Views/Nodes/NodeMap.swift @@ -1,9 +1,8 @@ // // NodeMap.swift -// MeshtasticClient +// MeshtasticApple // // Created by Garth Vander Houwen on 8/7/21. -// Copyright © 2021 Apple. All rights reserved. // import SwiftUI diff --git a/MeshtasticApple/Views/Settings/DeviceSettings.swift b/MeshtasticApple/Views/Settings/DeviceSettings.swift index a8b1c801..9874e317 100644 --- a/MeshtasticApple/Views/Settings/DeviceSettings.swift +++ b/MeshtasticApple/Views/Settings/DeviceSettings.swift @@ -1,6 +1,6 @@ // // DeviceSettings.swift -// MeshtasticClient +// MeshtasticApple // // Created by Garth Vander Houwen on 6/7/22. // diff --git a/MeshtasticApple/Views/Settings/Settings.swift b/MeshtasticApple/Views/Settings/Settings.swift index 0d2a3d01..079ef225 100644 --- a/MeshtasticApple/Views/Settings/Settings.swift +++ b/MeshtasticApple/Views/Settings/Settings.swift @@ -1,6 +1,6 @@ // // Settings.swift -// MeshtasticClient +// MeshtasticApple // // Created by Garth Vander Houwen on 6/9/22. // diff --git a/MeshtasticApple/Views/Settings/ShareChannel.swift b/MeshtasticApple/Views/Settings/ShareChannel.swift index 1e252d7a..6daa22b8 100644 --- a/MeshtasticApple/Views/Settings/ShareChannel.swift +++ b/MeshtasticApple/Views/Settings/ShareChannel.swift @@ -1,6 +1,6 @@ // // ShareChannel.swift -// MeshtasticClient +// MeshtasticApple // // Created by Garth Vander Houwen on 4/8/22. // diff --git a/MeshtasticAppleTests/MeshtasticAppleTests.swift b/MeshtasticAppleTests/MeshtasticAppleTests.swift index a818d88b..08bed2c3 100644 --- a/MeshtasticAppleTests/MeshtasticAppleTests.swift +++ b/MeshtasticAppleTests/MeshtasticAppleTests.swift @@ -1,12 +1,13 @@ // -// MeshtasticClientTests.swift -// MeshtasticClientTests +// MeshtasticAppleTests.swift +// MeshtasticAppleTests // // Created by Garth Vander Houwen on 8/18/21. // import XCTest -// @testable import MeshtasticClient + +@testable import MeshtasticApple class MeshtasticAppleTests: XCTestCase { diff --git a/MeshtasticAppleUITests/MeshtasticClientUITests.swift b/MeshtasticAppleUITests/MeshtasticAppleUITests.swift similarity index 92% rename from MeshtasticAppleUITests/MeshtasticClientUITests.swift rename to MeshtasticAppleUITests/MeshtasticAppleUITests.swift index 67eeeef7..1d6dbac7 100644 --- a/MeshtasticAppleUITests/MeshtasticClientUITests.swift +++ b/MeshtasticAppleUITests/MeshtasticAppleUITests.swift @@ -1,13 +1,13 @@ // -// MeshtasticClientUITests.swift -// MeshtasticClientUITests +// MeshtasticAppleUITests.swift +// MeshtasticAppleUITests // // Created by Garth Vander Houwen on 8/18/21. // import XCTest -class MeshtasticClientUITests: XCTestCase { +class MeshtasticAppleUITests: XCTestCase { override func setUpWithError() throws { // Put setup code here. This method is called before the invocation of each test method in the class.