fastlane-plugin-framer 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ead286739a4dc5358d1ce3b78445e2be9d1b998b
-  data.tar.gz: 52b60581ce5c3dda8011a98b38e52aaa36395558
+  metadata.gz: 0e9290f3e19124b67452ff24982ca4f1eff09b19
+  data.tar.gz: 4f5b1035d851c4c5b6dab6aca9c7f9f597faa639
 SHA512:
-  metadata.gz: 0f04aabf6c588370a376dc7b9feb44cc8fb5d6209a63025a0958d5095893abb3b0146ed386c7c588ad6c03f6c889869287cc8eaa401192b957256226d443c8d0
-  data.tar.gz: 163a4fe66cd172c1b9d75b71789565eb952dbe943cb657c35ac5bec196f4935283c9abf77f891fd579b18c19611718410044c5b231777e3c348db63fba0ed70f
+  metadata.gz: 803aa2a181b6d28ee43cfb7231308d678ae9aec6b4c82a0aa0234e572854d414da72326b396a7c019ed2bebcf900a256cbae73b20572d3ea409bc2b6ec6c8dfc
+  data.tar.gz: a4604d3b991a74bcbab6ea41aa5b9b959d9369ebc1c83d4e5b52c837260faf42411f3ce5432b82449a88217627c0256594f23d2c54f57b622f50e68128ace342

data/README.md

@@ -79,7 +79,8 @@ There are keys for configuring screeshot and for the text.
 | Key            | Type     | Description        |
 | -------------- | --------:| ------------:|
 | `offset`       | String   | Pixel position in the format `+[X value]+[Y value]` |
-| `width`        | Number 	  | space available, in pixel, for the screen |
+| `width`        | Number   | space available, in pixel, for the screen |
+| `add_below`    | Boolean  | add screen below the template or not |
 
 #### Text
 

data/lib/fastlane/plugin/framer/actions/framer_action.rb

@@ -8,7 +8,7 @@ module Fastlane
       attr_accessor :size
 
       attr_accessor :file
-      attr_accessor :imageOffset, :imageWidth
+      attr_accessor :imageOffset, :imageWidth, :imageBelow
       attr_accessor :textOffsetX, :textOffsetY, :textWidth, :textHeight, :textPadding, :textSize, :textFont, :textColor
     end
 
@@ -90,6 +90,7 @@ module Fastlane
           # Set config
           template.imageOffset  = (config_custom['image'] && config_custom['image']['offset']) || (config_default['image'] && config_default['image']['offset'])
           template.imageWidth   = (config_custom['image'] && config_custom['image']['width']) || (config_default['image'] && config_default['image']['width'])
+          template.imageBelow   = (config_custom['image'] && config_custom['image']['add_below']) || (config_default['image'] && config_default['image']['add_below']) || false
 
           template.textColor    = (config_custom['text'] && config_custom['text']['color']) || (config_default['text'] && config_default['text']['color'])
           template.textFont     = (config_custom['text'] && config_custom['text']['font']) || (config_default['text'] && config_default['text']['font'])
@@ -158,6 +159,7 @@ module Fastlane
       end
 
       def self.combine(screenshot_file, template, text, output_file)
+
         # Get template image
         template_img = MiniMagick::Image.open(template.file)
 
@@ -168,11 +170,37 @@ module Fastlane
         screenshot_img.resize "#{template.imageWidth}x"
 
         # Put screenshot over template
-        result_img = template_img.composite(screenshot_img) do |c|
-          c.compose "Over"
-          c.geometry template.imageOffset.to_s
+        if template.imageBelow
+          
+          # Create a blank image
+          base_1_img = MiniMagick::Image.open("#{Framer::ROOT}/assets/background.png")
+          base_1_img.resize "#{template.size}!" # `!` says it should ignore the ratio
+
+          # Screenshot first
+          base_2_img = base_1_img.composite(screenshot_img) do |c|
+            c.compose "Over"
+            c.geometry template.imageOffset.to_s
+          end
+          
+          # Template second
+          result_img = base_2_img.composite(template_img) do |c|
+            c.compose "Over"
+          end
+
+          base_1_img.destroy!
+          base_2_img.destroy!
+
+        else
+
+          # Screenshot over template, in one shot
+          result_img = template_img.composite(screenshot_img) do |c|
+            c.compose "Over"
+            c.geometry template.imageOffset.to_s
+          end
+
         end
 
+        # Apply text, if any
         unless text.nil?
           # Clean text string before using it
           text.gsub! '\n', "\n"
@@ -227,6 +255,7 @@ module Fastlane
         result_img.destroy!
         screenshot_img.destroy!
         template_img.destroy!
+        
       end
 
       def self.create_dir_if_not_exists(path)

data/lib/fastlane/plugin/framer/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
   module Framer
-    VERSION = "0.2.0"
+    VERSION = "0.2.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-framer
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - DrAL3X
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-10 00:00:00.000000000 Z
+date: 2017-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_magick