motion-prime 0.8.9 → 0.8.10

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDU5ZjVmMDI5MTA2ZmNiOTU0YjU3NTAxNTJhM2U0OWQ1MDljYzU0Mg==
+    NGJiNzlkZDEwMDg5OTE0MmRmYTE5OTdhNTYxNzE1NTI5NjJiNzNiMg==
   data.tar.gz: !binary |-
-    MGNkZTRhOTYzYzg4NDljYWM4NGExMjIyZDBhYjdiYTQ2ZGE4MzAwNA==
+    ZmVlMzZmYmYwZWY2Y2Y1ZjMwYWQ1ODMyMDUzNDk2ZDQ1MDE3OGJhOQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    Mzk3NjYzNTA5NWI5MDVkNzgyMDhmNjJiMTMxZWY1Njc1MzU2MDFjY2E3YTE2
-    ZTEwYzFmODQyNjlhNGZhYjBhZWQ4NmRjMTA0YzVlZmY0NDcyYjgwY2FkZmE2
-    NzY2ZmVjOWZmMGY3Yjk3YjcwNzMzMWE3ZGZhYjMxMTYwNTJhOTU=
+    OGM2N2VhZmIyMGFmYTQ1MjJkZjdlZjc0NTkwYWViMTkzNjYxMzc0YjVkZTQ3
+    YjdjNDE0MGVhNmZkYzhhZTA3NWYwOGMzYTdmN2ExZWU0MjhhMWZjOWMzNTAy
+    ZTQxY2QwMGQ5YjQxYjQ3OTIwN2UzZDBlN2JkYTIwMGUyMDQzMmU=
   data.tar.gz: !binary |-
-    OTRjNzZmOTI5YjRhMmQzNDBiNDQxY2Y5ZDI1MDljZDlkZDY2MGExYjU1NjVk
-    MWNhMGI5Nzk1Yjg2MzQ2MWIzYWFiYjE2ZDY1MDliYzExZWE5ZDNlOWEwMzg4
-    ZGJjNDFkNWM5NTJkNjk3MDA1YmE1ZjhjMzkyMGFmMWMzYzMxMmU=
+    Y2E0ZTZjMzBkMDZiMTRjZTE5NTM4MjFkZmZhN2Y3YTRiY2U0ZTZjMjZlOTE0
+    OGM3ZTdkOWU2YjFhZDU1OGJiMmU1MGFiMmQyMDJiZmY2ZmU1MzFkYWUyYjU3
+    YWFiZDYxMTk0MWFhNjI0NTA1ZjUzMmY1ZGZmN2QyZGZhMmFiYzQ=

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+=== 0.8.10
+* Added font_name/font_size options support.
+
 === 0.8.9
 * Update form default styles.
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    motion-prime (0.8.9)
+    motion-prime (0.8.10)
       afmotion (~> 2.0.0)
       bubble-wrap (~> 1.5.0)
       cocoapods

data/files/Gemfile

@@ -1,7 +1,7 @@
 source 'http://rubygems.org'
 
 gem 'motion-cocoapods', '~> 1.4.0'
-gem 'motion-prime', '0.8.9'
+gem 'motion-prime', '0.8.10'
 
 # add reside menu for sidebar support
 gem 'prime_reside_menu', '~> 0.1.4'

data/motion-prime/styles/base.rb

@@ -49,12 +49,13 @@ MotionPrime::Styles.define :base do
   style :spinner,
     annular: true,
     center: proc { screen.view.center }, width: 37, height: 37,
-    progress_tint_color: proc { :app_base.uicolor },
-    background_tint_color: proc { :black.uicolor(0.05) },
+    progress_tint_color: :app_base.uicolor,
+    background_tint_color: :black.uicolor(0.05),
     progress: 0.25
 
   style :spinner_message, mixins: [:multiline],
     top: proc { screen.view.center.y + 38 }, left: 50, width: 220, text_alignment: :center,
-    font: proc { :app_base.uifont(18) },
+    font_name: :app_base,
+    font_size: 18,
     line_spacing: 6
 end

data/motion-prime/styles/form.rb

@@ -25,7 +25,8 @@ MotionPrime::Styles.define :base_form do
     height: 16,
     left: 20,
     right: 20,
-    font: proc { :app_base.uifont(12) },
+    font_name: :app_base,
+    font_size: 12,
     size_to_fit: true
 
   style :field_error_message, mixins: [:multiline],
@@ -34,15 +35,18 @@ MotionPrime::Styles.define :base_form do
     left: 20,
     right: 20,
     text_color: :app_error,
-    font: proc { :app_base.uifont(12) }
+    font_name: :app_base,
+    font_size: 12
 
   style :string_field_input, :password_field_input, :text_field_input,
     layer: {
       border_width: 1,
       border_color: :gray
     },
-    font: proc { :app_base.uifont(16) },
-    placeholder_font: proc { :app_base.uifont(16) },
+    font_name: :app_base,
+    font_size: 16,
+    placeholder_font_name: :app_base,
+    placeholder_font_size: 16,
     background_color: :white,
     left: 20,
     right: 20,
@@ -69,7 +73,8 @@ MotionPrime::Styles.define :base_form do
     },
     title_color: :gray,
     title_label: {
-      font: proc {:app_base.uifont(16) }
+      font_name: :app_base,
+      font_size: 16
     }
 
   style :select_field_arrow,
@@ -86,11 +91,13 @@ MotionPrime::Styles.define :base_form do
 
   style :switch_field_label,
     top: 10,
-    font: proc { :app_base.uifont(16) }
+    font_name: :app_base,
+    font_size: 16
 
   style :switch_field_hint,
     top: 40,
-    font: proc { :app_base.uifont(12) }
+    font_name: :app_base,
+    font_size: 12
 
   style :field_input_with_errors,
     layer: {

data/motion-prime/version.rb

@@ -1,3 +1,3 @@
 module MotionPrime
-  VERSION = "0.8.9"
+  VERSION = "0.8.10"
 end

data/motion-prime/views/styles.rb

@@ -34,6 +34,7 @@ module MotionPrime
         self.class.new(namespace).instance_eval(&block)
       end if block_given?
     end
+    alias_method :_, :style
 
     class << self
       include HasNormalizer

data/motion-prime/views/view_styler.rb

@@ -52,7 +52,22 @@ module MotionPrime
         options[:attributed_text] = html ? html_string(text_options) : attributed_string(text_options)
 
         # ios 7 bug fix when text is invisible
-        options[:number_of_lines] = 0 if text_options.slice(:line_height, :line_spacing, :text_alignment, :line_break_mode).any? && options.fetch(:number_of_lines, 1) == 1
+        if text_options.slice(:line_height, :line_spacing, :text_alignment, :line_break_mode).any? && options.fetch(:number_of_lines, 1) == 1
+          options[:number_of_lines] = 0
+        end
+      end
+      extract_font_options(options)
+      extract_font_options(options, 'placeholder')
+    end
+
+    def extract_font_options(options, prefix = nil)
+      key = [prefix, 'font'].compact.join('_').to_sym
+      name_key = [prefix, 'font_name'].compact.join('_').to_sym
+      size_key = [prefix, 'font_size'].compact.join('_').to_sym
+      if options.slice(size_key, name_key).any?
+        font_name = options.delete(name_key) || :system
+        font_size = options.delete(size_key) || 14
+        options[key] ||= font_name.uifont(font_size)
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motion-prime
 version: !ruby/object:Gem::Version
-  version: 0.8.9
+  version: 0.8.10
 platform: ruby
 authors:
 - Iskander Haziev
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-08 00:00:00.000000000 Z
+date: 2014-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake