Repository: cordova-lib Updated Branches: refs/heads/master b7781cbea -> dad3e95ac
CB-7132 Fix regression regarding default resources github: close #58 Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/dad3e95a Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/dad3e95a Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/dad3e95a Branch: refs/heads/master Commit: dad3e95acec5798e759563e46641efe6a4d2272c Parents: b7781cb Author: ignisvulpis <[email protected]> Authored: Mon Jul 14 23:38:18 2014 +0200 Committer: Andrew Grieve <[email protected]> Committed: Tue Jul 22 19:59:12 2014 -0400 ---------------------------------------------------------------------- cordova-lib/src/cordova/metadata/android_parser.js | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/dad3e95a/cordova-lib/src/cordova/metadata/android_parser.js ---------------------------------------------------------------------- diff --git a/cordova-lib/src/cordova/metadata/android_parser.js b/cordova-lib/src/cordova/metadata/android_parser.js index 7ad2a33..76108a2 100644 --- a/cordova-lib/src/cordova/metadata/android_parser.js +++ b/cordova-lib/src/cordova/metadata/android_parser.js @@ -83,7 +83,7 @@ module.exports.prototype = { if (filename.indexOf('drawable-') === 0) { var density = filename.substr(9); densities.push(density); - var template = path.join(filename, name); + var template = path.join(res, filename, name); try { fs.unlinkSync(template); events.emit('verbose', 'deleted: ' + template); @@ -98,11 +98,16 @@ module.exports.prototype = { handleSplashes:function(config) { var resources = config.getSplashScreens('android'); // if there are "splash" elements in config.xml - if (resources) { + if (resources.length > 0) { var densities = this.deleteDefaultResource('screen.png'); events.emit('verbose', 'splash screens: ' + JSON.stringify(resources)); var res = path.join(this.path, 'res'); + if (resources.defaultResource) { + var destfilepath = path.join(res, 'drawable', 'screen.png'); + events.emit('verbose', 'copying splash icon from ' + resources.defaultResource.src + ' to ' + destfilepath); + shell.cp('-f', resources.defaultResource.src, destfilepath); + } for (var i=0; i<densities.length; i++) { var density = densities[i]; var resource = resources.getByDensity(density); @@ -119,7 +124,7 @@ module.exports.prototype = { handleIcons: function(config) { var icons = config.getIcons('android'); // if there are icon elements in config.xml - if (!icons) { + if (icons.length === 0) { events.emit('verbose', 'This app does not have launcher icons defined'); return; }
