From 9f20e04ebf00a6344939f8f7106ff1758149c123 Mon Sep 17 00:00:00 2001 From: Terry Yiu Date: Wed, 29 Jan 2025 19:57:42 -0500 Subject: [PATCH] Rename YetiSignerAction to YetiActionExtension --- Yeti.xcodeproj/project.pbxproj | 58 +++++++++---------- .../Info.plist | 4 +- .../Media.xcassets/Contents.json | 0 .../TouchBarBezel.colorset/Contents.json | 0 .../YetiActionExtension.entitlements | 0 .../YetiActionExtensionView.swift | 8 +-- .../YetiActionExtensionViewController.swift | 9 ++- 7 files changed, 39 insertions(+), 40 deletions(-) rename {YetiSignerAction => YetiActionExtension}/Info.plist (92%) rename {YetiSignerAction => YetiActionExtension}/Media.xcassets/Contents.json (100%) rename {YetiSignerAction => YetiActionExtension}/Media.xcassets/TouchBarBezel.colorset/Contents.json (100%) rename YetiSignerAction/YetiSignerAction.entitlements => YetiActionExtension/YetiActionExtension.entitlements (100%) rename YetiSignerAction/YetiSignerActionView.swift => YetiActionExtension/YetiActionExtensionView.swift (89%) rename YetiSignerAction/YetiSignerActionViewController.swift => YetiActionExtension/YetiActionExtensionViewController.swift (93%) diff --git a/Yeti.xcodeproj/project.pbxproj b/Yeti.xcodeproj/project.pbxproj index d7674aa..19b42ec 100644 --- a/Yeti.xcodeproj/project.pbxproj +++ b/Yeti.xcodeproj/project.pbxproj @@ -9,7 +9,7 @@ /* Begin PBXBuildFile section */ 3AA481172D3ECDFD0052A05C /* NostrSDK in Frameworks */ = {isa = PBXBuildFile; productRef = 3AA481162D3ECDFD0052A05C /* NostrSDK */; }; 3AC2CDAA2D4683AD00A6DEDB /* UniformTypeIdentifiers.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3AC2CDA92D4683AD00A6DEDB /* UniformTypeIdentifiers.framework */; }; - 3AC2CDB62D4683AD00A6DEDB /* YetiSignerAction.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = 3AC2CDA72D4683AD00A6DEDB /* YetiSignerAction.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; + 3AC2CDB62D4683AD00A6DEDB /* YetiActionExtension.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = 3AC2CDA72D4683AD00A6DEDB /* YetiActionExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; 3AC2CDC32D468B7800A6DEDB /* NostrSDK in Frameworks */ = {isa = PBXBuildFile; productRef = 3AC2CDC22D468B7800A6DEDB /* NostrSDK */; }; /* End PBXBuildFile section */ @@ -33,7 +33,7 @@ containerPortal = 3AA480B02D3DECF10052A05C /* Project object */; proxyType = 1; remoteGlobalIDString = 3AC2CDA62D4683AD00A6DEDB; - remoteInfo = YetiSignerAction; + remoteInfo = YetiActionExtension; }; /* End PBXContainerItemProxy section */ @@ -44,7 +44,7 @@ dstPath = ""; dstSubfolderSpec = 13; files = ( - 3AC2CDB62D4683AD00A6DEDB /* YetiSignerAction.appex in Embed Foundation Extensions */, + 3AC2CDB62D4683AD00A6DEDB /* YetiActionExtension.appex in Embed Foundation Extensions */, ); name = "Embed Foundation Extensions"; runOnlyForDeploymentPostprocessing = 0; @@ -55,7 +55,7 @@ 3AA480B82D3DECF10052A05C /* Yeti.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Yeti.app; sourceTree = BUILT_PRODUCTS_DIR; }; 3AA480CA2D3DECF20052A05C /* YetiTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = YetiTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 3AA480D42D3DECF20052A05C /* YetiUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = YetiUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; - 3AC2CDA72D4683AD00A6DEDB /* YetiSignerAction.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = YetiSignerAction.appex; sourceTree = BUILT_PRODUCTS_DIR; }; + 3AC2CDA72D4683AD00A6DEDB /* YetiActionExtension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = YetiActionExtension.appex; sourceTree = BUILT_PRODUCTS_DIR; }; 3AC2CDA92D4683AD00A6DEDB /* UniformTypeIdentifiers.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UniformTypeIdentifiers.framework; path = System/Library/Frameworks/UniformTypeIdentifiers.framework; sourceTree = SDKROOT; }; /* End PBXFileReference section */ @@ -67,7 +67,7 @@ ); target = 3AA480B72D3DECF10052A05C /* Yeti */; }; - 3AAAFACC2D47C0180065A065 /* Exceptions for "Yeti" folder in "YetiSignerAction" target */ = { + 3AAAFACC2D47C0180065A065 /* Exceptions for "Yeti" folder in "YetiActionExtension" target */ = { isa = PBXFileSystemSynchronizedBuildFileExceptionSet; membershipExceptions = ( Models/GeneralSettingsModel.swift, @@ -79,14 +79,14 @@ Models/YetiModelContainer.swift, Utilities/PrivateKeySecureStorage.swift, ); - target = 3AC2CDA62D4683AD00A6DEDB /* YetiSignerAction */; + target = 3AC2CDA62D4683AD00A6DEDB /* YetiActionExtension */; }; - 3AC2CDBB2D4683AD00A6DEDB /* Exceptions for "YetiSignerAction" folder in "YetiSignerAction" target */ = { + 3AC2CDBB2D4683AD00A6DEDB /* Exceptions for "YetiActionExtension" folder in "YetiActionExtension" target */ = { isa = PBXFileSystemSynchronizedBuildFileExceptionSet; membershipExceptions = ( Info.plist, ); - target = 3AC2CDA62D4683AD00A6DEDB /* YetiSignerAction */; + target = 3AC2CDA62D4683AD00A6DEDB /* YetiActionExtension */; }; /* End PBXFileSystemSynchronizedBuildFileExceptionSet section */ @@ -95,7 +95,7 @@ isa = PBXFileSystemSynchronizedRootGroup; exceptions = ( 3AA481082D3DF3E40052A05C /* Exceptions for "Yeti" folder in "Yeti" target */, - 3AAAFACC2D47C0180065A065 /* Exceptions for "Yeti" folder in "YetiSignerAction" target */, + 3AAAFACC2D47C0180065A065 /* Exceptions for "Yeti" folder in "YetiActionExtension" target */, ); path = Yeti; sourceTree = ""; @@ -110,12 +110,12 @@ path = YetiUITests; sourceTree = ""; }; - 3AC2CDAB2D4683AD00A6DEDB /* YetiSignerAction */ = { + 3AC2CDAB2D4683AD00A6DEDB /* YetiActionExtension */ = { isa = PBXFileSystemSynchronizedRootGroup; exceptions = ( - 3AC2CDBB2D4683AD00A6DEDB /* Exceptions for "YetiSignerAction" folder in "YetiSignerAction" target */, + 3AC2CDBB2D4683AD00A6DEDB /* Exceptions for "YetiActionExtension" folder in "YetiActionExtension" target */, ); - path = YetiSignerAction; + path = YetiActionExtension; sourceTree = ""; }; /* End PBXFileSystemSynchronizedRootGroup section */ @@ -161,7 +161,7 @@ 3AA480BA2D3DECF10052A05C /* Yeti */, 3AA480CD2D3DECF20052A05C /* YetiTests */, 3AA480D72D3DECF20052A05C /* YetiUITests */, - 3AC2CDAB2D4683AD00A6DEDB /* YetiSignerAction */, + 3AC2CDAB2D4683AD00A6DEDB /* YetiActionExtension */, 3AC2CDA82D4683AD00A6DEDB /* Frameworks */, 3AA480B92D3DECF10052A05C /* Products */, ); @@ -173,7 +173,7 @@ 3AA480B82D3DECF10052A05C /* Yeti.app */, 3AA480CA2D3DECF20052A05C /* YetiTests.xctest */, 3AA480D42D3DECF20052A05C /* YetiUITests.xctest */, - 3AC2CDA72D4683AD00A6DEDB /* YetiSignerAction.appex */, + 3AC2CDA72D4683AD00A6DEDB /* YetiActionExtension.appex */, ); name = Products; sourceTree = ""; @@ -263,9 +263,9 @@ productReference = 3AA480D42D3DECF20052A05C /* YetiUITests.xctest */; productType = "com.apple.product-type.bundle.ui-testing"; }; - 3AC2CDA62D4683AD00A6DEDB /* YetiSignerAction */ = { + 3AC2CDA62D4683AD00A6DEDB /* YetiActionExtension */ = { isa = PBXNativeTarget; - buildConfigurationList = 3AC2CDBA2D4683AD00A6DEDB /* Build configuration list for PBXNativeTarget "YetiSignerAction" */; + buildConfigurationList = 3AC2CDBA2D4683AD00A6DEDB /* Build configuration list for PBXNativeTarget "YetiActionExtension" */; buildPhases = ( 3AC2CDA32D4683AD00A6DEDB /* Sources */, 3AC2CDA42D4683AD00A6DEDB /* Frameworks */, @@ -276,14 +276,14 @@ dependencies = ( ); fileSystemSynchronizedGroups = ( - 3AC2CDAB2D4683AD00A6DEDB /* YetiSignerAction */, + 3AC2CDAB2D4683AD00A6DEDB /* YetiActionExtension */, ); - name = YetiSignerAction; + name = YetiActionExtension; packageProductDependencies = ( 3AC2CDC22D468B7800A6DEDB /* NostrSDK */, ); - productName = YetiSignerAction; - productReference = 3AC2CDA72D4683AD00A6DEDB /* YetiSignerAction.appex */; + productName = YetiActionExtension; + productReference = 3AC2CDA72D4683AD00A6DEDB /* YetiActionExtension.appex */; productType = "com.apple.product-type.app-extension"; }; /* End PBXNativeTarget section */ @@ -333,7 +333,7 @@ 3AA480B72D3DECF10052A05C /* Yeti */, 3AA480C92D3DECF20052A05C /* YetiTests */, 3AA480D32D3DECF20052A05C /* YetiUITests */, - 3AC2CDA62D4683AD00A6DEDB /* YetiSignerAction */, + 3AC2CDA62D4683AD00A6DEDB /* YetiActionExtension */, ); }; /* End PBXProject section */ @@ -425,7 +425,7 @@ }; 3AC2CDB52D4683AD00A6DEDB /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 3AC2CDA62D4683AD00A6DEDB /* YetiSignerAction */; + target = 3AC2CDA62D4683AD00A6DEDB /* YetiActionExtension */; targetProxy = 3AC2CDB42D4683AD00A6DEDB /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ @@ -687,12 +687,12 @@ 3AC2CDB82D4683AD00A6DEDB /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - CODE_SIGN_ENTITLEMENTS = YetiSignerAction/YetiSignerAction.entitlements; + CODE_SIGN_ENTITLEMENTS = YetiActionExtension/YetiActionExtension.entitlements; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = S99A5B637C; GENERATE_INFOPLIST_FILE = YES; - INFOPLIST_FILE = YetiSignerAction/Info.plist; + INFOPLIST_FILE = YetiActionExtension/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = "Sign Nostr Event"; INFOPLIST_KEY_NSHumanReadableCopyright = ""; LD_RUNPATH_SEARCH_PATHS = ( @@ -701,7 +701,7 @@ "@executable_path/../../Frameworks", ); MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = xyz.tyiu.Yeti.YetiSignerAction; + PRODUCT_BUNDLE_IDENTIFIER = xyz.tyiu.Yeti.YetiActionExtension; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; SWIFT_EMIT_LOC_STRINGS = YES; @@ -713,12 +713,12 @@ 3AC2CDB92D4683AD00A6DEDB /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - CODE_SIGN_ENTITLEMENTS = YetiSignerAction/YetiSignerAction.entitlements; + CODE_SIGN_ENTITLEMENTS = YetiActionExtension/YetiActionExtension.entitlements; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = S99A5B637C; GENERATE_INFOPLIST_FILE = YES; - INFOPLIST_FILE = YetiSignerAction/Info.plist; + INFOPLIST_FILE = YetiActionExtension/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = "Sign Nostr Event"; INFOPLIST_KEY_NSHumanReadableCopyright = ""; LD_RUNPATH_SEARCH_PATHS = ( @@ -727,7 +727,7 @@ "@executable_path/../../Frameworks", ); MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = xyz.tyiu.Yeti.YetiSignerAction; + PRODUCT_BUNDLE_IDENTIFIER = xyz.tyiu.Yeti.YetiActionExtension; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; SWIFT_EMIT_LOC_STRINGS = YES; @@ -775,7 +775,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 3AC2CDBA2D4683AD00A6DEDB /* Build configuration list for PBXNativeTarget "YetiSignerAction" */ = { + 3AC2CDBA2D4683AD00A6DEDB /* Build configuration list for PBXNativeTarget "YetiActionExtension" */ = { isa = XCConfigurationList; buildConfigurations = ( 3AC2CDB82D4683AD00A6DEDB /* Debug */, diff --git a/YetiSignerAction/Info.plist b/YetiActionExtension/Info.plist similarity index 92% rename from YetiSignerAction/Info.plist rename to YetiActionExtension/Info.plist index 31b8dcc..3013495 100644 --- a/YetiSignerAction/Info.plist +++ b/YetiActionExtension/Info.plist @@ -22,10 +22,10 @@ NSExtensionServiceTouchBarIconName NSActionTemplate - NSExtensionPrincipalClass - YetiSignerAction.YetiSignerActionViewController NSExtensionPointIdentifier com.apple.ui-services + NSExtensionPrincipalClass + YetiActionExtension.YetiActionExtensionViewController diff --git a/YetiSignerAction/Media.xcassets/Contents.json b/YetiActionExtension/Media.xcassets/Contents.json similarity index 100% rename from YetiSignerAction/Media.xcassets/Contents.json rename to YetiActionExtension/Media.xcassets/Contents.json diff --git a/YetiSignerAction/Media.xcassets/TouchBarBezel.colorset/Contents.json b/YetiActionExtension/Media.xcassets/TouchBarBezel.colorset/Contents.json similarity index 100% rename from YetiSignerAction/Media.xcassets/TouchBarBezel.colorset/Contents.json rename to YetiActionExtension/Media.xcassets/TouchBarBezel.colorset/Contents.json diff --git a/YetiSignerAction/YetiSignerAction.entitlements b/YetiActionExtension/YetiActionExtension.entitlements similarity index 100% rename from YetiSignerAction/YetiSignerAction.entitlements rename to YetiActionExtension/YetiActionExtension.entitlements diff --git a/YetiSignerAction/YetiSignerActionView.swift b/YetiActionExtension/YetiActionExtensionView.swift similarity index 89% rename from YetiSignerAction/YetiSignerActionView.swift rename to YetiActionExtension/YetiActionExtensionView.swift index 20073e8..43cb5a4 100644 --- a/YetiSignerAction/YetiSignerActionView.swift +++ b/YetiActionExtension/YetiActionExtensionView.swift @@ -1,6 +1,6 @@ // -// YetiSignerActionView.swift -// YetiSignerAction +// YetiActionExtensionView.swift +// YetiActionExtension // // Created by Terry Yiu on 1/26/25. // @@ -8,7 +8,7 @@ import NostrSDK import SwiftUI -struct YetiSignerActionView: View { +struct YetiActionExtensionView: View { @State private var text: String @State private var result: String = "" @@ -50,5 +50,5 @@ struct YetiSignerActionView: View { } #Preview { - YetiSignerActionView(text: "Hello, world!") + YetiActionExtensionView(text: "Hello, world!") } diff --git a/YetiSignerAction/YetiSignerActionViewController.swift b/YetiActionExtension/YetiActionExtensionViewController.swift similarity index 93% rename from YetiSignerAction/YetiSignerActionViewController.swift rename to YetiActionExtension/YetiActionExtensionViewController.swift index 9aab771..c115544 100644 --- a/YetiSignerAction/YetiSignerActionViewController.swift +++ b/YetiActionExtension/YetiActionExtensionViewController.swift @@ -1,16 +1,15 @@ // -// YetiSignerActionViewController.swift -// YetiSignerAction +// YetiActionExtensionViewController.swift +// YetiActionExtension // // Created by Terry Yiu on 1/26/25. // -//import MobileCoreServices import SwiftUI import UIKit import UniformTypeIdentifiers -class YetiSignerActionViewController: UIViewController { +class YetiActionExtensionViewController: UIViewController { override func viewDidLoad() { super.viewDidLoad() @@ -38,7 +37,7 @@ class YetiSignerActionViewController: UIViewController { if let text = providedText as? String { DispatchQueue.main.async { - let contentView = UIHostingController(rootView: YetiSignerActionView(text: text)) + let contentView = UIHostingController(rootView: YetiActionExtensionView(text: text)) self.addChild(contentView) self.view.addSubview(contentView.view)