fastlane-plugin-appicon 0.14.1 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f3e344da3ac6e6bee3989cdb79a812717570f5f58e91f8c485d34bc5d412c29
-  data.tar.gz: 2a9e60748923ed1f5619006871d76ff9db7ec84ea4920d60ac9530152c77c369
+  metadata.gz: bced1c1899f354fefda0cd562c1adfc9ed9dcda60a699ab89e669af56d76dfc7
+  data.tar.gz: cb9889f63c757b3c81334c32ee29e4c6cb7567a5ee762005488deb6a4abe84cd
 SHA512:
-  metadata.gz: 929c44099ac6c9ae1f2ef337534398ff34da87883395f44c2e3618546c5ae7c8dbc81ecf94c487f514e975d60cd5f3fbb6ccaac20b30999eb125f26fd98aa57e
-  data.tar.gz: d86d08c2cec8435becc791ed25f396a953dfab8dc08c1ecba6eb33a3a1d3757f1fe8a01910572c025d31f317d1b1dddedf27a1f5e4d875d5e3b6355c04fdb2fe
+  metadata.gz: 7d5440ea9762219b3b382515bd463dacbc83e14be779a1d01b962906cba942302d2dfed6de6d240052ab53f7da194fe19a0f5042b9ba021dda2e9f9ea70baed9
+  data.tar.gz: 8c9be79cb72d748708cdda5c60b3341c2043053a9221665763d2fea5663274e3f88b365262ae51bfd66af62ec415d47769069b90f29b9a59d3ac7ca8f319557e

data/README.md

@@ -54,11 +54,20 @@ end
 lane :test3 do
   # `appicon_image_file` defaults to "fastlane/metadata/app_icon.png"
   appicon(
-    appicon_devices: [:iphone], 
+    appicon_devices: [:iphone],
     appicon_path: 'wwdcfamily/Images.xcassets' # output path
   )
 end
 
+lane :splash_screen do
+  appicon(
+    appicon_image_file: 'spec/fixtures/splash_screen.png',
+    appicon_devices: [:universal],
+    appicon_path: "ios/App/App/Assets.xcassets",
+    appicon_name: 'Splash.imageset'
+  )
+end
+
 # or
 
 lane :android do
@@ -71,7 +80,14 @@ lane :android do
     appicon_image_file: 'spec/fixtures/ThemojiNotification.png',
     appicon_icon_types: [:notification],
     appicon_path: 'app/res/drawable',
-    appicon_filename: 'ic_notification'
+    appicon_filename: 'ic_notification',
+    generate_rounded: true
+  )
+  android_appicon(
+    appicon_image_file: 'spec/fixtures/splash_base_image.png',
+    appicon_icon_types: [:splash_port, :splash_land],
+    appicon_path: 'app/res/drawable',
+    appicon_filename: 'splash'
   )
 end
 ```

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

@@ -1,6 +1,9 @@
+require 'mini_magick'
+
 module Fastlane
   module Actions
     class AndroidAppiconAction < Action
+
       def self.needed_icons
         {
           launcher: {
@@ -18,6 +21,22 @@ module Fastlane
             :xhdpi => ['48x48'],
             :xxhdpi => ['72x72'],
             :xxxhdpi => ['96x96'],
+          },
+          splash_land: {
+            'land-ldpi' => ['320x200'],
+            'land-mdpi' => ['480x320'],
+            'land-hdpi' => ['800x480'],
+            'land-xhdpi' => ['1280x720'],
+            'land-xxhdpi' => ['1600x960'],
+            'land-xxxhdpi' => ['1920x1280']
+          },
+          splash_port: {
+            'port-ldpi' => ['200x320'],
+            'port-mdpi' => ['320x480'],
+            'port-hdpi' => ['480x800'],
+            'port-xhdpi' => ['720x1280'],
+            'port-xxhdpi' => ['960x1600'],
+            'port-xxxhdpi' => ['1280x1920']
           }
         }
       end
@@ -26,18 +45,11 @@ module Fastlane
         fname = params[:appicon_image_file]
         custom_sizes = params[:appicon_custom_sizes]
 
-        require 'mini_magick'
-        image = MiniMagick::Image.open(fname)
-
-        Helper::AppiconHelper.check_input_image_size(image, 512)
-
-        # Convert image to png
-        image.format 'png'
-
         icons = Helper::AppiconHelper.get_needed_icons(params[:appicon_icon_types], self.needed_icons, true, custom_sizes)
         icons.each do |icon|
-          width = icon['width']
-          height = icon['height']
+          image = MiniMagick::Image.open(fname)
+
+          Helper::AppiconHelper.check_input_image_size(image, 1024)
 
           # Custom icons will have basepath and filename already defined
           if icon.has_key?('basepath') && icon.has_key?('filename')
@@ -47,15 +59,71 @@ module Fastlane
             basepath = Pathname.new("#{params[:appicon_path]}-#{icon['scale']}")
             filename = "#{params[:appicon_filename]}.png"
           end
-          FileUtils.mkdir_p(basepath)
 
-          image.resize "#{width}x#{height}"
+          width_height = [icon['width'], icon['height']].map(&:to_i)
+          width, height = width_height
+          max = width_height.max
+
+          image.format 'png'
+          image.resize "#{max}x#{max}"
+
+          unless width == height
+            offset =
+            if width > height
+              "+0+#{(width - height) / 2}"
+            elsif height > width
+              "+#{(height - width) / 2}+0"
+            end
+
+            image.crop "#{icon['size']}#{offset}"
+          end
+
+          FileUtils.mkdir_p(basepath)
           image.write basepath + filename
+
+          if basepath.to_s.match("port-")
+            default_portrait_path = basepath.to_s.gsub("port-","")
+            FileUtils.mkdir_p(default_portrait_path)
+            image.write default_portrait_path + '/' + filename
+          end
+
+          if params[:generate_rounded]
+            rounded_image = MiniMagick::Image.open(fname)
+            rounded_image.format 'png'
+            rounded_image.resize "#{width}x#{height}"
+            rounded_image = round(rounded_image)
+            rounded_image.write basepath + filename.gsub('.png', '_round.png')
+          end
         end
 
         UI.success("Successfully stored launcher icons at '#{params[:appicon_path]}'")
       end
 
+      def self.round(img)
+        require 'mini_magick'
+        img.format 'png'
+
+        width = img[:width]-2
+        radius = width/2
+
+        mask = ::MiniMagick::Image.open img.path
+        mask.format 'png'
+
+        mask.combine_options do |m|
+          m.alpha 'transparent'
+          m.background 'none'
+          m.fill 'white'
+          m.draw 'roundrectangle 1,1,%s,%s,%s,%s' % [width, width, radius, radius]
+        end
+
+        masked = img.composite(mask, 'png') do |i|
+          i.alpha "set"
+          i.compose 'DstIn'
+        end
+
+        return masked
+      end
+
       def self.get_custom_sizes(image, custom_sizes)
 
       end
@@ -97,7 +165,11 @@ module Fastlane
                                description: "Hash of custom sizes - {'path/icon.png' => '256x256'}",
                              default_value: {},
                                   optional: true,
-                                      type: Hash)
+                                      type: Hash),
+          FastlaneCore::ConfigItem.new(key: :generate_rounded,
+                               description: "Generate round icons?",
+                             default_value: false,
+                                      type: Boolean)
         ]
       end
 

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

@@ -1,8 +1,16 @@
+require 'json'
+require 'mini_magick'
+
 module Fastlane
   module Actions
     class AppiconAction < Action
       def self.needed_icons
         {
+          universal: {
+            '1x' => ['2732x2732'],
+            '2x' => ['2732x2732'],
+            '3x' => ['2732x2732']
+          },
           iphone: {
             '2x' => ['20x20', '29x29', '40x40', '60x60'],
             '3x' => ['20x20', '29x29', '40x40', '60x60']
@@ -39,7 +47,6 @@ module Fastlane
         basename = File.basename(fname, File.extname(fname))
         basepath = Pathname.new(File.join(params[:appicon_path], params[:appicon_name]))
 
-        require 'mini_magick'
         image = MiniMagick::Image.open(fname)
 
         Helper::AppiconHelper.check_input_image_size(image, 1024)
@@ -52,7 +59,8 @@ module Fastlane
           image.alpha 'remove'
         end
 
-        # Create the base path
+        # Recreate the base path
+        FileUtils.rm_rf(basepath)
         FileUtils.mkdir_p(basepath)
 
         images = []
@@ -61,7 +69,11 @@ module Fastlane
         icons.each do |icon|
           width = icon['width']
           height = icon['height']
-          filename = "#{basename}-#{width.to_i}x#{height.to_i}.png"
+          filename = basename
+          unless icon['device'] == 'universal'
+            filename += "-#{width.to_i}x#{height.to_i}"
+          end
+          filename += ".png"
 
           # downsize icon
           image.resize "#{width}x#{height}"
@@ -73,12 +85,15 @@ module Fastlane
           image.write basepath + filename
 
           info = {
-            'size' => icon['size'],
             'idiom' => icon['device'],
             'filename' => filename,
             'scale' => icon['scale']
           }
 
+          unless icon['device'] == 'universal'
+            info['size'] = icon['size']
+          end
+
           info['role'] = icon['role'] unless icon['role'].nil?
           info['subtype'] = icon['subtype'] unless icon['subtype'].nil?
 
@@ -93,7 +108,6 @@ module Fastlane
           }
         }
 
-        require 'json'
         File.write(File.join(basepath, 'Contents.json'), JSON.pretty_generate(contents))
         UI.success("Successfully stored app icon at '#{basepath}'")
       end

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

@@ -19,7 +19,8 @@ module Fastlane
               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 }
+                multiple = device.match(/universal/) ? 1 : scale.to_i
+                width, height = size.split('x').map { |v| v.to_f * multiple }
               end
 
               icons << {
@@ -31,12 +32,12 @@ module Fastlane
                 'role' => role,
                 'subtype' => subtype
               }
-              
+
             end
           end
         end
-        
-        # Add custom icon sizes (probably for notifications) 
+
+        # Add custom icon sizes (probably for notifications)
         custom_sizes.each do |path, size|
           path = path.to_s
           width, height = size.split('x').map { |v| v.to_f }
@@ -49,7 +50,7 @@ module Fastlane
             'filename' => File.basename(path)
           }
         end
-        
+
         # Sort from the largest to the smallest needed icon
         icons = icons.sort_by {|value| value['width']} .reverse
       end

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

@@ -1,5 +1,5 @@
 module Fastlane
   module Appicon
-    VERSION = "0.14.1"
+    VERSION = "0.15.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-appicon
 version: !ruby/object:Gem::Version
-  version: 0.14.1
+  version: 0.15.0
 platform: ruby
 authors:
 - Boris Bügling
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-22 00:00:00.000000000 Z
+date: 2020-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_magick
@@ -142,7 +142,7 @@ files:
 - 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/KrauseFx/fastlane-plugin-appicon
+homepage: https://github.com/fastlane-community/fastlane-plugin-appicon
 licenses:
 - MIT
 metadata: {}
@@ -161,7 +161,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Generate required icon sizes and iconset from a master application icon.