fastlane-plugin-appicon 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0d2778c40b10ae4ddb7fd9381c2a0a6513b2c77
-  data.tar.gz: d204776ca0b0f21920ce023a9fe6dd7c87cf1799
+  metadata.gz: e9ea554d75a2c7d5d1d2dce585ba23d52b166756
+  data.tar.gz: 6e8971f28291224730c19ea9d460a4257e15f5b0
 SHA512:
-  metadata.gz: fc491962258e317f0077a4e52a0bbdc99065ebaa88a69cc1d24f44893692c430251abd50464b447f2c9d5ad86c19678fbb01ab3b2dc9ad77053ac21e364ad595
-  data.tar.gz: 5a1a8f58b3547ce3dbb53a9fe1d9b575b6c2f48c7539fcb797a906e0b7f995189a4f00936b20b4f8c5413cfaa05611a7ed15619496db5b0366a1b233f3af0ccb
+  metadata.gz: 15f8271515484214a574753a08611d21c5c11ce4554abd7276768bb29894039453945eba33e7232b97a3a3ef603bf37392226b8ebec2ac23f7847b729a1f1d4e
+  data.tar.gz: 1cb9392d6e07cd8652666094bbe9023f54e0ca7351413555397e39a8720b5cc920e72f8434e116a2ba87d227ab81c7727a6e533c9db04f5656a292ac15b41da0

data/lib/fastlane/plugin/appicon.rb

@@ -4,7 +4,7 @@ module Fastlane
   module Appicon
     # Return all .rb files inside the "actions" directory
     def self.all_classes
-      Dir[File.expand_path('**/{actions}/*.rb', File.dirname(__FILE__))]
+      Dir[File.expand_path('**/{actions,helper}/*.rb', File.dirname(__FILE__))]
     end
   end
 end

data/lib/fastlane/plugin/appicon/actions/android_appicon_action.rb

@@ -22,25 +22,22 @@ module Fastlane
         require 'mini_magick'
         image = MiniMagick::Image.open(fname)
 
-        UI.user_error!("Minimum width of input image should be 512") if image.width < 512
-        UI.user_error!("Minimum height of input image should be 512") if image.height < 512
-        UI.user_error!("Input image should be square") if image.width != image.height
+        Helper::AppiconHelper.check_input_image_size(image, 512)
 
-        params[:appicon_devices].each do |device|
-          self.needed_icons[device].each do |scale, sizes|
-            sizes.each do |size|
-              width, height = size.split('x').map { |v| v.to_f }
+        # Convert image to png
+        image.format 'png'
 
-              basepath = Pathname.new("#{params[:appicon_path]}-#{scale}")
-              FileUtils.mkdir_p(basepath)
-              filename = "#{params[:appicon_filename]}.png"
+        icons = Helper::AppiconHelper.get_needed_icons(params[:appicon_devices], self.needed_icons, true)
+        icons.each do |icon|
+          width = icon['width']
+          height = icon['height']
 
-              image = MiniMagick::Image.open(fname)
-              image.format 'png'
-              image.resize "#{width}x#{height}"
-              image.write basepath + filename
-            end
-          end
+          basepath = Pathname.new("#{params[:appicon_path]}-#{icon['scale']}")
+          FileUtils.mkdir_p(basepath)
+          filename = "#{params[:appicon_filename]}.png"
+
+          image.resize "#{width}x#{height}"
+          image.write basepath + filename
         end
 
         UI.success("Successfully stored launcher icons at '#{params[:appicon_path]}'")

data/lib/fastlane/plugin/appicon/actions/appicon_action.rb

@@ -22,33 +22,32 @@ module Fastlane
         require 'mini_magick'
         image = MiniMagick::Image.open(fname)
 
-        UI.user_error!("Minimum width of input image should be 1024") if image.width < 1024
-        UI.user_error!("Minimum height of input image should be 1024") if image.height < 1024
-        UI.user_error!("Input image should be square") if image.width != image.height
+        Helper::AppiconHelper.check_input_image_size(image, 1024)
 
+        # Convert image to png
+        image.format 'png'
+
+        # Create the base path
         FileUtils.mkdir_p(basepath)
 
         images = []
 
-        params[:appicon_devices].each do |device|
-          self.needed_icons[device].each do |scale, sizes|
-            sizes.each do |size|
-              width, height = size.split('x').map { |v| v.to_f * scale.to_i }
-              filename = "#{basename}-#{width.to_i}x#{height.to_i}.png"
+        icons = Helper::AppiconHelper.get_needed_icons(params[:appicon_devices], self.needed_icons, false)
+        icons.each do |icon|
+          width = icon['width']
+          height = icon['height']
+          filename = "#{basename}-#{width.to_i}x#{height.to_i}.png"
 
-              image = MiniMagick::Image.open(fname)
-              image.format 'png'
-              image.resize "#{width}x#{height}"
-              image.write basepath + filename
+          # downsize icon
+          image.resize "#{width}x#{height}"
+          image.write basepath + filename
 
-              images << {
-                'size' => size,
-                'idiom' => device,
-                'filename' => filename,
-                'scale' => scale
-              }
-            end
-          end
+          images << {
+            'size' => icon['size'],
+            'idiom' => icon['device'],
+            'filename' => filename,
+            'scale' => icon['scale']
+          }
         end
 
         contents = {

data/lib/fastlane/plugin/appicon/helper/appicon_helper.rb

@@ -0,0 +1,35 @@
+module Fastlane
+  module Helper
+    class AppiconHelper
+      def self.check_input_image_size(image, size)
+        UI.user_error!("Minimum width of input image should be #{size}") if image.width < size
+        UI.user_error!("Minimum height of input image should be #{size}") if image.height < size
+        UI.user_error!("Input image should be square") if image.width != image.height
+      end
+      def self.get_needed_icons(devices, needed_icons, is_android = false)
+        icons = []
+        devices.each do |device|
+          needed_icons[device].each do |scale, sizes|
+            sizes.each do |size|
+              if is_android
+                width, height = size.split('x').map { |v| v.to_f }
+              else
+                width, height = size.split('x').map { |v| v.to_f * scale.to_i }
+              end
+
+              icons << {
+                'width' => width,
+                'height' => height,
+                'size' => size,
+                'device' => device,
+                'scale' => scale
+              }
+            end
+          end
+        end
+        # Sort from the largest to the smallest needed icon
+        icons = icons.sort_by {|value| value['width']} .reverse
+      end
+    end
+  end
+end

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

@@ -1,5 +1,5 @@
 module Fastlane
   module Appicon
-    VERSION = "0.6.0"
+    VERSION = "0.7.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-appicon
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Boris Bügling
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-09 00:00:00.000000000 Z
+date: 2017-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_magick
@@ -133,6 +133,7 @@ files:
 - lib/fastlane/plugin/appicon.rb
 - lib/fastlane/plugin/appicon/actions/android_appicon_action.rb
 - lib/fastlane/plugin/appicon/actions/appicon_action.rb
+- lib/fastlane/plugin/appicon/helper/appicon_helper.rb
 - lib/fastlane/plugin/appicon/version.rb
 homepage: https://github.com/neonichu/fastlane-plugin-appicon
 licenses:
@@ -154,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Generate required icon sizes and iconset from a master application icon.