You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by na...@apache.org on 2014/05/07 00:26:55 UTC

[1/2] git commit: [CB-6622][amazon-fireos]Adding icon support for fire os Recently icons support was added for all platforms but amazon-fireos. This commit adds it for amazon-fireos. Icons can be specified in config.xml.

Repository: cordova-lib
Updated Branches:
  refs/heads/master b2e017888 -> fb804bc73


[CB-6622][amazon-fireos]Adding icon support for fire os
Recently icons support was added for all platforms but amazon-fireos.
This commit adds it for amazon-fireos. Icons can be specified in config.xml.


Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/fb804bc7
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/fb804bc7
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/fb804bc7

Branch: refs/heads/master
Commit: fb804bc73e8e5e77d4930c2a3fd699bfe2ab6cb2
Parents: 74ae03f
Author: Archana Naik <na...@lab126.com>
Authored: Fri May 2 14:39:34 2014 -0700
Committer: Archana Naik <na...@lab126.com>
Committed: Tue May 6 15:26:41 2014 -0700

----------------------------------------------------------------------
 .../cordova/metadata/amazon_fireos_parser.js    | 124 ++++++++++++++++++-
 1 file changed, 123 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/fb804bc7/cordova-lib/src/cordova/metadata/amazon_fireos_parser.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/metadata/amazon_fireos_parser.js b/cordova-lib/src/cordova/metadata/amazon_fireos_parser.js
index 5c4a935..32b4d2c 100644
--- a/cordova-lib/src/cordova/metadata/amazon_fireos_parser.js
+++ b/cordova-lib/src/cordova/metadata/amazon_fireos_parser.js
@@ -62,6 +62,17 @@ module.exports.prototype = {
         return ret;
     },
 
+    findAndroidLaunchModePreference: function(config) {
+        var ret = config.getPreference('AndroidLaunchMode');
+        var valid = ['standard', 'singleTop', 'singleTask', 'singleInstance'].indexOf(ret) !== -1;
+        if (ret && !valid) {
+            events.emit('warn', 'Unknown value for launchMode preference: ' + ret);
+            ret = null;
+        }
+
+        return ret;
+    },
+    
     update_from_config:function(config) {
         if (config instanceof ConfigParser) {
         } else throw new Error('update_from_config requires a ConfigParser object');
@@ -73,10 +84,106 @@ module.exports.prototype = {
         fs.writeFileSync(this.strings, strings.write({indent: 4}), 'utf-8');
         events.emit('verbose', 'Wrote out Android application name to "' + name + '"');
 
+        var icons = config.getIcons('amazon-fireos');
+        // if there are icon elements in config.xml
+        if (icons) {
+          var haveSeenDefaultIcon = false;
+          var iconCount = 0;
+          var android_icons = {};
+          var projectRoot = util.isCordova(this.path);
+          var default_icon;
+          var max_size;
+          var max_density;
+          // http://developer.android.com/design/style/iconography.html
+          var densities = {
+            "ldpi" : 36,
+            "mdpi" : 48,
+            "hdpi" : 72,
+            "xhdpi" : 96
+          };
+          for (var i=0; i<icons.length; i++) {
+            var icon = icons[i];
+            var destfilepath;
+            var size = icon.width;
+            if (!size) {
+              size = icon.height;
+            }
+            if (!size && !icon.density) {
+              if (default_icon) {
+                  events.emit('verbose', "more than one default icon: " + JSON.stringify(icon));
+              } else {
+                  default_icon = icon;
+              }
+            } else {
+              var parseIcon = function(icon, icon_size, size, density) {
+                // if density is explicitly defined, no need to calculate it from width/height
+                if (icon.density) {
+                    android_icons[icon.density] = icon;
+                    return;
+                }
+
+                var i = parseInt(icon_size);
+                if (size == parseInt(icon_size)) {
+                  var previous = android_icons[density];
+                  if (previous) {
+                    // already have that density. platform rules
+                    if (!previous.platform) {
+                      android_icons[density] = icon;
+                    } // else already have a platform icon of that density
+                  } else {
+                    android_icons[density] = icon;
+                  }
+                  android_icons[density] = icon;
+                  if (!max_size) {
+                    max_size = size;
+                    max_density = density;
+                  } else {
+                    if (max_size < size) {
+                      max_size = size
+                      max_density = density;
+                    }
+                  }
+                }
+              };
+              for (var density in densities) {
+                parseIcon(icon, size, densities[density], density);
+              }
+            }
+          }
+
+          var copyIcon = function(density) {
+            var srcfilepath;
+            var destfilepath = path.join(this.path, 'res', 'drawable-'+density, 'icon.png');
+            if (android_icons[density]) {
+              srcfilepath = path.join(projectRoot, android_icons[density].src);
+            } else {
+              if (default_icon) {
+                srcfilepath = path.join(projectRoot, default_icon.src);
+              } else {
+                if (max_density) {
+                  srcfilepath = path.join(projectRoot, android_icons[max_density].src);
+                } else {
+                  events.emit('verbose', 'no icon found matching Android typical densities');
+                }
+              }
+            }
+            if (srcfilepath) {
+                events.emit('verbose', 'Copying icon from ' + srcfilepath + ' to ' + destfilepath);
+                shell.cp('-f', srcfilepath, destfilepath);
+            }
+          }.bind(this);
+          for (var density in densities) {
+            copyIcon(density);
+          }
+
+        }
+
         var manifest = xml.parseElementtreeSync(this.manifest);
         // Update the version by changing the AndroidManifest android:versionName
         var version = config.version();
+        var versionCode = config.android_versionCode() || default_versionCode(version);
         manifest.getroot().attrib["android:versionName"] = version;
+        manifest.getroot().attrib["android:versionCode"] = versionCode;
 
         // Update package name by changing the AndroidManifest id and moving the entry class around to the proper package directory
         var pkg = config.packageName();
@@ -99,7 +206,14 @@ module.exports.prototype = {
                     act.attrib["android:screenOrientation"] = 'landscape';
             }
         }
-
+        
+        // Set android:launchMode in AndroidManifest
+        var androidLaunchModePref = this.findAndroidLaunchModePreference(config);
+        if (androidLaunchModePref) {
+            act.attrib["android:launchMode"] = androidLaunchModePref;
+        } else { // User has (explicitly) set an invalid value for AndroidLaunchMode preference
+            delete act.attrib["android:launchMode"]; // use Android default value (standard)
+        }
 
         // Write out AndroidManifest.xml
         fs.writeFileSync(this.manifest, manifest.write({indent: 4}), 'utf-8');
@@ -181,3 +295,11 @@ module.exports.prototype = {
     }
 };
 
