From d4cfc1e973f4ba6c75d1c2570281b8dc1f2dbcc7 Mon Sep 17 00:00:00 2001 From: Huseyin Zengin Date: Sun, 21 Jan 2024 22:19:56 +0100 Subject: [PATCH 1/2] Remove Shortcuts --- Shortcuts/AddEntryIntentHandler.swift | 42 ----- Shortcuts/Info.plist | 42 ----- Shortcuts/IntentHandler.swift | 12 -- Shortcuts/Intents.intentdefinition | 170 ------------------ Shortcuts/Shortcuts.entitlements | 10 -- wallabag.xcodeproj/project.pbxproj | 156 ---------------- .../xcshareddata/xcschemes/Shortcuts.xcscheme | 97 ---------- 7 files changed, 529 deletions(-) delete mode 100644 Shortcuts/AddEntryIntentHandler.swift delete mode 100644 Shortcuts/Info.plist delete mode 100644 Shortcuts/IntentHandler.swift delete mode 100644 Shortcuts/Intents.intentdefinition delete mode 100644 Shortcuts/Shortcuts.entitlements delete mode 100644 wallabag.xcodeproj/xcshareddata/xcschemes/Shortcuts.xcscheme diff --git a/Shortcuts/AddEntryIntentHandler.swift b/Shortcuts/AddEntryIntentHandler.swift deleted file mode 100644 index 980cb669..00000000 --- a/Shortcuts/AddEntryIntentHandler.swift +++ /dev/null @@ -1,42 +0,0 @@ -import Combine -import Foundation -import Intents -import SharedLib -import WallabagKit - -class AddEntryIntentHandler: NSObject, AddEntryIntentHandling { - private var cancellable: AnyCancellable? - - func handle(intent: AddEntryIntent, completion: @escaping (AddEntryIntentResponse) -> Void) { - if let url = intent.url { - let kit = WallabagKit(host: WallabagUserDefaults.host) - kit.clientId = WallabagUserDefaults.clientId - kit.clientSecret = WallabagUserDefaults.clientSecret - kit.username = WallabagUserDefaults.login - kit.password = WallabagUserDefaults.password - - cancellable = kit.send(to: WallabagEntryEndpoint.add(url: url.absoluteString)) - .receive(on: DispatchQueue.main) - .sink(receiveCompletion: { compl in - switch compl { - case .finished: - completion(.success(result: "Url was added")) - case .failure: - completion(.failure(error: "Unable to add url, check url or your wallabag configuration")) - } - }, receiveValue: { (_: WallabagEntry) in - - }) - } else { - completion(.failure(error: "Unable to add url")) - } - } - - func resolveUrl(for intent: AddEntryIntent, with completion: @escaping (INURLResolutionResult) -> Void) { - if let url = intent.url { - completion(.success(with: url)) - } else { - completion(.unsupported()) - } - } -} diff --git a/Shortcuts/Info.plist b/Shortcuts/Info.plist deleted file mode 100644 index 2b172f2d..00000000 --- a/Shortcuts/Info.plist +++ /dev/null @@ -1,42 +0,0 @@ - - - - - CFBundleDevelopmentRegion - $(DEVELOPMENT_LANGUAGE) - CFBundleDisplayName - Shortcuts - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - $(PRODUCT_BUNDLE_PACKAGE_TYPE) - CFBundleShortVersionString - 7.0.0 - CFBundleVersion - 319 - NSExtension - - NSExtensionAttributes - - IntentsRestrictedWhileLocked - - IntentsRestrictedWhileProtectedDataUnavailable - - IntentsSupported - - AddEntryIntent - - - NSExtensionPointIdentifier - com.apple.intents-service - NSExtensionPrincipalClass - $(PRODUCT_MODULE_NAME).IntentHandler - - - diff --git a/Shortcuts/IntentHandler.swift b/Shortcuts/IntentHandler.swift deleted file mode 100644 index f7615685..00000000 --- a/Shortcuts/IntentHandler.swift +++ /dev/null @@ -1,12 +0,0 @@ -import Intents - -class IntentHandler: INExtension { - override func handler(for intent: INIntent) -> Any { - switch intent { - case is AddEntryIntent: - return AddEntryIntentHandler() - default: - fatalError() - } - } -} diff --git a/Shortcuts/Intents.intentdefinition b/Shortcuts/Intents.intentdefinition deleted file mode 100644 index 23ac5341..00000000 --- a/Shortcuts/Intents.intentdefinition +++ /dev/null @@ -1,170 +0,0 @@ - - - - - INEnums - - INIntentDefinitionModelVersion - 1.2 - INIntentDefinitionNamespace - XjG11Y - INIntentDefinitionSystemVersion - 20D91 - INIntentDefinitionToolsBuildVersion - 12D4e - INIntentDefinitionToolsVersion - 12.4 - INIntents - - - INIntentCategory - generic - INIntentConfigurable - - INIntentDescription - Add entry to your instance - INIntentDescriptionID - fc3q5w - INIntentIneligibleForSuggestions - - INIntentInput - url - INIntentKeyParameter - url - INIntentLastParameterTag - 2 - INIntentManagedParameterCombinations - - url - - INIntentParameterCombinationSupportsBackgroundExecution - - INIntentParameterCombinationTitle - Add ${url} - INIntentParameterCombinationTitleID - QTiVT4 - INIntentParameterCombinationUpdatesLinked - - - - INIntentName - AddEntry - INIntentParameters - - - INIntentParameterConfigurable - - INIntentParameterDisplayName - Url - INIntentParameterDisplayNameID - fmZA3T - INIntentParameterDisplayPriority - 1 - INIntentParameterName - url - INIntentParameterPromptDialogs - - - INIntentParameterPromptDialogCustom - - INIntentParameterPromptDialogType - Configuration - - - INIntentParameterPromptDialogCustom - - INIntentParameterPromptDialogFormatString - Which url would you like to add? - INIntentParameterPromptDialogFormatStringID - Yrx5UG - INIntentParameterPromptDialogType - Primary - - - INIntentParameterSupportsResolution - - INIntentParameterTag - 2 - INIntentParameterType - URL - - - INIntentResponse - - INIntentResponseCodes - - - INIntentResponseCodeConciseFormatString - ${result} - INIntentResponseCodeConciseFormatStringID - RSvR3O - INIntentResponseCodeFormatString - ${result} - INIntentResponseCodeFormatStringID - PYsRFW - INIntentResponseCodeName - success - INIntentResponseCodeSuccess - - - - INIntentResponseCodeConciseFormatString - ${error} - INIntentResponseCodeConciseFormatStringID - CoAGd7 - INIntentResponseCodeFormatString - ${error} - INIntentResponseCodeFormatStringID - FP69lk - INIntentResponseCodeName - failure - - - INIntentResponseLastParameterTag - 2 - INIntentResponseParameters - - - INIntentResponseParameterDisplayName - Result - INIntentResponseParameterDisplayNameID - d5ypOL - INIntentResponseParameterDisplayPriority - 1 - INIntentResponseParameterName - result - INIntentResponseParameterTag - 1 - INIntentResponseParameterType - String - - - INIntentResponseParameterDisplayName - Error - INIntentResponseParameterDisplayNameID - bfBq8y - INIntentResponseParameterDisplayPriority - 2 - INIntentResponseParameterName - error - INIntentResponseParameterTag - 2 - INIntentResponseParameterType - String - - - - INIntentTitle - Add Entry - INIntentTitleID - ZdRUdO - INIntentType - Custom - INIntentVerb - Do - - - INTypes - - - diff --git a/Shortcuts/Shortcuts.entitlements b/Shortcuts/Shortcuts.entitlements deleted file mode 100644 index 1a278d42..00000000 --- a/Shortcuts/Shortcuts.entitlements +++ /dev/null @@ -1,10 +0,0 @@ - - - - - com.apple.security.application-groups - - group.wallabag.share_extension - - - diff --git a/wallabag.xcodeproj/project.pbxproj b/wallabag.xcodeproj/project.pbxproj index 7c085ce4..2228df35 100644 --- a/wallabag.xcodeproj/project.pbxproj +++ b/wallabag.xcodeproj/project.pbxproj @@ -8,11 +8,6 @@ /* Begin PBXBuildFile section */ 09190AFB2ACD461B00634123 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 0951C61729CC2EB000D8E8C6 /* Assets.xcassets */; }; - 093D139F26263B05008C2150 /* Intents.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 093D139E26263B05008C2150 /* Intents.framework */; }; - 093D13A226263B05008C2150 /* IntentHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 093D13A126263B05008C2150 /* IntentHandler.swift */; }; - 093D13B626263B05008C2150 /* Shortcuts.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = 093D139D26263B05008C2150 /* Shortcuts.appex */; platformFilter = ios; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; - 093D13D826263CC4008C2150 /* Intents.intentdefinition in Sources */ = {isa = PBXBuildFile; fileRef = 093D13D726263CC4008C2150 /* Intents.intentdefinition */; }; - 093D13EC26263F81008C2150 /* AddEntryIntentHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 093D13EB26263F81008C2150 /* AddEntryIntentHandler.swift */; }; 094AA03E2629EB1F006E5605 /* wallabagTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 094AA03D2629EB1F006E5605 /* wallabagTests.swift */; }; 094AA05A2629EB60006E5605 /* ImageCacheTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 094A9FED2629E6BB006E5605 /* ImageCacheTests.swift */; }; 094AA0692629EB98006E5605 /* ImageDownloaderTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 094AA00F2629E739006E5605 /* ImageDownloaderTests.swift */; }; @@ -84,7 +79,6 @@ 09644D1825C98755000FFDA1 /* AppDelegateExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09644D1725C98755000FFDA1 /* AppDelegateExtension.swift */; }; 09644D2025C98782000FFDA1 /* wallabagStore.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 09644D1E25C98782000FFDA1 /* wallabagStore.xcdatamodeld */; }; 097F81EB25CB18BA006C85F6 /* Router.swift in Sources */ = {isa = PBXBuildFile; fileRef = 097F81DF25CB187B006C85F6 /* Router.swift */; }; - 09800D8D29B9DE9E00DAB403 /* SharedLib in Frameworks */ = {isa = PBXBuildFile; productRef = 09800D8C29B9DE9E00DAB403 /* SharedLib */; }; 09800D8F29B9DEFE00DAB403 /* SharedLib in Frameworks */ = {isa = PBXBuildFile; productRef = 09800D8E29B9DEFE00DAB403 /* SharedLib */; }; 098BDD0829BF04E3003DF719 /* RouteSwiftUIExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 098BDD0729BF04E3003DF719 /* RouteSwiftUIExtension.swift */; }; 098CF4D629CD830E00DEAE50 /* ServerViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 098CF4D529CD830E00DEAE50 /* ServerViewModelTests.swift */; }; @@ -94,7 +88,6 @@ 09AD75A42624F93D00708A1E /* justify.css in Resources */ = {isa = PBXBuildFile; fileRef = 09AD75A02624F93D00708A1E /* justify.css */; }; 09AD75BE2624FEEE00708A1E /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 09AD75C02624FEEE00708A1E /* Localizable.strings */; }; 09AE6ECC29B13AAE0025DF93 /* WallabagKit in Frameworks */ = {isa = PBXBuildFile; productRef = 09AE6ECB29B13AAE0025DF93 /* WallabagKit */; }; - 09AE6ECE29B13ABC0025DF93 /* WallabagKit in Frameworks */ = {isa = PBXBuildFile; productRef = 09AE6ECD29B13ABC0025DF93 /* WallabagKit */; }; 09AEBEA029B1D2C500050BBE /* Factory in Frameworks */ = {isa = PBXBuildFile; productRef = 09AEBE9F29B1D2C500050BBE /* Factory */; }; 09BCBBD4282BD46A00B234CB /* RouterTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09BCBBD3282BD46A00B234CB /* RouterTests.swift */; }; 09BE0AF42A9F45E900193FBF /* View+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09BE0AF32A9F45E900193FBF /* View+Extension.swift */; }; @@ -103,13 +96,6 @@ /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - 093D13B426263B05008C2150 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 09BFB27525C8348E00E12B4D /* Project object */; - proxyType = 1; - remoteGlobalIDString = 093D139C26263B05008C2150; - remoteInfo = Shortcuts; - }; 094AA0402629EB1F006E5605 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 09BFB27525C8348E00E12B4D /* Project object */; @@ -134,7 +120,6 @@ dstSubfolderSpec = 13; files = ( 09644AD825C94825000FFDA1 /* bagit.appex in Embed Foundation Extensions */, - 093D13B626263B05008C2150 /* Shortcuts.appex in Embed Foundation Extensions */, ); name = "Embed Foundation Extensions"; runOnlyForDeploymentPostprocessing = 0; @@ -143,13 +128,7 @@ /* Begin PBXFileReference section */ 093D137226263A96008C2150 /* IntentsUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IntentsUI.framework; path = Library/Frameworks/IntentsUI.framework; sourceTree = DEVELOPER_DIR; }; - 093D139D26263B05008C2150 /* Shortcuts.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = Shortcuts.appex; sourceTree = BUILT_PRODUCTS_DIR; }; 093D139E26263B05008C2150 /* Intents.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Intents.framework; path = System/Library/Frameworks/Intents.framework; sourceTree = SDKROOT; }; - 093D13A126263B05008C2150 /* IntentHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IntentHandler.swift; sourceTree = ""; }; - 093D13A326263B05008C2150 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 093D13D026263B2E008C2150 /* Shortcuts.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Shortcuts.entitlements; sourceTree = ""; }; - 093D13D726263CC4008C2150 /* Intents.intentdefinition */ = {isa = PBXFileReference; lastKnownFileType = file.intentdefinition; path = Intents.intentdefinition; sourceTree = ""; }; - 093D13EB26263F81008C2150 /* AddEntryIntentHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddEntryIntentHandler.swift; sourceTree = ""; }; 09483CC6270498C20084CEB2 /* SharedLib.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = SharedLib.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 09483CCC270499120084CEB2 /* WallabagKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = WallabagKit.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 09483CCF27049B3E0084CEB2 /* WallabagKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = WallabagKit.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -255,16 +234,6 @@ /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ - 093D139A26263B05008C2150 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 09AE6ECE29B13ABC0025DF93 /* WallabagKit in Frameworks */, - 093D139F26263B05008C2150 /* Intents.framework in Frameworks */, - 09800D8D29B9DE9E00DAB403 /* SharedLib in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; 094AA0382629EB1F006E5605 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -295,18 +264,6 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 093D13A026263B05008C2150 /* Shortcuts */ = { - isa = PBXGroup; - children = ( - 093D13D026263B2E008C2150 /* Shortcuts.entitlements */, - 093D13A126263B05008C2150 /* IntentHandler.swift */, - 093D13A326263B05008C2150 /* Info.plist */, - 093D13D726263CC4008C2150 /* Intents.intentdefinition */, - 093D13EB26263F81008C2150 /* AddEntryIntentHandler.swift */, - ); - path = Shortcuts; - sourceTree = ""; - }; 094A9FEC2629E6A3006E5605 /* Features */ = { isa = PBXGroup; children = ( @@ -684,7 +641,6 @@ 09644B1525C94CA6000FFDA1 /* Frameworks */, 09BFB28625C8348E00E12B4D /* App */, 09BFB28525C8348E00E12B4D /* Products */, - 093D13A026263B05008C2150 /* Shortcuts */, 094AA03C2629EB1F006E5605 /* wallabagTests */, ); sourceTree = ""; @@ -694,7 +650,6 @@ children = ( 09BFB28425C8348E00E12B4D /* wallabag.app */, 09644ACE25C94825000FFDA1 /* bagit.appex */, - 093D139D26263B05008C2150 /* Shortcuts.appex */, 094AA03B2629EB1F006E5605 /* wallabagTests.xctest */, ); name = Products; @@ -723,27 +678,6 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 093D139C26263B05008C2150 /* Shortcuts */ = { - isa = PBXNativeTarget; - buildConfigurationList = 093D13BA26263B05008C2150 /* Build configuration list for PBXNativeTarget "Shortcuts" */; - buildPhases = ( - 093D139926263B05008C2150 /* Sources */, - 093D139A26263B05008C2150 /* Frameworks */, - 093D139B26263B05008C2150 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = Shortcuts; - packageProductDependencies = ( - 09AE6ECD29B13ABC0025DF93 /* WallabagKit */, - 09800D8C29B9DE9E00DAB403 /* SharedLib */, - ); - productName = Shortcuts; - productReference = 093D139D26263B05008C2150 /* Shortcuts.appex */; - productType = "com.apple.product-type.app-extension"; - }; 094AA03A2629EB1F006E5605 /* wallabagTests */ = { isa = PBXNativeTarget; buildConfigurationList = 094AA0422629EB1F006E5605 /* Build configuration list for PBXNativeTarget "wallabagTests" */; @@ -797,7 +731,6 @@ ); dependencies = ( 09644AD725C94825000FFDA1 /* PBXTargetDependency */, - 093D13B526263B05008C2150 /* PBXTargetDependency */, ); name = wallabag; packageProductDependencies = ( @@ -819,9 +752,6 @@ LastSwiftUpdateCheck = 1240; LastUpgradeCheck = 1420; TargetAttributes = { - 093D139C26263B05008C2150 = { - CreatedOnToolsVersion = 12.4; - }; 094AA03A2629EB1F006E5605 = { CreatedOnToolsVersion = 12.4; TestTargetID = 09BFB28325C8348E00E12B4D; @@ -864,20 +794,12 @@ targets = ( 09BFB28325C8348E00E12B4D /* wallabag */, 09644ACD25C94825000FFDA1 /* bagit */, - 093D139C26263B05008C2150 /* Shortcuts */, 094AA03A2629EB1F006E5605 /* wallabagTests */, ); }; /* End PBXProject section */ /* Begin PBXResourcesBuildPhase section */ - 093D139B26263B05008C2150 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; 094AA0392629EB1F006E5605 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; @@ -933,16 +855,6 @@ /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ - 093D139926263B05008C2150 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 093D13EC26263F81008C2150 /* AddEntryIntentHandler.swift in Sources */, - 093D13D826263CC4008C2150 /* Intents.intentdefinition in Sources */, - 093D13A226263B05008C2150 /* IntentHandler.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; 094AA0372629EB1F006E5605 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -1037,12 +949,6 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - 093D13B526263B05008C2150 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - platformFilter = ios; - target = 093D139C26263B05008C2150 /* Shortcuts */; - targetProxy = 093D13B426263B05008C2150 /* PBXContainerItemProxy */; - }; 094AA0412629EB1F006E5605 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 09BFB28325C8348E00E12B4D /* wallabag */; @@ -1087,51 +993,6 @@ /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ - 093D13BB26263B05008C2150 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - CODE_SIGN_ENTITLEMENTS = Shortcuts/Shortcuts.entitlements; - CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = G97URPCGB8; - INFOPLIST_FILE = Shortcuts/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 16.0; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@executable_path/../../Frameworks", - ); - PRODUCT_BUNDLE_IDENTIFIER = "fr.district-web.wallabag.Shortcuts"; - PRODUCT_NAME = "$(TARGET_NAME)"; - SDKROOT = iphoneos; - SKIP_INSTALL = YES; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Debug; - }; - 093D13BC26263B05008C2150 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - CODE_SIGN_ENTITLEMENTS = Shortcuts/Shortcuts.entitlements; - CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = G97URPCGB8; - INFOPLIST_FILE = Shortcuts/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 16.0; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@executable_path/../../Frameworks", - ); - PRODUCT_BUNDLE_IDENTIFIER = "fr.district-web.wallabag.Shortcuts"; - PRODUCT_NAME = "$(TARGET_NAME)"; - SDKROOT = iphoneos; - SKIP_INSTALL = YES; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - VALIDATE_PRODUCT = YES; - }; - name = Release; - }; 094AA0432629EB1F006E5605 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -1413,15 +1274,6 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 093D13BA26263B05008C2150 /* Build configuration list for PBXNativeTarget "Shortcuts" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 093D13BB26263B05008C2150 /* Debug */, - 093D13BC26263B05008C2150 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; 094AA0422629EB1F006E5605 /* Build configuration list for PBXNativeTarget "wallabagTests" */ = { isa = XCConfigurationList; buildConfigurations = ( @@ -1485,10 +1337,6 @@ package = 09644B0D25C94C6B000FFDA1 /* XCRemoteSwiftPackageReference "swift-html-entities" */; productName = HTMLEntities; }; - 09800D8C29B9DE9E00DAB403 /* SharedLib */ = { - isa = XCSwiftPackageProductDependency; - productName = SharedLib; - }; 09800D8E29B9DEFE00DAB403 /* SharedLib */ = { isa = XCSwiftPackageProductDependency; productName = SharedLib; @@ -1497,10 +1345,6 @@ isa = XCSwiftPackageProductDependency; productName = WallabagKit; }; - 09AE6ECD29B13ABC0025DF93 /* WallabagKit */ = { - isa = XCSwiftPackageProductDependency; - productName = WallabagKit; - }; 09AEBE9F29B1D2C500050BBE /* Factory */ = { isa = XCSwiftPackageProductDependency; package = 09AEBE9E29B1D2C500050BBE /* XCRemoteSwiftPackageReference "Factory" */; diff --git a/wallabag.xcodeproj/xcshareddata/xcschemes/Shortcuts.xcscheme b/wallabag.xcodeproj/xcshareddata/xcschemes/Shortcuts.xcscheme deleted file mode 100644 index e654a28d..00000000 --- a/wallabag.xcodeproj/xcshareddata/xcschemes/Shortcuts.xcscheme +++ /dev/null @@ -1,97 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From cc270a6c9da4c581d8f6ee301c2d738912495d7c Mon Sep 17 00:00:00 2001 From: Huseyin Zengin Date: Sun, 21 Jan 2024 22:31:16 +0100 Subject: [PATCH 2/2] Migrate AddEntryIntent to AppIntent --- Intents/AddEntryIntent.swift | 24 ++++++++++++++++++++++++ Intents/WallabagIntent.swift | 16 ++++++++++++++++ wallabag.xcodeproj/project.pbxproj | 16 ++++++++++++++++ 3 files changed, 56 insertions(+) create mode 100644 Intents/AddEntryIntent.swift create mode 100644 Intents/WallabagIntent.swift diff --git a/Intents/AddEntryIntent.swift b/Intents/AddEntryIntent.swift new file mode 100644 index 00000000..6a9be310 --- /dev/null +++ b/Intents/AddEntryIntent.swift @@ -0,0 +1,24 @@ +import AppIntents +import WallabagKit + +struct AddEntryIntent: WallabagIntent { + + static var title: LocalizedStringResource = "Add Entry" + + static var description: IntentDescription = IntentDescription("Add entry to your instance") + + @Parameter(title: "Url") + var url: URL + + static var parameterSummary: some ParameterSummary { + Summary("Add \(\.$url)") + } + + func perform() async throws -> some IntentResult { + _ = try await kit.send(to: WallabagEntryEndpoint.add(url: url.absoluteString)) + .receive(on: DispatchQueue.main) + .values + .first(where: {(_: WallabagEntry) in true}) + return .result() + } +} diff --git a/Intents/WallabagIntent.swift b/Intents/WallabagIntent.swift new file mode 100644 index 00000000..cfbd8449 --- /dev/null +++ b/Intents/WallabagIntent.swift @@ -0,0 +1,16 @@ +import WallabagKit +import AppIntents +import SharedLib + +protocol WallabagIntent: AppIntent {} + +extension WallabagIntent { + var kit: WallabagKit { + let kit = WallabagKit(host: WallabagUserDefaults.host) + kit.clientId = WallabagUserDefaults.clientId + kit.clientSecret = WallabagUserDefaults.clientSecret + kit.username = WallabagUserDefaults.login + kit.password = WallabagUserDefaults.password + return kit + } +} diff --git a/wallabag.xcodeproj/project.pbxproj b/wallabag.xcodeproj/project.pbxproj index 2228df35..b358cc1f 100644 --- a/wallabag.xcodeproj/project.pbxproj +++ b/wallabag.xcodeproj/project.pbxproj @@ -93,6 +93,8 @@ 09BE0AF42A9F45E900193FBF /* View+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09BE0AF32A9F45E900193FBF /* View+Extension.swift */; }; 09C34C7C29B1398B00B5C927 /* SharedLib in Frameworks */ = {isa = PBXBuildFile; productRef = 09C34C7B29B1398B00B5C927 /* SharedLib */; }; 09C34C7E29B1399100B5C927 /* WallabagKit in Frameworks */ = {isa = PBXBuildFile; productRef = 09C34C7D29B1399100B5C927 /* WallabagKit */; }; + 81505C5B2B5DC21F003B5CDE /* WallabagIntent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81505C5A2B5DC21F003B5CDE /* WallabagIntent.swift */; }; + 81505C5D2B5DC23C003B5CDE /* AddEntryIntent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81505C5C2B5DC23C003B5CDE /* AddEntryIntent.swift */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -230,6 +232,8 @@ 09BE0AF32A9F45E900193FBF /* View+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "View+Extension.swift"; sourceTree = ""; }; 09BFB28425C8348E00E12B4D /* wallabag.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = wallabag.app; sourceTree = BUILT_PRODUCTS_DIR; }; 09BFB28725C8348E00E12B4D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 81505C5A2B5DC21F003B5CDE /* WallabagIntent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WallabagIntent.swift; sourceTree = ""; }; + 81505C5C2B5DC23C003B5CDE /* AddEntryIntent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddEntryIntent.swift; sourceTree = ""; }; 9C1103B626A0852F00E50F26 /* Configuration.storekit */ = {isa = PBXFileReference; lastKnownFileType = text; path = Configuration.storekit; sourceTree = ""; }; /* End PBXFileReference section */ @@ -636,6 +640,7 @@ 09BFB27425C8348E00E12B4D = { isa = PBXGroup; children = ( + 81505C592B5DC209003B5CDE /* Intents */, 09AD75962624F4E800708A1E /* wallabag.entitlements */, 09644ACF25C94825000FFDA1 /* bagit */, 09644B1525C94CA6000FFDA1 /* Frameworks */, @@ -675,6 +680,15 @@ path = App; sourceTree = ""; }; + 81505C592B5DC209003B5CDE /* Intents */ = { + isa = PBXGroup; + children = ( + 81505C5A2B5DC21F003B5CDE /* WallabagIntent.swift */, + 81505C5C2B5DC23C003B5CDE /* AddEntryIntent.swift */, + ); + path = Intents; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -917,6 +931,7 @@ 09644CFE25C9870C000FFDA1 /* TagRow.swift in Sources */, 09644BFC25C983F8000FFDA1 /* Entry.swift in Sources */, 097F81EB25CB18BA006C85F6 /* Router.swift in Sources */, + 81505C5D2B5DC23C003B5CDE /* AddEntryIntent.swift in Sources */, 09644BB725C98232000FFDA1 /* AppSetting.swift in Sources */, 09644C7F25C985B8000FFDA1 /* ImageDownloaderPublisher.swift in Sources */, 09644CE825C986CC000FFDA1 /* ServerView.swift in Sources */, @@ -940,6 +955,7 @@ 09644C6025C98596000FFDA1 /* EntryView.swift in Sources */, 09644CFF25C9870C000FFDA1 /* TagsForEntryPublisher.swift in Sources */, 09644D1025C9872F000FFDA1 /* BundleKey.swift in Sources */, + 81505C5B2B5DC21F003B5CDE /* WallabagIntent.swift in Sources */, 09644BAF25C98213000FFDA1 /* RefreshButton.swift in Sources */, 09BE0AF42A9F45E900193FBF /* View+Extension.swift in Sources */, 09644C7025C985A9000FFDA1 /* ArchiveEntryButton.swift in Sources */,