Skip to content
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

Jump to bottom

[TIMOB-19295] iOS9: Titanium CLI automatically converts existing images to assets catalog #7231

Merged
merged 1 commit into from
Sep 30, 2015
Merged

[TIMOB-19295] iOS9: Titanium CLI automatically converts existing images to assets catalog #7231

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
70 changes: 69 additions & 1 deletion iphone/cli/commands/_build.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ var appc = require('node-appc'),
bufferEqual = require('buffer-equal'),
Builder = require('titanium-sdk/lib/builder'),
CleanCSS = require('clean-css'),
crypto = require('crypto'),
cyan = require('colors').cyan,
ejs = require('ejs'),
fields = require('fields'),
Expand Down Expand Up @@ -3977,7 +3978,8 @@ iOSBuilder.prototype.copyResources = function copyResources(next) {
cssFiles = {},
htmlJsFiles = {},
appIcons = {},
launchImages = {};
launchImages = {},
imageAssets = {};

function walk(src, dest, ignore, origSrc) {
fs.existsSync(src) && fs.readdirSync(src).forEach(function (name) {
Expand Down Expand Up @@ -4028,6 +4030,11 @@ iOSBuilder.prototype.copyResources = function copyResources(next) {
cssFiles[relPath] = info;
break;

case 'png':
case 'jpg':
imageAssets[relPath] = info;
break;

case 'html':
jsanalyze.analyzeHtmlFile(from, relPath.split('/').slice(0, -1).join('/')).forEach(function (file) {
htmlJsFiles[file] = 1;
Expand Down Expand Up @@ -4459,6 +4466,67 @@ iOSBuilder.prototype.copyResources = function copyResources(next) {
writeAssetContentsFile.call(this, path.join(launchImageDir, 'Contents.json'), launchImageSet);
},

function createAssetImageSets() {
this.logger.info(__('Creating assets image set'));
var assetCatalog = path.join(this.buildDir, 'Assets.xcassets'),
imageSets = {},
imageNameRegExp = /^(.*?)(@[23]x)?(~iphone|~ipad)?\.(png|jpg)$/;

function sha1(value) {
var sha = crypto.createHash('sha1');
sha.update(value);
return sha.digest('hex');
};

Object.keys(imageAssets).forEach(function (file) {
var imageName = imageAssets[file].name,
imageExt = imageAssets[file].ext,
match = file.match(imageNameRegExp),
dest,
imageSetName,
imageSetNameSHA,
imageSetRelPath;

if (match) {
imageSetName = match[1];
imageSetNameSHA = sha1(imageSetName + '.' + imageExt);
imageSetRelPath = imageSetNameSHA + '.imageset';

// update image file's destination
dest = path.join(assetCatalog, imageSetRelPath, imageName + '.' + imageExt);
imageAssets[file].dest = dest;

delete this.buildDirFiles[dest];

if (!imageSets[imageSetRelPath]) {
imageSets[imageSetRelPath] = {
images: [],
name: imageSetName
};
}

imageSets[imageSetRelPath].images.push({
idiom: !match[3] ? 'universal' : match[3].replace('~', ''),
filename: imageName + '.' + imageExt,
scale: !match[2] ? '1x' : match[2].replace('@', '')
});
}

resourcesToCopy[file] = imageAssets[file];
}, this);

// finally create all the Content.json files
Object.keys(imageSets).forEach(function (set) {
writeAssetContentsFile.call(this, path.join(assetCatalog, set, 'Contents.json'), {
images: imageSets[set].images,
info: {
version: 1,
author: 'xcode'
}
});
}, this);
},

function copyResources() {
this.logger.debug(__('Copying resources'));
Object.keys(resourcesToCopy).forEach(function (file) {
Expand Down