Skip to content

Unified config.xml syntax #7

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

Closed
gorkem wants to merge 3 commits into from
Closed

Unified config.xml syntax #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b10a5f9
Unified config.xml syntax
gorkem Mar 28, 2013
3c44400
Change template id to Java identifier compatibility
gorkem Apr 4, 2013
6bf571e
remove the incorrect access value
gorkem Apr 5, 2013
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
35 changes: 3 additions & 32 deletions src/metadata/android_parser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,38 +87,9 @@ module.exports.prototype = {
fs.writeFileSync(new_javs, javs_contents, 'utf-8');

// Update whitelist by changing res/xml/config.xml
var android_cfg_xml = new config_parser(this.android_config);
// clean out all existing access elements first
android_cfg_xml.access.remove();
// add only the ones specified in the www/config.xml file
config.access.get().forEach(function(uri) {
android_cfg_xml.access.add(uri);
});

// Update preferences
android_cfg_xml.preference.remove();
var prefs = config.preference.get();
// write out defaults, unless user has specifically overrode it
for (var p in default_prefs) if (default_prefs.hasOwnProperty(p)) {
var override = prefs.filter(function(pref) { return pref.name == p; });
var value = default_prefs[p];
if (override.length) {
// override exists
value = override[0].value;
// remove from prefs list so we dont write it out again below
prefs = prefs.filter(function(pref) { return pref.name != p });
}
android_cfg_xml.preference.add({
name:p,
value:value
});
}
prefs.forEach(function(pref) {
android_cfg_xml.preference.add({
name:pref.name,
value:pref.value
});
});
var root = util.isCordova(this.path);
shell.cp( '-f', path.join( root, 'www', 'config.xml'),
this.android_config );
},

