fastlane-plugin-appicon 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c81b3d62370dcc4305dc4721b91cdd233d22ff3
-  data.tar.gz: 5f93afda98b4baaba126ecc681311920eeed78a6
+  metadata.gz: 638ee204f30b9aa9cea411e2ef03ff371a7b642a
+  data.tar.gz: 8d5313d9a5d87b2ae4f27231d35337758eb4be53
 SHA512:
-  metadata.gz: 27640fe374e76f86f43395a0761637499864b9c36a50331c57056b5ea6af26151b62299a4985b29ed5e21fdfc9fab3a1da0ce886ee927a529ab258e3fc45cede
-  data.tar.gz: f39e11cb6a8169eed4475bce75a5e8c72281da5a13d312d58ff78aa2f7fbff93f50c81bf5d52667ea1b1c14ace13574199d53ce6215b6b897ea8aac4c49cfe0e
+  metadata.gz: f0058b646b2e9ec09692bba049690f81da92656dd4e7f9bdf8d3381877ed1fd1e280fba4b62035e7e412f032f9511a33ba10b3173205f5ec23583c9c802e500b
+  data.tar.gz: df1cfd5369ebd1c956e0ca6357192c29e02babe323c37c8e82385160b65da9c0a44d532be5c7c784278af2f8636fae093439d9f92be4eb992ec2208779bf1b66

data/README.md

@@ -49,8 +49,14 @@ end
 lane :android do
   android_appicon(
     appicon_image_file: 'spec/fixtures/Themoji.png',
-    appicon_devices: [:phone, :tablet],
-    appicon_path:'app/res/mipmap'
+    appicon_icon_types: [:launcher],
+    appicon_path: 'app/res/mipmap'
+  )
+  android_appicon(
+    appicon_image_file: 'spec/fixtures/ThemojiNotification.png',
+    appicon_icon_types: [:notification],
+    appicon_path: 'app/res/drawable',
+    appicon_name: 'ic_notification'
   )
 end
 ```

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

@@ -3,36 +3,27 @@ module Fastlane
     class AndroidAppiconAction < Action
       def self.needed_icons
         {
-          phone: {
-            'ldpi' => ['36x36'],
-            'mdpi' => ['48x48'],
-            'hdpi' => ['72x72'],
-            'xhdpi' => ['96x96']
+          launcher: {
+            :ldpi => ['36x36'],
+            :mdpi => ['48x48'],
+            :hdpi => ['72x72'],
+            :xhdpi => ['96x96'],
+            :xxhdpi => ['144x144'],
+            :xxxhdpi => ['192x192']
           },
-          tablet: {
-            'xxhdpi' => ['144x144'],
-            'xxxhdpi' => ['192x192']
+          notification: {
+            :ldpi => ['18x18'],
+            :mdpi => ['24x24'],
+            :hdpi => ['36x36'],
+            :xhdpi => ['48x48'],
+            :xxhdpi => ['72x72'],
+            :xxxhdpi => ['96x96'],
           }
         }
       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'
@@ -42,11 +33,8 @@ 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, custom_sizes)
+        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']
@@ -54,7 +42,7 @@ module Fastlane
           # 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']  
+            filename = icon['filename']
           else
             basepath = Pathname.new("#{params[:appicon_path]}-#{icon['scale']}")
             filename = "#{params[:appicon_filename]}.png"
@@ -67,9 +55,9 @@ 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
@@ -87,15 +75,15 @@ module Fastlane
                                description: "Path to a square image file, at least 512x512",
                                   optional: false,
                                       type: String),
-          FastlaneCore::ConfigItem.new(key: :appicon_devices,
-                                  env_name: "APPICON_DEVICES",
-                             default_value: [:phone],
+          FastlaneCore::ConfigItem.new(key: :appicon_icon_types,
+                                  env_name: "APPICON_ICON_TYPES",
+                             default_value: [:launcher],
                                description: "Array of device types to generate icons for",
                                   optional: true,
                                       type: Array),
           FastlaneCore::ConfigItem.new(key: :appicon_path,
                                   env_name: "APPICON_PATH",
-                             default_value: 'app/res/mipmap/',
+                             default_value: 'app/res/mipmap',
                                description: "Path to res subfolder",
                                   optional: true,
                                       type: String),
@@ -105,20 +93,9 @@ module Fastlane
                                description: "The output filename of each image",
                                   optional: true,
                                       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'}",
+                             default_value: {},
                                   optional: true,
                                       type: Hash)
         ]

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

@@ -1,5 +1,5 @@
 module Fastlane
   module Appicon
-    VERSION = "0.11.0"
+    VERSION = "0.12.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-appicon
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Boris Bügling
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-11 00:00:00.000000000 Z
+date: 2018-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_magick
@@ -155,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Generate required icon sizes and iconset from a master application icon.