frameit 2.5.0 → 2.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 34bc47b3efb69420fd5270e798ba713a9b948af4
-  data.tar.gz: 8158ee167427955839b53705c4787102cd104547
+  metadata.gz: 0386691d3d975aaa1470d94950208b4f086d776b
+  data.tar.gz: a7ae4164557057c19324728f3a0ba5883e81cdac
 SHA512:
-  metadata.gz: d0279c2c77228a3e5bae1bbe84c05338864efca6eb13e63c29eae7b50c0f6d7d20b1b873045c7b9ea557fe0fea2451803aba2873b893eed0bad37f8366044498
-  data.tar.gz: 9bfde1c00507c0521a440a464d23b9d4d73bebc36525829f65b48edba521ddff4e46f039d4ba8ae6ce1e45d0a62e05c9a20af93fb534d9e8428a638a299a52f8
+  metadata.gz: 9f2afb9854ac5040fb8fec9ade1a5e073d8e002a02be5aa715638a5f2ad4f69e375cad43b77c74cef24c7da8e24f11c2e8d3e316482055e14e466618f163a6e8
+  data.tar.gz: afdb2af3b99176e503fedb2910bccd7a477e6900e8b3e2fbaff64d884792002c303025ec40d9f8d65a1bfb82335627fb871a81044d1cea026966ca1c4a029138

data/README.md

@@ -6,11 +6,11 @@
   </a>
 </h3>
 <p align="center">
-  <a href="https://github.com/fastlane/deliver">deliver</a> &bull; 
-  <a href="https://github.com/fastlane/snapshot">snapshot</a> &bull; 
-  <b>frameit</b> &bull; 
-  <a href="https://github.com/fastlane/pem">pem</a> &bull; 
-  <a href="https://github.com/fastlane/sigh">sigh</a> &bull; 
+  <a href="https://github.com/fastlane/deliver">deliver</a> &bull;
+  <a href="https://github.com/fastlane/snapshot">snapshot</a> &bull;
+  <b>frameit</b> &bull;
+  <a href="https://github.com/fastlane/pem">pem</a> &bull;
+  <a href="https://github.com/fastlane/sigh">sigh</a> &bull;
   <a href="https://github.com/fastlane/produce">produce</a> &bull;
   <a href="https://github.com/fastlane/cert">cert</a> &bull;
   <a href="https://github.com/fastlane/spaceship">spaceship</a> &bull;
@@ -41,10 +41,10 @@ Get in contact with the developer on Twitter: [@FastlaneTools](https://twitter.c
 
 -------
 <p align="center">
-    <a href="#features">Features</a> &bull; 
-    <a href="#installation">Installation</a> &bull; 
-    <a href="#usage">Usage</a> &bull; 
-    <a href="#tips">Tips</a> &bull; 
+    <a href="#features">Features</a> &bull;
+    <a href="#installation">Installation</a> &bull;
+    <a href="#usage">Usage</a> &bull;
+    <a href="#tips">Tips</a> &bull;
     <a href="#need-help">Need help?</a>
 </p>
 
@@ -101,7 +101,7 @@ You only have to do this once per computer.
 - Press ```Enter```
 - Unzip and move the content of the zip files to ```~/.frameit/devices_frames```
 - Press ```Enter```
-  
+
 # Usage
 
 Why should you have to use Photoshop, just to add a frame around your screenshots?
@@ -113,7 +113,7 @@ Just navigate to your folder of screenshots and use the following command:
 To use the silver version of the frames:
 
     frameit silver
-    
+
 To run the setup process again to add new frames use:
 
     frameit setup
@@ -122,7 +122,7 @@ When using `frameit` without titles on top, the screenshots will have the full r
 
 # Titles and Background (optional)
 
-With `frameit` 2.0 you are now able to add a custom background, title and text colors to your screenshots.
+With `frameit` 2.0 you are now able to add a custom background, title and text colors to your screenshots. Optionally you can also set a custom font size.
 
 A working example can be found in the [fastlane examples](https://github.com/fastlane/examples/tree/master/MindNode/screenshots) project.
 
@@ -239,7 +239,7 @@ Check out the [MindNode example project](https://github.com/fastlane/examples/tr
 - [`cert`](https://github.com/fastlane/cert): Automatically create and maintain iOS code signing certificates
 - [`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 
+- [`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
 - [`scan`](https://github.com/fastlane/scan): The easiest way to run tests of your iOS and Mac app
 - [`match`](https://github.com/fastlane/match): Easily sync your certificates and profiles across your team using git

data/lib/frameit/editor.rb

@@ -5,8 +5,6 @@ module Frameit
     attr_accessor :image # the current image used for editing
     attr_accessor :top_space_above_device
 
-    FONT_SIZE_REFERENCE_WIDTH = 640.0 # The size of device a, e.g. "12px" is defined for
-
     def frame!(screenshot)
       self.screenshot = screenshot
       prepare_image
@@ -174,22 +172,18 @@ module Frameit
       sum_width = title.width
       sum_width += keyword.width + keyword_padding if keyword
 
-      # Only resize if we haven't specified a custom font size
-      font_size = font_size('title')
-      if font_size.nil?
-        # 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)
-
-          UI.message "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
+      # 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)
+
+        UI.message "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
 
       vertical_padding = vertical_frame_padding
@@ -216,13 +210,13 @@ module Frameit
       background
     end
 
-    def derived_font_size
+    def actual_font_size
       [@image.width / 10.0].max.round
     end
 
     # The space between the keyword and the title
     def keyword_padding
-      (derived_font_size / 2.0).round
+      (actual_font_size / 2.0).round
     end
 
     # This will build 2 individual images with the title, which will then be added to the real image
@@ -240,7 +234,6 @@ module Frameit
         end
 
         current_font = font(key)
-        custom_font_size = font_size(key)
         text = fetch_text(key)
         UI.message "Using #{current_font} as font the #{key} of #{screenshot.path}" if $verbose and current_font
         UI.message "Adding text '#{text}'" if $verbose
@@ -251,12 +244,7 @@ module Frameit
         title_image.combine_options do |i|
           i.font current_font if current_font
           i.gravity "Center"
-          if custom_font_size
-            i.pointsize custom_font_size
-            UI.message "Using custom font size #{custom_font_size}" if $verbose
-          else
-            i.pointsize derived_font_size
-          end
+          i.pointsize actual_font_size
           i.draw "text 0,0 '#{text}'"
           i.fill fetch_config[key.to_s]['color']
         end
@@ -328,36 +316,5 @@ module Frameit
       UI.message "No custom font specified for #{screenshot}, using the default one" if $verbose
       return nil
     end
-
-    def scaled_font_size(font_size)
-      font_ratio = font_size / FONT_SIZE_REFERENCE_WIDTH
-      return (font_ratio * screenshot.size[0].to_f).round
-    end
-
-    # The fontSize we want to use
-    def font_size(key)
-      single_font_size = fetch_config[key.to_s]['fontSize']
-      return single_font_size if single_font_size
-
-      fonts = fetch_config[key.to_s]['fonts']
-      if fonts
-        fonts.each do |font|
-          if font['supported']
-            font['supported'].each do |language|
-              if screenshot.path.include? language
-                return scaled_font_size(font["fontSize"])
-              end
-            end
-          else
-            # No `supported` array, this will always be true
-            UI.message "Found a fontSize with no list of supported languages, using this now" if $verbose
-            return scaled_font_size(font["fontSize"])
-          end
-        end
-      end
-
-      UI.message "No custom fontSize specified for #{screenshot}, using the default one" if $verbose
-      return nil
-    end
   end
 end

data/lib/frameit/version.rb

@@ -1,3 +1,3 @@
 module Frameit
-  VERSION = "2.5.0"
+  VERSION = "2.5.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: frameit
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.5.1
 platform: ruby
 authors:
 - Felix Krause