Merge pull request AlexDisler#114 from gregvis/master

added android version detection to automatically adjust output folder

Author: AlexDisler

.gitignore

@@ -26,3 +26,4 @@ build/Release
 # Deployed apps should consider commenting this line out:
 # see https://npmjs.org/doc/faq.html#Should-I-check-my-node_modules-folder-into-git
 node_modules
+yarn.lock

index.js

@@ -6,6 +6,7 @@ var colors = require('colors');
 var _      = require('underscore');
 var Q      = require('q');
 var argv   = require('minimist')(process.argv.slice(2));
+var semver = require('semver');
 
 /**
  * @var {Object} settings - names of the config file and of the icon image
@@ -15,6 +16,22 @@ settings.CONFIG_FILE = argv.config || 'config.xml';
 settings.ICON_FILE = argv.icon || 'icon.png';
 settings.OLD_XCODE_PATH = argv['xcode-old'] || false;
 
+
+/**
+ * Get Android Folder based on Android Platform version
+ */
+var getAndroidFolder = function(){
+  var androidFolder = 'platforms/android/app/src/main/res/'; //as of cordova-android@7.0.0
+  if(!fs.existsSync('platforms/android/cordova/version')){
+    return androidFolder;
+  }
+  if(semver.lt(require('../../platforms/android/cordova/version').version, '7.0.0')){
+    androidFolder = 'platforms/android/res/';
+  }
+  return androidFolder;
+}
+
+
 /**
  * Check which platforms are added to the project and return their icon names and sizes
  *
@@ -69,7 +86,7 @@ var getPlatforms = function (projectName) {
   platforms.push({
     name : 'android',
     isAdded : fs.existsSync('platforms/android'),
-    iconsPath : 'platforms/android/res/',
+    iconsPath : getAndroidFolder(),
     icons : [
       { name : 'drawable/icon.png',       size : 96 },
       { name : 'drawable-hdpi/icon.png',  size : 72 },

package.json

@@ -31,6 +31,7 @@
     "imagemagick": "^0.1.3",
     "minimist": "^1.2.0",
     "q": "^1.0.1",
+    "semver": "^5.5.0",
     "underscore": "^1.6.0",
     "xml2js": "^0.4.3"
   }