+// Consturct the default value for versionCode as
+// PATCH + MINOR * 100 + MAJOR * 10000
+// see http://developer.android.com/tools/publishing/versioning.html
+function default_versionCode(version) {
+    nums = version.split('-')[0].split('.').map(Number);
+    var versionCode = nums[0] * 10000 + nums[1] * 100 + nums[2];
+    return versionCode;
+}


[2/2] git commit: [cb-6619][amazon-fireos] userLandscape is not supported on Kindle Fire OS changed userLandscape to landscape and userPortrait to portrait.

Posted by na...@apache.org.
[cb-6619][amazon-fireos] userLandscape is not supported on Kindle Fire OS
changed userLandscape to landscape and userPortrait to portrait.


Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/74ae03fd
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/74ae03fd
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/74ae03fd

Branch: refs/heads/master
Commit: 74ae03fd867166db4e8815b7d3bd8d608265bc0c
Parents: b2e0178
Author: Archana Naik <na...@lab126.com>
Authored: Fri May 2 12:03:25 2014 -0700
Committer: Archana Naik <na...@lab126.com>
Committed: Tue May 6 15:26:41 2014 -0700

----------------------------------------------------------------------
 cordova-lib/src/cordova/metadata/amazon_fireos_parser.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/74ae03fd/cordova-lib/src/cordova/metadata/amazon_fireos_parser.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/metadata/amazon_fireos_parser.js b/cordova-lib/src/cordova/metadata/amazon_fireos_parser.js
index 107e64e..5c4a935 100644
--- a/cordova-lib/src/cordova/metadata/amazon_fireos_parser.js
+++ b/cordova-lib/src/cordova/metadata/amazon_fireos_parser.js
@@ -93,10 +93,10 @@ module.exports.prototype = {
                     delete act.attrib["android:screenOrientation"];
                     break;
                 case 'portrait':
-                    act.attrib["android:screenOrientation"] = 'userPortrait';
+                    act.attrib["android:screenOrientation"] = 'portrait';
                     break;
                 case 'landscape':
-                    act.attrib["android:screenOrientation"] = 'userLandscape';
+                    act.attrib["android:screenOrientation"] = 'landscape';
             }
         }