high_five 0.3.15 → 0.3.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce120807357b8c42d5ceea9c97a63113ba738bab
-  data.tar.gz: 809fe86d85b8da73e3a169a58eca923b438d2d54
+  metadata.gz: 616b4f628f3d4af0087fee42e660347c3a0c7225
+  data.tar.gz: 9ecf7fe5a40e59c1fa767e56b33143b6a8b7d503
 SHA512:
-  metadata.gz: 35d774449fd23bb9427965a7642192e50c9868fed24b9351fbc55c0ef0600c83f96538654766f025b48c269ed97d2a89124a2a41633e0885ecc87d7a91a4ed0d
-  data.tar.gz: 5ff881e17bdf6010174fc0d4f0b937b86537980109ce11abbb9f49db3a6439c880e8b9fb71e53c88aa79aaedf6b54f3f2b958d4f012f7bd2d423b76eddfc101e
+  metadata.gz: 106943f47660d4da515f516d06b5982b542b1c60ad3337e4e99f97045b00dd5615c0e0af813cb8a307c3e53e2f4fd4ccaf0ed78dd0803911af34a7cdc1f5b595
+  data.tar.gz: f24ca6f27af4760e43592b7c1781fef4fa9fed98f554d687f8162bc44224b6ea81e568638ac3d121e2031e7e984c288c80046b4e204819f88cfffe6f51b1d376

data/lib/high_five/android_helper.rb

@@ -34,6 +34,14 @@ module HighFive
       end
     end
 
