From ea14d87743199ce67eaea2a4c059817e030d872e Mon Sep 17 00:00:00 2001 From: Brent Simmons Date: Sun, 2 Jul 2023 15:39:12 -0700 Subject: [PATCH] Rename AddWebFeedIntent to AddFeedIntent. --- NetNewsWire.xcodeproj/project.pbxproj | 12 +++--- ...ndler.swift => AddFeedIntentHandler.swift} | 40 +++++++++---------- iOS/IntentsExtension/IntentHandler.swift | 4 +- iOS/MasterFeed/MasterFeedViewController.swift | 2 +- 4 files changed, 29 insertions(+), 29 deletions(-) rename iOS/Intents/{AddWebFeedIntentHandler.swift => AddFeedIntentHandler.swift} (66%) diff --git a/NetNewsWire.xcodeproj/project.pbxproj b/NetNewsWire.xcodeproj/project.pbxproj index 460781212..4f5d24167 100644 --- a/NetNewsWire.xcodeproj/project.pbxproj +++ b/NetNewsWire.xcodeproj/project.pbxproj @@ -115,8 +115,8 @@ 512E094D2268B8AB00BDCFDD /* DeleteCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84B99C9C1FAE83C600ECDEDB /* DeleteCommand.swift */; }; 5131463E235A7BBE00387FDC /* NetNewsWire iOS Intents Extension.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = 51314637235A7BBE00387FDC /* NetNewsWire iOS Intents Extension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; 51314668235A7E4600387FDC /* IntentHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51314666235A7E4600387FDC /* IntentHandler.swift */; }; - 513146B2235A81A400387FDC /* AddWebFeedIntentHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 513146B1235A81A400387FDC /* AddWebFeedIntentHandler.swift */; }; - 513146B3235A81A400387FDC /* AddWebFeedIntentHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 513146B1235A81A400387FDC /* AddWebFeedIntentHandler.swift */; }; + 513146B2235A81A400387FDC /* AddFeedIntentHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 513146B1235A81A400387FDC /* AddFeedIntentHandler.swift */; }; + 513146B3235A81A400387FDC /* AddFeedIntentHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 513146B1235A81A400387FDC /* AddFeedIntentHandler.swift */; }; 51314704235C41FC00387FDC /* Intents.intentdefinition in Sources */ = {isa = PBXBuildFile; fileRef = 51314707235C41FC00387FDC /* Intents.intentdefinition */; }; 51314705235C41FC00387FDC /* Intents.intentdefinition in Sources */ = {isa = PBXBuildFile; fileRef = 51314707235C41FC00387FDC /* Intents.intentdefinition */; }; 513277442590FBB60064F1E7 /* Account in Embed Frameworks */ = {isa = PBXBuildFile; productRef = 514C16CD24D2E63F009A3AFA /* Account */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; @@ -1177,7 +1177,7 @@ 51314665235A7E4600387FDC /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 51314666235A7E4600387FDC /* IntentHandler.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IntentHandler.swift; sourceTree = ""; }; 51314684235A7EB900387FDC /* NetNewsWire_iOS_IntentsExtension.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = NetNewsWire_iOS_IntentsExtension.entitlements; sourceTree = ""; }; - 513146B1235A81A400387FDC /* AddWebFeedIntentHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddWebFeedIntentHandler.swift; sourceTree = ""; }; + 513146B1235A81A400387FDC /* AddFeedIntentHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddFeedIntentHandler.swift; sourceTree = ""; }; 51314706235C41FC00387FDC /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.intentdefinition; name = Base; path = Base.lproj/Intents.intentdefinition; sourceTree = ""; }; 51314714235C420900387FDC /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Intents.strings; sourceTree = ""; }; 5132779E2591034D0064F1E7 /* icon.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = icon.icns; sourceTree = ""; }; @@ -1934,7 +1934,7 @@ isa = PBXGroup; children = ( 51314707235C41FC00387FDC /* Intents.intentdefinition */, - 513146B1235A81A400387FDC /* AddWebFeedIntentHandler.swift */, + 513146B1235A81A400387FDC /* AddFeedIntentHandler.swift */, ); path = Intents; sourceTree = ""; @@ -3840,7 +3840,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 513146B3235A81A400387FDC /* AddWebFeedIntentHandler.swift in Sources */, + 513146B3235A81A400387FDC /* AddFeedIntentHandler.swift in Sources */, 51B5C8E623F4BBFA00032075 /* ExtensionFeedAddRequest.swift in Sources */, 51314705235C41FC00387FDC /* Intents.intentdefinition in Sources */, 51B5C8E523F4BBFA00032075 /* ExtensionContainersFile.swift in Sources */, @@ -4119,7 +4119,7 @@ 51C4528F226509BD00C03939 /* UnreadFeed.swift in Sources */, 51FD413B2342BD0500880194 /* MasterTimelineUnreadCountView.swift in Sources */, DFB3497A294A962D00BC81AD /* AddAccountListView.swift in Sources */, - 513146B2235A81A400387FDC /* AddWebFeedIntentHandler.swift in Sources */, + 513146B2235A81A400387FDC /* AddFeedIntentHandler.swift in Sources */, 51D87EE12311D34700E63F03 /* ActivityType.swift in Sources */, 51C452772265091600C03939 /* MultilineUILabelSizer.swift in Sources */, DFEB034F2A273BFE00C7573A /* UTType.swift in Sources */, diff --git a/iOS/Intents/AddWebFeedIntentHandler.swift b/iOS/Intents/AddFeedIntentHandler.swift similarity index 66% rename from iOS/Intents/AddWebFeedIntentHandler.swift rename to iOS/Intents/AddFeedIntentHandler.swift index c32c2ab10..7b36b7feb 100644 --- a/iOS/Intents/AddWebFeedIntentHandler.swift +++ b/iOS/Intents/AddFeedIntentHandler.swift @@ -1,5 +1,5 @@ // -// AddWebFeedIntentHandler.swift +// AddFeedIntentHandler.swift // NetNewsWire // // Created by Maurice Parker on 10/18/19. @@ -8,7 +8,7 @@ import Intents -public enum AddWebFeedIntentHandlerError: LocalizedError { +public enum AddFeedIntentHandlerError: LocalizedError { case communicationFailure @@ -21,13 +21,13 @@ public enum AddWebFeedIntentHandlerError: LocalizedError { } -public class AddWebFeedIntentHandler: NSObject, AddWebFeedIntentHandling { +public class AddFeedIntentHandler: NSObject, AddFeedIntentHandling { override init() { super.init() } - public func resolveUrl(for intent: AddWebFeedIntent, with completion: @escaping (AddWebFeedUrlResolutionResult) -> Void) { + public func resolveUrl(for intent: AddFeedIntent, with completion: @escaping (AddFeedUrlResolutionResult) -> Void) { guard let url = intent.url else { completion(.unsupported(forReason: .required)) return @@ -35,7 +35,7 @@ public class AddWebFeedIntentHandler: NSObject, AddWebFeedIntentHandling { completion(.success(with: url)) } - public func resolveTitle(for intent: AddWebFeedIntent, with completion: @escaping (INStringResolutionResult) -> Void) { + public func resolveTitle(for intent: AddFeedIntent, with completion: @escaping (INStringResolutionResult) -> Void) { guard let title = intent.title else { completion(INStringResolutionResult.notRequired()) return @@ -43,9 +43,9 @@ public class AddWebFeedIntentHandler: NSObject, AddWebFeedIntentHandling { completion(.success(with: title)) } - public func provideAccountNameOptionsCollection(for intent: AddWebFeedIntent, with completion: @escaping (INObjectCollection?, Error?) -> Void) { + public func provideAccountNameOptionsCollection(for intent: AddFeedIntent, with completion: @escaping (INObjectCollection?, Error?) -> Void) { guard let extensionContainers = ExtensionContainersFile.read() else { - completion(nil, AddWebFeedIntentHandlerError.communicationFailure) + completion(nil, AddFeedIntentHandlerError.communicationFailure) return } @@ -53,9 +53,9 @@ public class AddWebFeedIntentHandler: NSObject, AddWebFeedIntentHandling { completion(INObjectCollection(items: accountNames as [NSString]), nil) } - public func resolveAccountName(for intent: AddWebFeedIntent, with completion: @escaping (AddWebFeedAccountNameResolutionResult) -> Void) { + public func resolveAccountName(for intent: AddFeedIntent, with completion: @escaping (AddFeedAccountNameResolutionResult) -> Void) { guard let accountName = intent.accountName else { - completion(AddWebFeedAccountNameResolutionResult.notRequired()) + completion(AddFeedAccountNameResolutionResult.notRequired()) return } @@ -71,9 +71,9 @@ public class AddWebFeedIntentHandler: NSObject, AddWebFeedIntentHandling { } } - public func provideFolderNameOptions(for intent: AddWebFeedIntent, with completion: @escaping ([String]?, Error?) -> Void) { + public func provideFolderNameOptions(for intent: AddFeedIntent, with completion: @escaping ([String]?, Error?) -> Void) { guard let extensionContainers = ExtensionContainersFile.read() else { - completion(nil, AddWebFeedIntentHandlerError.communicationFailure) + completion(nil, AddFeedIntentHandlerError.communicationFailure) return } @@ -86,9 +86,9 @@ public class AddWebFeedIntentHandler: NSObject, AddWebFeedIntentHandling { completion(folderNames, nil) } - public func provideFolderNameOptionsCollection(for intent: AddWebFeedIntent, with completion: @escaping (INObjectCollection?, Error?) -> Void) { + public func provideFolderNameOptionsCollection(for intent: AddFeedIntent, with completion: @escaping (INObjectCollection?, Error?) -> Void) { guard let extensionContainers = ExtensionContainersFile.read() else { - completion(nil, AddWebFeedIntentHandlerError.communicationFailure) + completion(nil, AddFeedIntentHandlerError.communicationFailure) return } @@ -101,9 +101,9 @@ public class AddWebFeedIntentHandler: NSObject, AddWebFeedIntentHandling { completion(INObjectCollection(items: folderNames as [NSString]), nil) } - public func resolveFolderName(for intent: AddWebFeedIntent, with completion: @escaping (AddWebFeedFolderNameResolutionResult) -> Void) { + public func resolveFolderName(for intent: AddFeedIntent, with completion: @escaping (AddFeedFolderNameResolutionResult) -> Void) { guard let accountName = intent.accountName, let folderName = intent.folderName else { - completion(AddWebFeedFolderNameResolutionResult.notRequired()) + completion(AddFeedFolderNameResolutionResult.notRequired()) return } @@ -126,9 +126,9 @@ public class AddWebFeedIntentHandler: NSObject, AddWebFeedIntentHandling { } - public func handle(intent: AddWebFeedIntent, completion: @escaping (AddWebFeedIntentResponse) -> Void) { + public func handle(intent: AddFeedIntent, completion: @escaping (AddFeedIntentResponse) -> Void) { guard let url = intent.url, let extensionContainers = ExtensionContainersFile.read() else { - completion(AddWebFeedIntentResponse(code: .failure, userActivity: nil)) + completion(AddFeedIntentResponse(code: .failure, userActivity: nil)) return } @@ -141,7 +141,7 @@ public class AddWebFeedIntentHandler: NSObject, AddWebFeedIntentHandling { }() guard let validAccount = account else { - completion(AddWebFeedIntentResponse(code: .failure, userActivity: nil)) + completion(AddFeedIntentResponse(code: .failure, userActivity: nil)) return } @@ -154,13 +154,13 @@ public class AddWebFeedIntentHandler: NSObject, AddWebFeedIntentHandling { }() guard let validContainer = container, let containerID = validContainer.containerID else { - completion(AddWebFeedIntentResponse(code: .failure, userActivity: nil)) + completion(AddFeedIntentResponse(code: .failure, userActivity: nil)) return } let request = ExtensionFeedAddRequest(name: intent.title, feedURL: url, destinationContainerID: containerID) ExtensionFeedAddRequestFile.save(request) - completion(AddWebFeedIntentResponse(code: .success, userActivity: nil)) + completion(AddFeedIntentResponse(code: .success, userActivity: nil)) } } diff --git a/iOS/IntentsExtension/IntentHandler.swift b/iOS/IntentsExtension/IntentHandler.swift index e1c80701f..e3e1490a8 100644 --- a/iOS/IntentsExtension/IntentHandler.swift +++ b/iOS/IntentsExtension/IntentHandler.swift @@ -12,8 +12,8 @@ class IntentHandler: INExtension { override func handler(for intent: INIntent) -> Any { switch intent { - case is AddWebFeedIntent: - return AddWebFeedIntentHandler() + case is AddFeedIntent: + return AddFeedIntentHandler() default: fatalError("Unhandled intent type: \(intent)") } diff --git a/iOS/MasterFeed/MasterFeedViewController.swift b/iOS/MasterFeed/MasterFeedViewController.swift index 3d990af27..fde81b33e 100644 --- a/iOS/MasterFeed/MasterFeedViewController.swift +++ b/iOS/MasterFeed/MasterFeedViewController.swift @@ -714,7 +714,7 @@ class MasterFeedViewController: UITableViewController, UndoableCommandRunner, Ma alert.addAction(UIAlertAction(title: "OK", style: .cancel)) present(alert, animated: true) } -}} +} // MARK: UIContextMenuInteractionDelegate