This repository has been archived by the owner on Oct 19, 2020. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 291
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Revert "added android version detection to automatically adjust outpu…
…t folder" This reverts commit 3bbc773.
- Loading branch information
1 parent
6660c1a
commit 233db74
Showing
3 changed files
with
1 addition
and
20 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,7 +6,6 @@ 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 | ||
|
@@ -16,22 +15,6 @@ 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 [email protected] | ||
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 | ||
* | ||
|
@@ -86,7 +69,7 @@ var getPlatforms = function (projectName) { | |
platforms.push({ | ||
name : 'android', | ||
isAdded : fs.existsSync('platforms/android'), | ||
iconsPath : getAndroidFolder(), | ||
iconsPath : 'platforms/android/res/', | ||
icons : [ | ||
{ name : 'drawable/icon.png', size : 96 }, | ||
{ name : 'drawable-hdpi/icon.png', size : 72 }, | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters