frameit 2.4.2 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51f6e23e8a0eda4b74b3c2088da03c61ef8e98e5
-  data.tar.gz: 424487c213ded6efd87fb8e3f6dedfe6c090e063
+  metadata.gz: 34bc47b3efb69420fd5270e798ba713a9b948af4
+  data.tar.gz: 8158ee167427955839b53705c4787102cd104547
 SHA512:
-  metadata.gz: 1a4b71cff4333d074dfa1577fae67ca6675b55022e50048222017694856fa3e6af54921d7f210245673e393d77a7d01ba4e6f801dc598ba651aedf4b97cfd1d6
-  data.tar.gz: 33c0fe594cb17ebf08aa5a2a207eda07f53204fe03181f3b6450869b0958a29a9dfb7ed754984bbc466f5ec2c83f9fde4b6f696eadb328ab774bea4530220c33
+  metadata.gz: d0279c2c77228a3e5bae1bbe84c05338864efca6eb13e63c29eae7b50c0f6d7d20b1b873045c7b9ea557fe0fea2451803aba2873b893eed0bad37f8366044498
+  data.tar.gz: 9bfde1c00507c0521a440a464d23b9d4d73bebc36525829f65b48edba521ddff4e46f039d4ba8ae6ce1e45d0a62e05c9a20af93fb534d9e8428a638a299a52f8

data/README.md

@@ -185,7 +185,7 @@ To define the title and optionally the keyword, put two `.strings` files into th
 
 The `keyword.strings` and `title.strings` are standard `.strings` file you already use for your iOS apps, making it easy to use your existing translation service to get localized titles.
 
-**Note:** These `.strings` files **MUST** be utf-16 encoded.  If you are having trouble see [issue #49](https://github.com/fastlane/frameit/issues/49)
+**Note:** These `.strings` files **MUST** be utf-16 encoded (UTF-16 LE with BOM).  They also must begin with an empty line. If you are having trouble see [issue #49](https://github.com/fastlane/frameit/issues/49)
 
 
 #### Uploading screenshots to iTC

data/lib/frameit/editor.rb

@@ -5,6 +5,8 @@ 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
@@ -172,18 +174,22 @@ module Frameit
       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)
-
-        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
+      # 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
       end
 
       vertical_padding = vertical_frame_padding
@@ -210,13 +216,13 @@ module Frameit
       background
     end
 
-    def actual_font_size
+    def derived_font_size
       [@image.width / 10.0].max.round
     end
 
     # The space between the keyword and the title
     def keyword_padding
-      (actual_font_size / 2.0).round
+      (derived_font_size / 2.0).round
     end
 
     # This will build 2 individual images with the title, which will then be added to the real image
@@ -234,6 +240,7 @@ 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
@@ -244,7 +251,12 @@ module Frameit
         title_image.combine_options do |i|
           i.font current_font if current_font
           i.gravity "Center"
-          i.pointsize actual_font_size
+          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.draw "text 0,0 '#{text}'"
           i.fill fetch_config[key.to_s]['color']
         end
@@ -316,5 +328,36 @@ 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.4.2"
+  VERSION = "2.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: frameit
 version: !ruby/object:Gem::Version
-  version: 2.4.2
+  version: 2.5.0
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-28 00:00:00.000000000 Z
+date: 2016-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastlane_core