Skip to content

WIP: feat(icon): Support OS26 icon composer bundles #1568

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

WIP: feat(icon): Support OS26 icon composer bundles #1568

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 33 additions & 5 deletions lib/prepare.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -531,15 +531,43 @@ function updateIcons (cordovaProject, locations) {
return Promise.resolve();
}

const platformProjDir = path.relative(cordovaProject.root, locations.xcodeCordovaProj);
const iconsDir = path.join(platformProjDir, 'Assets.xcassets', 'AppIcon.appiconset');

return checkOrAssumeXcodeVersion()
.then((xcodeversion) => {
const platformProjDir = path.relative(cordovaProject.root, locations.xcodeCordovaProj);

// We can only support icon composer folder icons with Xcode 26
const isAtLeastXcode26 = versions.compareVersions(xcodeversion, '26.0.0') >= 0;

const iconFolders = icons.filter((icon) => icon.src.endsWith('.icon'));
iconFolders.forEach((icon) => {
if (!isAtLeastXcode26) {
events.emit('warning', `Xcode ${xcodeversion} cannot support icon: ${icon.src}. Skipping...`);
} else if (icon.height || icon.width) {
events.emit('warning', `Cannot specify height or width attributes with Icon Composer icon ${icon.src}. Skipping...`);
} else if (icon.target) {
events.emit('warning', `Cannot specify target attribute with Icon Composer icon ${icon.src}. Skipping...`);
} else {
const project = projectFile.parse(locations);
const target = path.join(platformProjDir, 'AppIcon.icon');

const resourceMap = { [target]: icon.src };
events.emit('verbose', `Copying icon bundle from ${icon.src} to ${target}`);
FileUpdater.updatePaths(resourceMap, { rootDir: cordovaProject.root }, logFileOp);

const appGroup = project.xcode.findPBXGroupKey({ path: 'App' });
project.xcode.addResourceFile('AppIcon.icon', { lastKnownFileType: 'folder.iconcomposer.icon' }, appGroup);
project.write();
}

// Remove it so it won't get copied by mapIconResources
icons.splice(icons.indexOf(icon), 1);
});

const iconsDir = path.join(platformProjDir, 'Assets.xcassets', 'AppIcon.appiconset');

const resourceMap = mapIconResources(icons, iconsDir, xcodeversion);
events.emit('verbose', `Updating icons at ${iconsDir}`);
FileUpdater.updatePaths(
resourceMap, { rootDir: cordovaProject.root }, logFileOp);
FileUpdater.updatePaths(resourceMap, { rootDir: cordovaProject.root }, logFileOp);

// Now we need to update the AppIcon.appiconset/Contents.json file
const contentsJSON = generateAppIconContentsJson(resourceMap);
Expand Down
Loading