+    def gradle_file_path
+      if options[:platform_path]
+        gradle_path = Dir[File.join(options[:platform_path], "/app/build.gradle")][0]
+        return gradle_path if gradle_path && File.exists?(gradle_path)
+      end
+      return nil
+    end
+
     def res_map
       {
         ldpi: 36,

data/lib/high_five/image_helper.rb

@@ -13,7 +13,82 @@ module HighFive
         source = ChunkyPNG::Image.from_file(source_path)
         source.resize(image.height, image.width).save(image_path)
       end
+    end
+
+    def generate_splash_screen_image(image_path, logo_path, background)
+      raise "Requires RMagick gem" unless rmagick?
+      image = ChunkyPNG::Image.from_file(image_path)
+      width = image.width
+      height = image.height
+      source = Magick::Image.new(width, height) { self.background_color = background }
 
+      logo = Magick::Image.read(logo_path).first
+      scale_factor = min_scale_factor(logo, 0.75*width, 0.3*height)
+
+      logo.scale!(scale_factor)
+      source.composite!(logo, Magick::CenterGravity, Magick::AtopCompositeOp)
+
+      source.write(image_path)
+    end
+
+    def generate_ios_splash_screen_image(type, ios_path, path, color)
+      raise "Requires RMagick gem" unless rmagick?
+      case type
+      when 'iphone_portrait_8_retina_hd_5_5'
+        width = 1242
+        height = 2208
+      when 'iphone_portrait_8_retina_hd_4_7'
+        width = 750
+        height = 1334
+      when 'iphone_landscape_8_retina_hd_5_5'
+        width = 2208
+        height = 1242
+      when 'iphone_portrait_1x'
+        width = 320
+        height = 480
+      when 'iphone_portrait_2x', 'android'
+        width = 640
+        height = 960
+      when 'iphone_portrait_retina_4'
+        width = 640
+        height = 1136
+      when 'ios-7-iphone_portrait_2x'
+        width = 640
+        height = 960
+      when 'ios-7-iphone_portrait_retina_4'
+        width = 640
+        height = 1136
+      when 'ipad_portrait_1x'
+        width = 768
+        height = 1024
+      when 'ipad_portrait_2x'
+        width = 1536
+        height = 2048
+      when 'ipad_landscape_1x'
+        width = 1024
+        height = 768
+      when 'ipad_landscape_2x'
+        width = 2048
+        height = 1536
+      when 'ipad_portrait_without_status_bar_5_6_1x'
+        width = 768
+        height = 1004
+      when 'ipad_portrait_without_status_bar_5_6_2x'
+        width = 1536
+        height = 2008
+      when 'ipad_landscape_without_status_bar_5_6_1x'
+        width = 1024
+        height = 748
+      when 'ipad_landscape_without_status_bar_5_6_2x'
+        width = 2048
+        height = 1496
+      end
+
+      filename = "#{type}.png"
+      splash_path = Dir.glob("#{ios_path}/**/Images.xcassets/LaunchImage.launchimage").first + "/#{filename}"
+      puts "Creating #{splash_path}"
+      Magick::Image.new(width, height).write(splash_path)
+      generate_splash_screen_image splash_path, path, color
     end
 
     private
@@ -28,5 +103,13 @@ module HighFive
         false
       end
     end
+
+    def min_scale_factor(image, max_width, max_height)
+      width_scale_factor = max_width / image.columns
+      height_scale_factor = max_height / image.rows
+      sf = [width_scale_factor, height_scale_factor].min
+      puts "Warning: upscaling image for splash screen" if sf > 1.0
+      sf
+    end
   end
 end

data/lib/high_five/thor/tasks/android.rb

@@ -33,6 +33,9 @@ module HighFive
           xml = Nokogiri::XML(file)
 
           # replace \n and any additional whitespace with a space
+          puts "========================================="
+          puts "#{android_manifest_path}"
+          puts "========================================="
           xml.xpath("//manifest").each do |node|
             if (options[:version])
               old = node["android:versionName"]
@@ -46,15 +49,32 @@ module HighFive
             end
           end
 
+          if gradle_file_path
+            puts "========================================="
+            puts "#{gradle_file_path}"
+            puts "========================================="
+            gradle_file = File.read(gradle_file_path)
+
+            old = gradle_file.match(/versionName\s"(.+)"$/)[1]
+            gradle_file.gsub!(/versionName\s"(.+)"$/, "versionName \"#{options[:version]}\"")
+            puts "Setting version #{old} => #{options[:version]}"
+
+            old = gradle_file.match(/versionCode\s(\d+)$/)[1]
+            gradle_file.gsub!(/versionCode\s\d+$/, "versionCode #{options[:build_number]}")
+            puts "Setting versionCode #{old} => #{options[:build_number]}"
+
+            File.open(gradle_file_path, "w") do |f|
+              f.write gradle_file
+            end
+          end
+
           # save the output into a new file
           File.open(android_manifest_path, "w") do |f|
             f.write xml.to_xml
           end
         end
 
-        desc "set_icon", "Generate app icons from base png image"
-        method_option :platform_path, desc: "Path to the ios or android directory"
-        method_option :environment, :aliases => '-e', :desc => "Set environment"
+        desc "set_icon", "Generate and replace app icons from base png image"
         def set_icon(path)
           image = ChunkyPNG::Image.from_file(path)
 
@@ -77,6 +97,23 @@ module HighFive
           end
         end
 
+        desc "generate_splash_screen", "Generate and replace splash screens from logo and background color"
+        method_option :color, desc: "Background color"
+        def generate_splash_screen(path)
+          image = ChunkyPNG::Image.from_file(path)
+
+          splash_name = 'screen.png'
+
+          drawable_dir = File.join File.dirname(android_manifest_path), 'res'
+          Dir.glob(File.join drawable_dir, "drawable*").each do |dir|
+            splash_path = File.join(dir, splash_name)
+            if File.exists?(splash_path)
+              generate_splash_screen_image splash_path, path, options[:color] || "#ffffff"
+              puts "Writing #{splash_path}"
+            end
+          end
+        end
+
         private
         def config
           base_config.build_platform_config(:android).build_platform_config(options[:environment])

data/lib/high_five/thor/tasks/ios.rb

@@ -45,9 +45,16 @@ module HighFive
         method_option :target, :aliases => '-t', :desc => "Use a specific target (i.e. <Target>.plist)"
         method_option :platform_path, :desc => "Path to ios or android directory"
         def set_icon(path)
-          icon_files = plist['CFBundleIcons']["CFBundlePrimaryIcon"]["CFBundleIconFiles"]
-          icon_files += [ plist['CFBundleIconFile'] ]
-          icon_files += plist['CFBundleIcons~ipad']["CFBundlePrimaryIcon"]["CFBundleIconFiles"]
+          begin
+            icon_files = plist['CFBundleIcons']["CFBundlePrimaryIcon"]["CFBundleIconFiles"]
+            icon_files += [ plist['CFBundleIconFile'] ]
+            icon_files += plist['CFBundleIcons~ipad']["CFBundlePrimaryIcon"]["CFBundleIconFiles"]
+          rescue
+            icon_files = []
+          end
+          if icon_files.empty?
+            icon_files = Dir.glob("#{ios_path}/**/Images.xcassets/AppIcon.appiconset/*.png")
+          end
           icon_files.each do |icon_entry|
             icon_file_name = icon_entry
             unless icon_entry.end_with? ".png"
@@ -58,6 +65,7 @@ module HighFive
             # This helps with multi-target apps
             old_icon_path = Dir[File.join(ios_path, "#{target}/**/#{icon_file_name}")].first
             old_icon_path = Dir[File.join(ios_path, "**/#{icon_file_name}")].first if old_icon_path.nil?
+            old_icon_path = Dir[File.join(icon_entry)].first if old_icon_path.nil?
 
             if old_icon_path.nil?
               puts "Skipping #{icon_entry} because the file is missing.  This will cause problems with app store submission"
@@ -70,6 +78,37 @@ module HighFive
           end
         end
 
+        desc "generate_splash_screen", "Generate and replace splash screens from logo and background color"
+        method_option :color, desc: "Background color"
+        def generate_splash_screen(path)
+          image = ChunkyPNG::Image.from_file(path)
+
+          splashes_to_make = [
+            'iphone_portrait_8_retina_hd_5_5',
+            'iphone_portrait_8_retina_hd_4_7',
+            'iphone_landscape_8_retina_hd_5_5',
+            'iphone_portrait_1x',
+            'iphone_portrait_2x',
+            'iphone_portrait_retina_4',
+            'ios-7-iphone_portrait_2x',
+            'ios-7-iphone_portrait_retina_4',
+            'ipad_portrait_1x',
+            'ipad_portrait_2x',
+            'ipad_landscape_1x',
+            'ipad_landscape_2x',
+            'ipad_portrait_without_status_bar_5_6_1x',
+            'ipad_portrait_without_status_bar_5_6_2x',
+            'ipad_landscape_without_status_bar_5_6_1x',
+            'ipad_landscape_without_status_bar_5_6_2x'
+          ]
+
+          splashes_to_make.each do |type|
+            generate_ios_splash_screen_image(type, ios_path, path, options[:color] || "#ffffff")
+          end
+
+          puts "Make sure you assign them in xcode if this is the first time you generated these"
+        end
+
         private
 
         def set_plist_property(key, value)
@@ -98,4 +137,4 @@ module HighFive
       end
     end
   end
-end
+end

data/lib/high_five/version.rb

@@ -1,3 +1,3 @@
 module HighFive
-  VERSION = "0.3.15"
+  VERSION = "0.3.16"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: high_five
 version: !ruby/object:Gem::Version
-  version: 0.3.15
+  version: 0.3.16
 platform: ruby
 authors:
 - Brian Samson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-30 00:00:00.000000000 Z
+date: 2016-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json