From 1f9cfcfc1abc7b98c56ce01227556d3e55ebf779 Mon Sep 17 00:00:00 2001 From: neon443 <69979447+neon443@users.noreply.github.com> Date: Fri, 31 Oct 2025 23:40:06 +0000 Subject: [PATCH] merge the asset catalogs rename a test --- .../Contents.json | 0 .../Icon.png | Bin .../Icon58 1.png | Bin .../Icon58.png | Bin .../Icon87.png | Bin .../rectIcon.png | Bin .../rectIcon120.png | Bin .../rectIcon134.png | Bin .../rectIcon148.png | Bin .../rectIcon180.png | Bin .../rectIcon54.png | Bin .../rectIcon64.png | Bin .../rectIcon81.png | Bin .../rectIcon96.png | Bin StickerSlack.xcodeproj/project.pbxproj | 12 +++---- .../xcschemes/StickerSlack.xcscheme | 9 ++++-- StickerSlackTests/StickerSlack.xctestplan | 30 ++++++++++++++++++ StickerSlackTests/StickerSlackTests.swift | 2 +- .../Assets.xcassets/Contents.json | 6 ---- 19 files changed, 43 insertions(+), 16 deletions(-) rename {StickerSlackiMessageExtension => Resources}/Assets.xcassets/iMessage App Icon.stickersiconset/Contents.json (100%) rename {StickerSlackiMessageExtension => Resources}/Assets.xcassets/iMessage App Icon.stickersiconset/Icon.png (100%) rename {StickerSlackiMessageExtension => Resources}/Assets.xcassets/iMessage App Icon.stickersiconset/Icon58 1.png (100%) rename {StickerSlackiMessageExtension => Resources}/Assets.xcassets/iMessage App Icon.stickersiconset/Icon58.png (100%) rename {StickerSlackiMessageExtension => Resources}/Assets.xcassets/iMessage App Icon.stickersiconset/Icon87.png (100%) rename {StickerSlackiMessageExtension => Resources}/Assets.xcassets/iMessage App Icon.stickersiconset/rectIcon.png (100%) rename {StickerSlackiMessageExtension => Resources}/Assets.xcassets/iMessage App Icon.stickersiconset/rectIcon120.png (100%) rename {StickerSlackiMessageExtension => Resources}/Assets.xcassets/iMessage App Icon.stickersiconset/rectIcon134.png (100%) rename {StickerSlackiMessageExtension => Resources}/Assets.xcassets/iMessage App Icon.stickersiconset/rectIcon148.png (100%) rename {StickerSlackiMessageExtension => Resources}/Assets.xcassets/iMessage App Icon.stickersiconset/rectIcon180.png (100%) rename {StickerSlackiMessageExtension => Resources}/Assets.xcassets/iMessage App Icon.stickersiconset/rectIcon54.png (100%) rename {StickerSlackiMessageExtension => Resources}/Assets.xcassets/iMessage App Icon.stickersiconset/rectIcon64.png (100%) rename {StickerSlackiMessageExtension => Resources}/Assets.xcassets/iMessage App Icon.stickersiconset/rectIcon81.png (100%) rename {StickerSlackiMessageExtension => Resources}/Assets.xcassets/iMessage App Icon.stickersiconset/rectIcon96.png (100%) create mode 100644 StickerSlackTests/StickerSlack.xctestplan delete mode 100644 StickerSlackiMessageExtension/Assets.xcassets/Contents.json diff --git a/StickerSlackiMessageExtension/Assets.xcassets/iMessage App Icon.stickersiconset/Contents.json b/Resources/Assets.xcassets/iMessage App Icon.stickersiconset/Contents.json similarity index 100% rename from StickerSlackiMessageExtension/Assets.xcassets/iMessage App Icon.stickersiconset/Contents.json rename to Resources/Assets.xcassets/iMessage App Icon.stickersiconset/Contents.json diff --git a/StickerSlackiMessageExtension/Assets.xcassets/iMessage App Icon.stickersiconset/Icon.png b/Resources/Assets.xcassets/iMessage App Icon.stickersiconset/Icon.png similarity index 100% rename from StickerSlackiMessageExtension/Assets.xcassets/iMessage App Icon.stickersiconset/Icon.png rename to Resources/Assets.xcassets/iMessage App Icon.stickersiconset/Icon.png diff --git a/StickerSlackiMessageExtension/Assets.xcassets/iMessage App Icon.stickersiconset/Icon58 1.png b/Resources/Assets.xcassets/iMessage App Icon.stickersiconset/Icon58 1.png similarity index 100% rename from StickerSlackiMessageExtension/Assets.xcassets/iMessage App Icon.stickersiconset/Icon58 1.png rename to Resources/Assets.xcassets/iMessage App Icon.stickersiconset/Icon58 1.png diff --git a/StickerSlackiMessageExtension/Assets.xcassets/iMessage App Icon.stickersiconset/Icon58.png b/Resources/Assets.xcassets/iMessage App Icon.stickersiconset/Icon58.png similarity index 100% rename from StickerSlackiMessageExtension/Assets.xcassets/iMessage App Icon.stickersiconset/Icon58.png rename to Resources/Assets.xcassets/iMessage App Icon.stickersiconset/Icon58.png diff --git a/StickerSlackiMessageExtension/Assets.xcassets/iMessage App Icon.stickersiconset/Icon87.png b/Resources/Assets.xcassets/iMessage App Icon.stickersiconset/Icon87.png similarity index 100% rename from StickerSlackiMessageExtension/Assets.xcassets/iMessage App Icon.stickersiconset/Icon87.png rename to Resources/Assets.xcassets/iMessage App Icon.stickersiconset/Icon87.png diff --git a/StickerSlackiMessageExtension/Assets.xcassets/iMessage App Icon.stickersiconset/rectIcon.png b/Resources/Assets.xcassets/iMessage App Icon.stickersiconset/rectIcon.png similarity index 100% rename from StickerSlackiMessageExtension/Assets.xcassets/iMessage App Icon.stickersiconset/rectIcon.png rename to Resources/Assets.xcassets/iMessage App Icon.stickersiconset/rectIcon.png diff --git a/StickerSlackiMessageExtension/Assets.xcassets/iMessage App Icon.stickersiconset/rectIcon120.png b/Resources/Assets.xcassets/iMessage App Icon.stickersiconset/rectIcon120.png similarity index 100% rename from StickerSlackiMessageExtension/Assets.xcassets/iMessage App Icon.stickersiconset/rectIcon120.png rename to Resources/Assets.xcassets/iMessage App Icon.stickersiconset/rectIcon120.png diff --git a/StickerSlackiMessageExtension/Assets.xcassets/iMessage App Icon.stickersiconset/rectIcon134.png b/Resources/Assets.xcassets/iMessage App Icon.stickersiconset/rectIcon134.png similarity index 100% rename from StickerSlackiMessageExtension/Assets.xcassets/iMessage App Icon.stickersiconset/rectIcon134.png rename to Resources/Assets.xcassets/iMessage App Icon.stickersiconset/rectIcon134.png diff --git a/StickerSlackiMessageExtension/Assets.xcassets/iMessage App Icon.stickersiconset/rectIcon148.png b/Resources/Assets.xcassets/iMessage App Icon.stickersiconset/rectIcon148.png similarity index 100% rename from StickerSlackiMessageExtension/Assets.xcassets/iMessage App Icon.stickersiconset/rectIcon148.png rename to Resources/Assets.xcassets/iMessage App Icon.stickersiconset/rectIcon148.png diff --git a/StickerSlackiMessageExtension/Assets.xcassets/iMessage App Icon.stickersiconset/rectIcon180.png b/Resources/Assets.xcassets/iMessage App Icon.stickersiconset/rectIcon180.png similarity index 100% rename from StickerSlackiMessageExtension/Assets.xcassets/iMessage App Icon.stickersiconset/rectIcon180.png rename to Resources/Assets.xcassets/iMessage App Icon.stickersiconset/rectIcon180.png diff --git a/StickerSlackiMessageExtension/Assets.xcassets/iMessage App Icon.stickersiconset/rectIcon54.png b/Resources/Assets.xcassets/iMessage App Icon.stickersiconset/rectIcon54.png similarity index 100% rename from StickerSlackiMessageExtension/Assets.xcassets/iMessage App Icon.stickersiconset/rectIcon54.png rename to Resources/Assets.xcassets/iMessage App Icon.stickersiconset/rectIcon54.png diff --git a/StickerSlackiMessageExtension/Assets.xcassets/iMessage App Icon.stickersiconset/rectIcon64.png b/Resources/Assets.xcassets/iMessage App Icon.stickersiconset/rectIcon64.png similarity index 100% rename from StickerSlackiMessageExtension/Assets.xcassets/iMessage App Icon.stickersiconset/rectIcon64.png rename to Resources/Assets.xcassets/iMessage App Icon.stickersiconset/rectIcon64.png diff --git a/StickerSlackiMessageExtension/Assets.xcassets/iMessage App Icon.stickersiconset/rectIcon81.png b/Resources/Assets.xcassets/iMessage App Icon.stickersiconset/rectIcon81.png similarity index 100% rename from StickerSlackiMessageExtension/Assets.xcassets/iMessage App Icon.stickersiconset/rectIcon81.png rename to Resources/Assets.xcassets/iMessage App Icon.stickersiconset/rectIcon81.png diff --git a/StickerSlackiMessageExtension/Assets.xcassets/iMessage App Icon.stickersiconset/rectIcon96.png b/Resources/Assets.xcassets/iMessage App Icon.stickersiconset/rectIcon96.png similarity index 100% rename from StickerSlackiMessageExtension/Assets.xcassets/iMessage App Icon.stickersiconset/rectIcon96.png rename to Resources/Assets.xcassets/iMessage App Icon.stickersiconset/rectIcon96.png diff --git a/StickerSlack.xcodeproj/project.pbxproj b/StickerSlack.xcodeproj/project.pbxproj index 9c2c14e..d813378 100644 --- a/StickerSlack.xcodeproj/project.pbxproj +++ b/StickerSlack.xcodeproj/project.pbxproj @@ -32,7 +32,6 @@ A949B1FB2EA0518800215164 /* SlackResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = A949B1FA2EA0518800215164 /* SlackResponse.swift */; }; A969D6942EA3E86500399C05 /* Messages.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A969D6932EA3E86500399C05 /* Messages.framework */; }; A969D6A02EA3E86600399C05 /* StickerSlackiMessageExtension.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = A969D6912EA3E86500399C05 /* StickerSlackiMessageExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; - A969D6AC2EA3F1AF00399C05 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = A969D6A62EA3F1AF00399C05 /* Assets.xcassets */; }; A969D6AE2EA3F1AF00399C05 /* MainInterface.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A969D6A92EA3F1AF00399C05 /* MainInterface.storyboard */; }; A969D6AF2EA3F1AF00399C05 /* MessagesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A969D6AA2EA3F1AF00399C05 /* MessagesViewController.swift */; }; A9773C2F2EA54AF000F3B753 /* EmojiPreview.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9773C2E2EA54AF000F3B753 /* EmojiPreview.swift */; }; @@ -96,9 +95,9 @@ A949B1F12EA04E8200215164 /* StickerSlackApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StickerSlackApp.swift; sourceTree = ""; }; A949B1F72EA04F2300215164 /* EmojiHoarder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmojiHoarder.swift; sourceTree = ""; }; A949B1FA2EA0518800215164 /* SlackResponse.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SlackResponse.swift; sourceTree = ""; }; + A950E87D2EB57F1100A9F873 /* StickerSlack.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = StickerSlack.xctestplan; sourceTree = ""; }; A969D6912EA3E86500399C05 /* StickerSlackiMessageExtension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = StickerSlackiMessageExtension.appex; sourceTree = BUILT_PRODUCTS_DIR; }; A969D6932EA3E86500399C05 /* Messages.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Messages.framework; path = Library/Frameworks/Messages.framework; sourceTree = DEVELOPER_DIR; }; - A969D6A62EA3F1AF00399C05 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; A969D6A72EA3F1AF00399C05 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; A969D6A82EA3F1AF00399C05 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/MainInterface.storyboard; sourceTree = ""; }; A969D6AA2EA3F1AF00399C05 /* MessagesViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessagesViewController.swift; sourceTree = ""; }; @@ -223,7 +222,6 @@ isa = PBXGroup; children = ( A924C3752EA9137A00F20781 /* StickerSlackiMessageExtension.entitlements */, - A969D6A62EA3F1AF00399C05 /* Assets.xcassets */, A969D6A72EA3F1AF00399C05 /* Info.plist */, A969D6A92EA3F1AF00399C05 /* MainInterface.storyboard */, A969D6AA2EA3F1AF00399C05 /* MessagesViewController.swift */, @@ -236,6 +234,7 @@ isa = PBXGroup; children = ( A9B9A82C2EB2CCBE004C9245 /* StickerSlackTests.swift */, + A950E87D2EB57F1100A9F873 /* StickerSlack.xctestplan */, ); path = StickerSlackTests; sourceTree = ""; @@ -356,9 +355,9 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - A9104C752EB3AE4700D160EA /* Icon.pxd in Resources */, A9104C762EB3AE4700D160EA /* StickerSlack.icon in Resources */, A949B1F32EA04E8200215164 /* Assets.xcassets in Resources */, + A9104C752EB3AE4700D160EA /* Icon.pxd in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -366,11 +365,10 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - A9104C792EB3AE4700D160EA /* Icon.pxd in Resources */, - A9104C7A2EB3AE4700D160EA /* StickerSlack.icon in Resources */, - A969D6AC2EA3F1AF00399C05 /* Assets.xcassets in Resources */, A969D6AE2EA3F1AF00399C05 /* MainInterface.storyboard in Resources */, A9104C7B2EB3AE6300D160EA /* Assets.xcassets in Resources */, + A9104C7A2EB3AE4700D160EA /* StickerSlack.icon in Resources */, + A9104C792EB3AE4700D160EA /* Icon.pxd in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/StickerSlack.xcodeproj/xcshareddata/xcschemes/StickerSlack.xcscheme b/StickerSlack.xcodeproj/xcshareddata/xcschemes/StickerSlack.xcscheme index a99f60f..57b45e5 100644 --- a/StickerSlack.xcodeproj/xcshareddata/xcschemes/StickerSlack.xcscheme +++ b/StickerSlack.xcodeproj/xcshareddata/xcschemes/StickerSlack.xcscheme @@ -27,8 +27,13 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - shouldUseLaunchSchemeArgsEnv = "YES" - shouldAutocreateTestPlan = "YES"> + shouldUseLaunchSchemeArgsEnv = "YES"> + + + +