flavours 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e38ae2c5aaba370596e63a6d495a74e96eceedb6
-  data.tar.gz: 4609484c94ef031a48d6b4eb09df8d80d0305d9d
+  metadata.gz: db8b057a0c10547bb8f652e11c98727f925ec758
+  data.tar.gz: 72956258d8d52b681c03e91ab0d96ece4927664f
 SHA512:
-  metadata.gz: 2246e0e10acb416ba30ce82ac02a9f4931b30e7e00f15f6dff6f5320a14a08d29ca6e4477358b41b3b18c9c82f32f3e480ebbde409af4aa2723b0df548712c14
-  data.tar.gz: a8d6023db6a6801694792bc40737da37cda1b3d2d4ecae48cc0ac5390b7183e1b86b19fe02aceb62e77bba03767bc12774c8c0c2fef9afe5abd3720ffbfbe2d0
+  metadata.gz: 11bf9e38e7e84929b5dabd320358e664efb7f11cf5515f8f28e06762e3152e95101c9208f7ccac540a41915100310bbf38b4cb07b66089912e04b1fda8ed5e56
+  data.tar.gz: 223ec607bb586d9ca58d107c914b5d928b1abee3016b9dc9bc3f9741ff39459cfaf0c09fcd87cec41af2ceef13705ac7605de20ea9db21e1e60b6c9ae4d480c7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    flavours (0.0.7)
+    flavours (0.0.9)
       bundler (~> 1.3)
       commander (~> 4.2)
       dotenv (~> 0.11)

data/README.md

@@ -86,12 +86,13 @@ In the top-level of the JSON file, we have the main key/value pair:
 This section contains an array of key/value pairs that correspond to each product flavor you'd like to create. Here are all of the possiblities:
 
 * `flavourName`
-* `iconURL`
+* `iconURL` or `iconPath`
 * `packageName`
 * `buildConfig`
 * `colorsXML`
 * `stringsXML`
 * `settingsXML`
+* `drawables`
 
 `flavourName` is required to build that Product Flavor. However, the other options are all optional. `[buildConfig, colorsXML, stringsXML]` all house more key/values that will be be turned in to XML, or `String` properties in the `BuildConfig.java` file specific to that Flavor.
 
@@ -111,6 +112,19 @@ This results in a settings.xml file where the lines look like this:
 
 `<item name="NAME" type="TYPE">VALUE</item>`
 
+`drawables` also has a slightly different format. It's an array of objects with key/value pairs like `settingsXML` is, but the pairs are slightly different.
+
+```
+"drawables": [
+    {
+        "name": "some_image.png",
+        "path": "path/relative/to/project/an_image.png"
+    }
+]
+```
+
+What this does is finds an image relative to your directory at the specified `path` key/value and then makes a copy of it to the appropriate `{flavour}/res/drawable` folder. It doesn't permanently move your file, just duplicates it in the correct spot. It puts it in a general drawable folder instead of one like drawable-hdpi. 
+
 ## Creating Flavors
 
 Now that you're set up - it's time to run this bad boy! Make sure that you have updated your `flavours.json` file with the correct information for your apps, and then run the following command inside the project directory.

data/lib/flavours/images.rb

@@ -16,7 +16,7 @@ module Flavours
     end
 
     # Resize Icons
-    resize_icons directory, m, flavour_hash if flavour_hash['iconURL'] || flavour_hash['iconPath']
+    resize_icons directory, m, flavour_hash
 
     # Move Drawables
     move_drawables directory, m, flavour_hash if flavour_hash['drawables']
@@ -29,20 +29,23 @@ module Flavours
     name = flavour_hash['flavourName']
 
     # Get Image Information
+    img_path = ''
     if flavour_hash['iconUrl']
       img_path = self.path_for_downloaded_image_from_url directory, name, flavour_hash['iconUrl'], 'icons'
-    else
+    elsif flavour_hash['iconPath']
       img_path = "#{directory}/#{flavour_hash['iconPath']}"
+    else
+      return
     end
 
     # Make Assets Directory
-    drawables = ['drawable-xxhdpi','drawable-xhdpi','drawable-hdpi','drawable-mdpi']
+    drawables = ['drawable-xxxhdpi','drawable-xxhdpi','drawable-xhdpi','drawable-hdpi','drawable-mdpi']
     drawables.each do |d|
       Flavours::make_asset_directory directory, m, name, d
     end
 
     # Resize
-    image_sizes = ['144x144', '96x96', '72x72', '48x48']
+    image_sizes = ['192x192', '144x144', '96x96', '72x72', '48x48']
     image_sizes.each_index do |i|
       size = image_sizes[i]
       drawable = drawables[i]

data/lib/flavours/version.rb

@@ -1,5 +1,5 @@
 module Flavours
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 
   def self.check_for_newer_version
     unless Gem.latest_version_for('flavours').to_s == VERSION

data/lib/flavours/xmlres.rb

@@ -48,6 +48,6 @@ module Flavours
   # Resource String
   def self.res_string res, name, value, type
     type_string = type ? " type=\"#{type}\"" : ''
-    return "        <#{res} name=\"#{name}\"#{type_string}>#{value.sub("'", "\\'")}</#{res}>\n"
+    return "        <#{res} name=\"#{name}\"#{type_string}>#{value.gsub("'", %q(\\\'))}</#{res}>\n"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flavours
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Ben Gordon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-23 00:00:00.000000000 Z
+date: 2014-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler