From a5adb0bc44ef5df6a222cd0ed2bb5f681ba1f9bc Mon Sep 17 00:00:00 2001 From: Hailey Date: Mon, 17 Jun 2024 14:03:12 -0700 Subject: [PATCH] a bunch of changes --- .../App-Icon-1024x1024@1x.png} | Bin .../AppIcon.appiconset/Contents.json | 2 +- .../Contents.json | 0 .../withClipInfoPlist.js | 1 + .../starterPackAppClipExtension/withFiles.js | 8 +++++ .../withXcodeTarget.js | 32 +++++++----------- 6 files changed, 22 insertions(+), 21 deletions(-) rename modules/BlueskyClip/{Assets.xcassets/AppIcon.appiconset/icon.png => Images.xcassets/AppIcon.appiconset/App-Icon-1024x1024@1x.png} (100%) rename modules/BlueskyClip/{Assets.xcassets => Images.xcassets}/AppIcon.appiconset/Contents.json (78%) rename modules/BlueskyClip/{Assets.xcassets => Images.xcassets}/Contents.json (100%) diff --git a/modules/BlueskyClip/Assets.xcassets/AppIcon.appiconset/icon.png b/modules/BlueskyClip/Images.xcassets/AppIcon.appiconset/App-Icon-1024x1024@1x.png similarity index 100% rename from modules/BlueskyClip/Assets.xcassets/AppIcon.appiconset/icon.png rename to modules/BlueskyClip/Images.xcassets/AppIcon.appiconset/App-Icon-1024x1024@1x.png diff --git a/modules/BlueskyClip/Assets.xcassets/AppIcon.appiconset/Contents.json b/modules/BlueskyClip/Images.xcassets/AppIcon.appiconset/Contents.json similarity index 78% rename from modules/BlueskyClip/Assets.xcassets/AppIcon.appiconset/Contents.json rename to modules/BlueskyClip/Images.xcassets/AppIcon.appiconset/Contents.json index a657e33672..c3bb428dbd 100644 --- a/modules/BlueskyClip/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/modules/BlueskyClip/Images.xcassets/AppIcon.appiconset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "icon.png", + "filename" : "App-Icon-1024x1024@1x.png", "idiom" : "universal", "platform" : "ios", "size" : "1024x1024" diff --git a/modules/BlueskyClip/Assets.xcassets/Contents.json b/modules/BlueskyClip/Images.xcassets/Contents.json similarity index 100% rename from modules/BlueskyClip/Assets.xcassets/Contents.json rename to modules/BlueskyClip/Images.xcassets/Contents.json diff --git a/plugins/starterPackAppClipExtension/withClipInfoPlist.js b/plugins/starterPackAppClipExtension/withClipInfoPlist.js index 213a53929a..59fbed1a9e 100644 --- a/plugins/starterPackAppClipExtension/withClipInfoPlist.js +++ b/plugins/starterPackAppClipExtension/withClipInfoPlist.js @@ -24,6 +24,7 @@ const withClipInfoPlist = (config, {targetName}) => { CFBundleExecutable: '$(EXECUTABLE_NAME)', CFBundlePackageType: '$(PRODUCT_BUNDLE_PACKAGE_TYPE)', CFBundleShortVersionString: config.version, + CFBundleIconName: 'AppIcon', UIViewControllerBasedStatusBarAppearance: 'NO', }) diff --git a/plugins/starterPackAppClipExtension/withFiles.js b/plugins/starterPackAppClipExtension/withFiles.js index a53a4e47aa..ad99f5ae41 100644 --- a/plugins/starterPackAppClipExtension/withFiles.js +++ b/plugins/starterPackAppClipExtension/withFiles.js @@ -25,6 +25,14 @@ const withFiles = (config, {targetName}) => { fs.copyFileSync(sourcePath, targetPath) } + const imagesBasePath = path.join(basePath, 'Images.xcassets') + const imagesTargetPath = path.join( + config.modRequest.platformProjectRoot, + targetName, + 'Images.xcassets', + ) + fs.cpSync(imagesBasePath, imagesTargetPath, {recursive: true}) + return config }) } diff --git a/plugins/starterPackAppClipExtension/withXcodeTarget.js b/plugins/starterPackAppClipExtension/withXcodeTarget.js index 5e06ec8507..5e915b4f64 100644 --- a/plugins/starterPackAppClipExtension/withXcodeTarget.js +++ b/plugins/starterPackAppClipExtension/withXcodeTarget.js @@ -15,20 +15,26 @@ const withXcodeTarget = (config, {targetName}) => { 'Sources', target.uuid, 'application', - '"$(CONTENTS_FOLDER_PATH)/AppClips"', + '"AppClips"', ) pbxProject.addBuildPhase( - [], + [`${targetName}/Images.xcassets`], 'PBXResourcesBuildPhase', 'Resources', target.uuid, 'application', - '"$(CONTENTS_FOLDER_PATH)/AppClips"', + '"AppClips"', ) - const pbxGroupKey = pbxProject.pbxCreateGroup(targetName, targetName) - pbxProject.addFile(`${targetName}/Info.plist`, pbxGroupKey) + const pbxGroup = pbxProject.addPbxGroup([ + 'AppDelegate.swift', + 'ViewController.swift', + 'Images.xcassets', + `${targetName}.entitlements`, + 'Info.plist', + ]) + pbxProject.addFile(`${targetName}/Info.plist`, pbxGroup.uuid) const configurations = pbxProject.pbxXCBuildConfigurationSection() for (const key in configurations) { if (typeof configurations[key].buildSettings !== 'undefined') { @@ -68,27 +74,13 @@ const withXcodeTarget = (config, {targetName}) => { target.uuid, ]) - // pbxProject.addProductFile(targetName, { - // basename: `${targetName}.app`, - // groupName: 'Embed App Clips', - // explicitFileType: 'wrapper.application', - // settings: { - // ATTRIBUTES: ['RemoveHeadersOnCopy'], - // }, - // includeInIndex: 0, - // path: `${targetName}.app`, - // sourceTree: 'BUILT_PRODUCTS_DIR', - // }) - - pbxProject.addToPbxNativeTargetSection(target) - pbxProject.addBuildPhase( [`${targetName}.app`], 'PBXCopyFilesBuildPhase', 'Embed App Clips', pbxProject.getFirstTarget().uuid, 'application', - '"$(CONTENTS_FOLDER_PATH)/AppClips"', + '"AppClips"', ) return config