fastlane-plugin-framer 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c4b531a62b518edcbfb5ef5d6696cd3a109511b
-  data.tar.gz: b85e2d2e122b8f4c32497f4b5274729793b44a64
+  metadata.gz: 793589ac361a9c33cdce43eb8d36bf667a13e917
+  data.tar.gz: e4c24b4157cc2728607dda48bb9f20a7e461bcf1
 SHA512:
-  metadata.gz: 75f7533dbabe59ff64b89e884440da4bbe438101dd851f600a79ad2434ccc2e5a63ead9709df95a7c45622a1b7941ba864470198df7054ecdece69d6eb9422dd
-  data.tar.gz: 8af5b26a8ffd8881c3b945173ce4b1bad502f5bf24b7007abaff2cfb96cbf6818877f33354eb520f7279312c1979d61336c5ba1e3f36ea5ba29e2165743ec7db
+  metadata.gz: 026f0a85c20cd76d7f5723aaafbb28b808edee7b40a6e1da32ed5d4cfba847337369f7abe1f324c83b5a193fe0aa318308e811fe9e8ebf3c70115522477f6bce
+  data.tar.gz: e3ecd5c1ff8141026593015f6c94052bb841451d5c161f4619a37f53c230fb96e36501ae672df376f46831751d413c8ebff4497c2e401d5d4300f675195f1b68

data/README.md

@@ -105,7 +105,7 @@ The *value* can be any strings.
 
 You can customize the color of the text and the background color applyed below the template (if you have transparencies on the template, you can fill them with the background color).
 
-`colors.json` is a simple map where *key* is the part of the screenshot filename. The *value* is a map with 2 optional keys, *text* and *background*.
+`colors.json` is a simple map where *key* is part of the screenshot filename. The *value* is a map with 2 optional keys, *text* and *background*.
 
 ```
 {

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

@@ -36,6 +36,7 @@ module Fastlane
         output_folder = params[:output_folder]
         template_folder = params[:template_folder]
         templates = []
+        platform = Actions.lane_context[Actions::SharedValues::PLATFORM_NAME]
 
         # Read config
         UI.success "Fetching templates from #{template_folder}"
@@ -46,21 +47,21 @@ module Fastlane
         Dir.glob("#{source_folder}/**/*.png") do |file|
           UI.message "Processing #{file}"
 
-          template = self.find_template(templates, file)
+          template = self.find_template(templates, file, platform)
           if template.nil?
             UI.error "Unable to find template for screenshot #{file}"
             next
           end
-          UI.message "Using template: #{template.name} (#{template.width}x#{template.height})"
+          UI.verbose "Using template: #{template.name} (#{template.width}x#{template.height})"
 
           text = self.find_text(source_folder, file)
-          UI.message "Using text: #{text}"
+          UI.verbose "Using text: #{text}"
 
           colors = self.find_colors(source_folder, file)
-          UI.message "Using colors: #{colors}"
+          UI.verbose "Using colors: #{colors}"
 
           output = self.find_output(source_folder, file, output_folder, params[:output_suffix])
-          UI.message "Saving to: #{output}"
+          UI.verbose "Saving to: #{output}"
 
           # Do the magic
           self.combine(file, template, colors, text, output)
@@ -128,10 +129,18 @@ module Fastlane
         return templates
       end
 
-      def self.find_template(templates, screenshot_file)
-        # Read device name from file
-        filename = File.basename(screenshot_file)
-        device = filename.slice(0, filename.rindex('-'))
+      def self.find_template(templates, screenshot_file, platform)
+        if [:ios, :mac].include? platform
+          # Read device name from file
+          filename = File.basename(screenshot_file)
+          device = filename.slice(0, filename.rindex('-'))
+        elsif :android == platform
+          # Read device name from path
+          folder = File.basename(File.dirname(screenshot_file))
+          device = folder.slice(0, folder.rindex('S'))
+        else
+          UI.error "Unsupported platform"
+        end
 
         # Search template that matches that size
         return templates.find { |template| template.name == device }

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

@@ -1,5 +1,5 @@
 module Fastlane
   module Framer
-    VERSION = "1.0.0"
+    VERSION = "1.0.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-framer
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - DrAL3X
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-08 00:00:00.000000000 Z
+date: 2018-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_magick
@@ -161,3 +161,4 @@ specification_version: 4
 summary: Create images combining app screenshots with templates to make nice pictures
   for the App Store
 test_files: []
+has_rdoc: