fastlane-plugin-appicon 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4b82cd988af7cef9a984891a69708036a160597
-  data.tar.gz: 526865efa72ac309b5613317f4e6e25f020346b9
+  metadata.gz: 9c81b3d62370dcc4305dc4721b91cdd233d22ff3
+  data.tar.gz: 5f93afda98b4baaba126ecc681311920eeed78a6
 SHA512:
-  metadata.gz: d73209e211816df166ab322cea5d6e0befba6092d068ed0355d942f86ef4addb546d7b347ceb31b39477384bd228173ede8547964e42376f1724d8ea11ce5704
-  data.tar.gz: f40f6ed79dd008463cb087384f9c6e4a2b2ac9481e75cc8bf52e7eacdac4c309b044e6691219a9b95038a936435d1caa569d6bc0d4d3952187fbd80485b14dec
+  metadata.gz: 27640fe374e76f86f43395a0761637499864b9c36a50331c57056b5ea6af26151b62299a4985b29ed5e21fdfc9fab3a1da0ce886ee927a529ab258e3fc45cede
+  data.tar.gz: f39e11cb6a8169eed4475bce75a5e8c72281da5a13d312d58ff78aa2f7fbff93f50c81bf5d52667ea1b1c14ace13574199d53ce6215b6b897ea8aac4c49cfe0e

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

@@ -15,9 +15,25 @@ module Fastlane
           }
         }
       end
+      
+      def self.notification_icons(path, filename)
+        return {} if !path || !filename
+        
+        {
+          "#{path}-ldpi/#{filename}" => '36x36',
+          "#{path}-mdpi/#{filename}" => '24x24',
+          "#{path}-hdpi/#{filename}" => '36x36',
+          "#{path}-xhdpi/#{filename}" => '48x48',
+          "#{path}-xxhdpi/#{filename}" => '72x72',
+          "#{path}-xxxhdpi/#{filename}" => '96x96',
+        }
+      end
 
       def self.run(params)
         fname = params[:appicon_image_file]
+        notification_icon_path = params[:appicon_notification_icon_path]
+        notification_icon_filename = params[:appicon_notification_icon_filename]
+        custom_sizes = params[:appicon_custom_sizes]
 
         require 'mini_magick'
         image = MiniMagick::Image.open(fname)
@@ -26,15 +42,24 @@ module Fastlane
 
         # Convert image to png
         image.format 'png'
+        
+        # Merge notification icons into customer sizes as they are handled thes same way
+        custom_sizes = self.notification_icons(notification_icon_path, notification_icon_filename).merge(custom_sizes)
 
-        icons = Helper::AppiconHelper.get_needed_icons(params[:appicon_devices], self.needed_icons, true)
+        icons = Helper::AppiconHelper.get_needed_icons(params[:appicon_devices], self.needed_icons, true, custom_sizes)
         icons.each do |icon|
           width = icon['width']
           height = icon['height']
 
-          basepath = Pathname.new("#{params[:appicon_path]}-#{icon['scale']}")
+          # Custom icons will have basepath and filename already defined
+          if icon.has_key?('basepath') && icon.has_key?('filename')
+            basepath = Pathname.new(icon['basepath'])
+            filename = icon['filename']  
+          else
+            basepath = Pathname.new("#{params[:appicon_path]}-#{icon['scale']}")
+            filename = "#{params[:appicon_filename]}.png"
+          end
           FileUtils.mkdir_p(basepath)
-          filename = "#{params[:appicon_filename]}.png"
 
           image.resize "#{width}x#{height}"
           image.write basepath + filename
@@ -42,6 +67,10 @@ module Fastlane
 
         UI.success("Successfully stored launcher icons at '#{params[:appicon_path]}'")
       end
+      
+      def self.get_custom_sizes(image, custom_sizes)
+        
+      end
 
       def self.description
         "Generate required icon sizes from a master application icon"
@@ -75,7 +104,23 @@ module Fastlane
                              default_value: 'ic_launcher',
                                description: "The output filename of each image",
                                   optional: true,
-                                      type: String)
+                                      type: String),
+          FastlaneCore::ConfigItem.new(key: :appicon_notification_icon_path,
+                                  env_name: "APPICON_NOTIFICATION_ICON_PATH",
+                             default_value: 'app/res/drawable/',
+                               description: "Path to res subfolder",
+                                  optional: true,
+                                      type: String),
+          FastlaneCore::ConfigItem.new(key: :appicon_notification_icon_filename,
+                                  env_name: "APPICON_NOTIFICATION_ICON_FILENAME",
+                             default_value: 'ic_stat_onesignal_default',
+                               description: "File name for notification icons",
+                                  optional: true,
+                                      type: String),
+          FastlaneCore::ConfigItem.new(key: :appicon_custom_sizes,
+                               description: "Hash of custom sizes - {'path/icon.png' => '256x256'}",
+                                  optional: true,
+                                      type: Hash)
         ]
       end
 

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

@@ -37,6 +37,11 @@ module Fastlane
         # Convert image to png
         image.format 'png'
 
+        # remove alpha channel
+        if params[:remove_alpha]
+          image.alpha 'remove'
+        end
+
         # Create the base path
         FileUtils.mkdir_p(basepath)
 
@@ -116,7 +121,13 @@ module Fastlane
                              default_value: 'AppIcon.appiconset',
                                description: "Name of the appiconset inside the asset catalogue",
                                   optional: true,
-                                      type: String)
+                                      type: String),
+          FastlaneCore::ConfigItem.new(key: :remove_alpha,
+                                  env_name: "REMOVE_ALPHA",
+                             default_value: false,
+                               description: "Remove the alpha channel from generated PNG",
+                                  optional: true,
+                                      type: Boolean)
         ]
       end
 

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

@@ -7,7 +7,7 @@ module Fastlane
         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)
+      def self.get_needed_icons(devices, needed_icons, is_android = false, custom_sizes = {})
         icons = []
         devices.each do |device|
           needed_icons[device].each do |scale, sizes|
@@ -35,6 +35,21 @@ module Fastlane
             end
           end
         end
+        
+        # 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 }
+
+          icons << {
+            'width' => width,
+            'height' => height,
+            'size' => size,
+            'basepath' => File.dirname(path),
+            '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.10.0"
+    VERSION = "0.11.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-appicon
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Boris Bügling
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-25 00:00:00.000000000 Z
+date: 2018-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_magick
@@ -155,9 +155,8 @@ 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.
 test_files: []
-has_rdoc: