frameit 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a09eef67fb1b74cdf9233221b02a0bef2c90cdb7
-  data.tar.gz: 254360304c3cae8929e7a06c142223de91fb9008
+  metadata.gz: 188b8ea20cad11a2393517fb8bba0ec2c829405d
+  data.tar.gz: 473304b521bb4260e1a0cd5eb4e37ce8d0e4b708
 SHA512:
-  metadata.gz: edf0fda390e74e7a6f2ebf31b4400e0ccd1c952b61bcc76968084dc9d4fa5d12cdcdb9f766e64595dfae804ba6799decd1af72cf5825a28f1492637a70be3b38
-  data.tar.gz: a9922bb2cb107ce9157b1d2be1bb7a95c5fa55205a91c5e768549382b86ee2f37accd817d74b82a978cf8f8b7cfeaacca791612e35b2f0429c14e2c378210985
+  metadata.gz: cafe220cb4a05c28778b37ec80cc1b3ec15eef12c338c6d428cf03a5678ab26b434b732799735ac3d90fd9b3ba04cf7c5c0e22f8b1be3c6714af2222b68cc6a7
+  data.tar.gz: 7dd45bc48124868b0057c55c6719307c20a6dbfc46120c151fbf0dfa97916dd3716e7b913f748cd3b6f10e3d2e36efc6081d1896fd729d5bedcb7323fbb755fa

data/README.md

@@ -13,7 +13,11 @@
   <a href="https://github.com/KrauseFx/sigh">sigh</a> &bull; 
   <a href="https://github.com/KrauseFx/produce">produce</a> &bull;
   <a href="https://github.com/KrauseFx/cert">cert</a> &bull;
-  <a href="https://github.com/KrauseFx/codes">codes</a> 
+  <a href="https://github.com/KrauseFx/codes">codes</a> &bull;
+  <a href="https://github.com/fastlane/spaceship">spaceship</a> &bull;
+  <a href="https://github.com/fastlane/pilot">pilot</a> &bull;
+  <a href="https://github.com/fastlane/boarding">boarding</a> &bull;
+  <a href="https://github.com/fastlane/gym">gym</a>
 </p>
 -------
 
@@ -170,6 +174,8 @@ Use it to define the general information:
 
 The `filter` value is a part of the screenshot named for which the given option should be used. If a screenshot is named `iPhone5_Brainstorming.png` the first entry in the `data` array will be used.
 
+You can find a more complex [configuration](https://github.com/fastlane/examples/blob/master/MindNode/screenshots/Framefile.json) to also support Chinese, Japanese and Korean languages.
+
 The `Framefile.json` should be in the `screenshots` folder, as seen in the [example](https://github.com/fastlane/examples/tree/master/MindNode/screenshots).
 
 #### `.strings` files
@@ -214,20 +220,24 @@ With `frameit` 2.0 is possible to also frame Mac OS X Applications. You have to
 }
 ```
 
-Check out the [MindNode example project](https://github.com/fastlane/examples/tree/master/MindNode/screenshots)
+Check out the [MindNode example project](https://github.com/fastlane/examples/tree/master/MindNode/screenshots).
 
 # Tips
 
 ## [`fastlane`](https://fastlane.tools) Toolchain
 
 - [`fastlane`](https://fastlane.tools): Connect all deployment tools into one streamlined workflow
-- [`deliver`](https://github.com/KrauseFx/deliver): Upload screenshots, metadata and your app to the App Store using a single command
+- [`deliver`](https://github.com/KrauseFx/deliver): Upload screenshots, metadata and your app to the App Store
 - [`snapshot`](https://github.com/KrauseFx/snapshot): Automate taking localized screenshots of your iOS app on every device
 - [`PEM`](https://github.com/KrauseFx/pem): Automatically generate and renew your push notification profiles
 - [`sigh`](https://github.com/KrauseFx/sigh): Because you would rather spend your time building stuff than fighting provisioning
 - [`produce`](https://github.com/KrauseFx/produce): Create new iOS apps on iTunes Connect and Dev Portal using the command line
 - [`cert`](https://github.com/KrauseFx/cert): Automatically create and maintain iOS code signing certificates
 - [`codes`](https://github.com/KrauseFx/codes): Create promo codes for iOS Apps using the command line
+- [`spaceship`](https://github.com/fastlane/spaceship): Ruby library to access the Apple Dev Center and iTunes Connect
+- [`pilot`](https://github.com/fastlane/pilot): The best way to manage your TestFlight testers and builds from your terminal
+- [`boarding`](https://github.com/fastlane/boarding): The easiest way to invite your TestFlight beta testers 
+- [`gym`](https://github.com/fastlane/gym): Building your iOS apps has never been easier
 
 ##### [Like this tool? Be the first to know about updates and new fastlane tools](https://tinyletter.com/krausefx)
 
@@ -246,17 +256,9 @@ You can use [SimulatorStatusMagic](https://github.com/shinydevelopment/Simulator
 - ```rm -rf ~/.frameit```
 
 # Need help?
-- If there is a technical problem with ```frameit```, submit an issue.
-- I'm available for contract work - drop me an email: frameit@krausefx.com
+Please submit an issue on GitHub and provide information about your setup
 
 # License
 This project is licensed under the terms of the MIT license. See the LICENSE file.
 
-# Contributing
-
-1. Create an issue to discuss about your idea
-2. Fork it (https://github.com/KrauseFx/frameit/fork)
-3. Create your feature branch (`git checkout -b my-new-feature`)
-4. Commit your changes (`git commit -am 'Add some feature'`)
-5. Push to the branch (`git push origin my-new-feature`)
-6. Create a new Pull Request
+> This project and all fastlane tools are in no way affiliated with Apple Inc. This project is open source under the MIT license, which means you have full access to the source code and can modify it to fit your own needs. All fastlane tools run on your own computer or server, so your credentials or other sensitive information will never leave your own computer. You are responsible for how you use fastlane tools.

data/lib/frameit/editor.rb

@@ -126,7 +126,12 @@ module Frameit
         left_space = (background.width / 2.0 - image.width / 2.0).round
         bottom_space = -(image.height / 10).round # to be just a bit below the image bottom
         bottom_space -= 40 if screenshot.is_portrait? # even more for portrait mode
-        bottom_space -= 50 if (screenshot.is_mini? and screenshot.is_portrait?) # super old devices
+
+        if screenshot.is_mini?
+          # Such small devices need special treatment
+          bottom_space -= 50 if screenshot.is_portrait?
+          bottom_space += 65 unless screenshot.is_portrait?
+        end
 
         self.top_space_above_device = background.height - image.height - bottom_space
 
@@ -152,18 +157,39 @@ module Frameit
         keyword = title_images[:keyword]
         title = title_images[:title]
 
-        sum_width = (keyword.width rescue 0) + title.width + keyword_padding
-        top_space = (top_space_above_device / 2.0 - actual_font_size / 2.0).round # centered
-        
+        # sum_width: the width of both labels together including the space inbetween
+        #   is used to calculate the ratio
+        sum_width = title.width
+        sum_width += keyword.width + keyword_padding if keyword
+
+        # Resize the 2 labels if necessary
+        smaller = 1.0 # default
+        ratio = (sum_width + keyword_padding * 2) / image.width.to_f
+        if ratio > 1.0
+          # too large - resizing now
+          smaller = (1.0 / ratio)
+
+          Helper.log.debug "Text for image #{self.screenshot.path} is quite long, reducing font size by #{(ratio - 1.0).round(2)}" if $verbose
+
+          title.resize"#{(smaller * title.width).round}x"
+          keyword.resize"#{(smaller * keyword.width).round}x" if keyword
+          sum_width *= smaller
+        end
+
+        top_space = (top_space_above_device / 2.0 - (actual_font_size / 2.0 * smaller)).round # centered
         left_space = (image.width / 2.0 - sum_width / 2.0).round
+
+        # First, put the keyword on top of the screenshot, if we have one
         if keyword
           @image = image.composite(keyword, "png") do |c|
             c.compose "Over"
             c.geometry "+#{left_space}+#{top_space}"
           end
-        end
 
-        left_space += (keyword.width rescue 0) + keyword_padding
+          left_space += keyword.width + (keyword_padding * smaller)
+        end
+        
+        # Then, put the title on top of the screenshot next to the keyword
         @image = image.composite(title, "png") do |c|
           c.compose "Over"
           c.geometry "+#{left_space}+#{top_space}"
@@ -175,6 +201,7 @@ module Frameit
         [top_space_above_device / 3.0, @image.width / 30.0].max.round
       end
 
+      # The space between the keyword and the title
       def keyword_padding
         (actual_font_size / 2.0).round
       end
@@ -189,11 +216,14 @@ module Frameit
           title_image = MiniMagick::Image.open(empty_path)
           image_height = actual_font_size * 2 # gets trimmed afterwards anyway, and on the iPad the `y` would get cut
           title_image.combine_options do |i|
-            i.resize "#{max_width}x#{image_height}!" # `!` says it should ignore the ratio
+            # * 2.0 as the text might be larger than the actual image. We're trimming afterwards anyway
+            i.resize "#{max_width * 2.0}x#{image_height}!" # `!` says it should ignore the ratio
           end
 
           current_font = font(key)
+          text = fetch_text(key)
           Helper.log.debug "Using #{current_font} as font the #{key} of #{screenshot.path}" if $verbose and current_font
+          Helper.log.debug "Adding text '#{fetch_text(key)}'"if $verbose
 
           # Add the actual title
           title_image.combine_options do |i|
@@ -268,8 +298,8 @@ module Frameit
           end
         end
 
-        Helper.log.debug "No custom font specified, using the default one" if $verbose
+        Helper.log.debug "No custom font specified for #{screenshot}, using the default one" if $verbose
         return nil
       end
   end
-end
+end

data/lib/frameit/offsets.rb

@@ -9,13 +9,13 @@ module Frameit
           case screenshot.screen_size
             when size::IOS_55
               return { 
-                'offset' => '+42+147',
-                'width' => 539
+                'offset' => '+41+146',
+                'width' => 541
               }
             when size::IOS_47
               return {
-                'offset' => '+41+154',
-                'width' => 530
+                'offset' => '+40+153',
+                'width' => 532
               }
             when size::IOS_40
               return {
@@ -64,4 +64,4 @@ module Frameit
       end
     end
   end
-end
+end

data/lib/frameit/version.rb

@@ -1,3 +1,3 @@
 module Frameit
-  VERSION = "2.1.0"
+  VERSION = "2.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: frameit
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-07 00:00:00.000000000 Z
+date: 2015-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastlane_core