// Returns the platform-specific www directory.
Expand Down
35 changes: 3 additions & 32 deletions src/metadata/ios_parser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,38 +87,9 @@ module.exports.prototype = {
info_contents = info_contents.replace(/<string>[\s\r\n]*<\/string>/g,'<string></string>');
fs.writeFileSync(plistFile, info_contents, 'utf-8');

// Update whitelist
var self = this;
this.config.access.remove();
config.access.get().forEach(function(uri) {
self.config.access.add(uri);
});

// Update preferences
this.config.preference.remove();
var prefs = config.preference.get();
// write out defaults, unless user has specifically overrode it
for (var p in default_prefs) if (default_prefs.hasOwnProperty(p)) {
var override = prefs.filter(function(pref) { return pref.name == p; });
var value = default_prefs[p];
if (override.length) {
// override exists
value = override[0].value;
// remove from prefs list so we dont write it out again below
prefs = prefs.filter(function(pref) { return pref.name != p });
}
this.config.preference.add({
name:p,
value:value
});
}
prefs.forEach(function(pref) {
self.config.preference.add({
name:pref.name,
value:pref.value
});
});

var root = util.isCordova(this.path);
shell.cp( '-f', path.join( root, 'www', 'config.xml'),path.join(this.cordovaproj, 'config.xml') );

// Update product name
var proj = new xcode.project(this.pbxproj);
var parser = this;
Expand Down
147 changes: 112 additions & 35 deletions templates/www/config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<widget xmlns = "http://www.w3.org/ns/widgets"
xmlns:gap = "http://phonegap.com/ns/1.0"
id = "io.cordova.hello-cordova"
id = "io.cordova.helloCordova"
version = "2.0.0">
<name>Hello Cordova</name>

Expand All @@ -13,37 +12,115 @@
Apache Cordova Team
</author>

<icon src="res/icon/cordova_512.png" width="512" height="512" />
<icon src="res/icon/cordova_android_96.png" width="96" height="96" gap:platform="android" />
<icon src="res/icon/cordova_bb_80.png" width="80" height="80" gap:platform="blackberry" />
<icon src="res/icon/cordova_ios_144.png" width="144" height="144" gap:platform="ios" />

<gap:splash src="res/screen/android_hdpi_landscape.png" width="800" height="480" gap:platform="android" />
<gap:splash src="res/screen/android_hdpi_portrait.png" width="480" height="800" gap:platform="android" />
<gap:splash src="res/screen/android_ldpi_landscape.png" width="320" height="200" gap:platform="android" />
<gap:splash src="res/screen/android_ldpi_portrait.png" width="200" height="320" gap:platform="android" />
<gap:splash src="res/screen/android_mdpi_landscape.png" width="480" height="320" gap:platform="android" />
<gap:splash src="res/screen/android_mdpi_portrait.png" width="320" height="480" gap:platform="android" />
<gap:splash src="res/screen/android_xhdpi_landscape.png" width="1280" height="720" gap:platform="android" />
<gap:splash src="res/screen/android_xhdpi_portrait.png" width="720" height="1280" gap:platform="android" />
<gap:splash src="res/screen/blackberry_transparent_300.png" width="300" height="300" gap:platform="blackberry" />
<gap:splash src="res/screen/blackberry_transparent_400.png" width="200" height="200" gap:platform="blackberry" />
<gap:splash src="res/screen/ipad_landscape.png" width="1024" height="748" gap:platform="ios" />
<gap:splash src="res/screen/ipad_portrait.png" width="768" height="1004" gap:platform="ios" />
<gap:splash src="res/screen/ipad_retina_landscape.png" width="2048" height="1496" gap:platform="ios" />
<gap:splash src="res/screen/ipad_retina_portrait.png" width="1536" height="2008" gap:platform="ios" />
<gap:splash src="res/screen/iphone_landscape.png" width="480" height="320" gap:platform="ios" />
<gap:splash src="res/screen/iphone_portrait.png" width="320" height="480" gap:platform="ios" />
<gap:splash src="res/screen/iphone_retina_landscape.png" width="960" height="640" gap:platform="ios" />
<gap:splash src="res/screen/iphone_retina_portrait.png" width="640" height="960" gap:platform="ios" />
<gap:splash src="res/screen/windows_phone_portrait.jpg" width="480" height="800" gap:platform="winphone" />

<feature name="http://api.phonegap.com/1.0/device" />

<preference name="phonegap-version" value="1.9.0" />
<preference name="orientation" value="default" />
<preference name="target-device" value="universal" />
<preference name="fullscreen" value="false" />

<access origin="*" />
<access origin="*"/>

<!-- <content src="http://mysite.com/myapp.html" /> for external pages -->
<content src="index.html" />

<log level="DEBUG"/>

<!-- Preferences for Android -->
<preference name="useBrowserHistory" value="true" />
<preference name="exit-on-suspend" value="false" />

<!-- Preferences for iOS -->
<preference name="AllowInlineMediaPlayback" value="false" />
<preference name="AutoHideSplashScreen" value="true" />
<preference name="BackupWebStorage" value="cloud" />
<preference name="DisallowOverscroll" value="false" />
<preference name="EnableLocation" value="false" /><!-- DEPRECATED -->
<preference name="EnableViewportScale" value="false" />
<preference name="FadeSplashScreen" value="true" />
<preference name="FadeSplashScreenDuration" value=".25" />
<preference name="HideKeyboardFormAccessoryBar" value="false" />
<preference name="KeyboardDisplayRequiresUserAction" value="true" />
<preference name="KeyboardShrinksView" value="false" />
<preference name="MediaPlaybackRequiresUserAction" value="false" />
<preference name="ShowSplashScreenSpinner" value="true" />
<preference name="SuppressesIncrementalRendering" value="false" />
<preference name="TopActivityIndicator" value="gray" />



<feature name="App">
<param name="android-package" value="org.apache.cordova.App"/>
</feature>
<feature name="Geolocation">
<param name="ios-package" value="CDVLocation"/>
<param name="android-package" value="org.apache.cordova.GeoBroker"/>
</feature>
<feature name="Device">
<param name="ios-package" value="CDVDevice"/>
<param name="android-package" value="org.apache.cordova.Device"/>
</feature>
<feature name="Accelerometer">
<param name="ios-package" value="CDVAccelerometer"/>
<param name="android-package" value="org.apache.cordova.AccelListener"/>
</feature>
<feature name="Compass">
<param name="ios-package" value="CDVLocation"/>
<param name="android-package" value="org.apache.cordova.CompassListener"/>
</feature>
<feature name="Media">
<param name="ios-package" value="CDVSound"/>
<param name="android-package" value="org.apache.cordova.AudioHandler"/>
</feature>
<feature name="Camera">
<param name="ios-package" value="CDVCamera"/>
<param name="android-package" value="org.apache.cordova.CameraLauncher"/>
</feature>
<feature name="Contacts">
<param name="ios-package" value="CDVContacts"/>
<param name="android-package" value="org.apache.cordova.ContactManager"/>
</feature>
<feature name="File">
<param name="ios-package" value="CDVFile"/>
<param name="android-package" value="org.apache.cordova.FileUtils"/>
</feature>
<feature name="NetworkStatus">
<param name="ios-package" value="CDVConnection"/>
<param name="android-package" value="org.apache.cordova.NetworkManager"/>
</feature>
<feature name="Notification">
<param name="ios-package" value="CDVNotification"/>
<param name="android-package" value="org.apache.cordova.Notification"/>
</feature>
<feature name="Storage">
<param name="android-package" value="org.apache.cordova.Storage"/>
</feature>
<feature name="FileTransfer">
<param name="ios-package" value="CDVFileTransfer"/>
<param name="android-package" value="org.apache.cordova.FileTransfer"/>
</feature>
<feature name="Capture">
<param name="ios-package" value="CDVCapture"/>
<param name="android-package" value="org.apache.cordova.Capture"/>
</feature>
<feature name="Battery">
<param name="ios-package" value="CDVBattery"/>
<param name="android-package" value="org.apache.cordova.BatteryListener"/>
</feature>
<feature name="SplashScreen">
<param name="ios-package" value="CDVSplashScreen"/>
<param name="android-package" value="org.apache.cordova.SplashScreen"/>
</feature>
<feature name="Echo">
<param name="ios-package" value="CDVEcho"/>
<param name="android-package" value="org.apache.cordova.Echo"/>
</feature>
<feature name="Globalization">
<param name="ios-package" value="CDVGlobalization"/>
<param name="android-package" value="org.apache.cordova.Globalization"/>
</feature>
<feature name="InAppBrowser">
<param name="ios-package" value="CDVInAppBrowser"/>
<param name="android-package" value="org.apache.cordova.InAppBrowser"/>
</feature>
<feature name="Logger">
<param name="ios-package" value="CDVLogger"/>
</feature>
<feature name="Debug Console">
<param name="ios-package" value="CDVDebugConsole"/>
</feature>

</widget>