motion-prime 0.9.2 → 0.9.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NmQ3ZGM2Yzk1NGVmZDhiMDVkZWMxMTkyNmU0MjJlODE0ODBkMTJmNg==
+    NjQ0MTllNzk1MTE2ODViNTZjMDE0NzFhMTU2Nzk1ZjI1Njg3MDhjZQ==
   data.tar.gz: !binary |-
-    YWJhYTVhYmE5OWEzYmQ3M2ExZDA3NjhlMTNjN2RiYzcyYTRjMmNiNg==
+    NzQ0YTk2NjA2NWUxOGE5N2NjMjFkZTA2YjJlZTlhNzVkMDQ0M2I2ZA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    OGRlNTdiYWIxNTU3MzZkNmE0ODRiZjJmNTY2MGVjZGI0NDUxYzRjNDIwNThk
-    ZGE5YjE4NTIzYzJkMDI2OTcxMjJkOWU2MmYwOGU1NDZmZjk3YWZjMGYwZTI3
-    YzkyMjM0MGI5YzhiMDZjNDMzMDQ0ODAwOWQwYjdmZmE0OTFmNjg=
+    MGY3OWE1OTNkNGVjMWQ4NjFiNjgzOGNjMjhiNTQ5ZTUwODEyNmMwMGVlNGIz
+    NTg2OTM3ZmMyNzcxMDE2YTNkNDJhNTg1MGEzNjE1YjAwNTNlMzljMzdlNjM2
+    ZTU2NzZlZWNkYmIzZWUxMjMwODg2MWQ1OWYxZjIyOTA2ZjdiNmY=
   data.tar.gz: !binary |-
-    YzEwMTg1MDk2OTc0MjIyNDVmOWJjZTU2MGE2NWM2OTc2OGFlNzc2YjhmOWEw
-    ZDcyMWYxZDhmMTA0NDNhYTBkZGRjNmM5NDQ0ZTUwNDY5Mzk0ZGU1NjRkZGJk
-    ODA5NjU1MDhkMzYyMWM4NWU4NGEzY2QxYTNlMWRiNDk5NTk0MWY=
+    Y2QxNWVhMGRkZTBlMTE2YWM5NzU4MjJhNjMwNGI0ODAwYWVmNTU3NzY2NTU3
+    YzM2NzJmZGU3ODczYjQ1ZGJlNzllNDgzYmE1OGQ3NjQzY2IyZDdiMjBmOGYx
+    MDg1YTVmOWM1MGUyMGMwNTkwYTQ4ZmU2N2JhYzIyNjcyOTUyZjI=

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+=== 0.9.3
+* Small refactor required for working prime_awesome
+
 === 0.9.2
 * Updated scaffold and added deleting items.
 * Ability to reload base section.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    motion-prime (0.9.2)
+    motion-prime (0.9.3)
       activesupport
       afmotion (~> 2.0.0)
       bubble-wrap (~> 1.5.0)

data/files/Gemfile

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

data/motion-prime/elements/_text_mixin.rb

@@ -28,6 +28,26 @@ module MotionPrime
     end
 
     def attributed_string(options)
+      attributes, paragrah_style = extract_attributed_string_options(options)
+
+      prepared_text = NSMutableAttributedString.alloc.initWithString(options[:text].to_s, attributes: attributes)
+      underline_range = options[:underline]
+      fragment_color = options[:fragment_color]
+      if paragrah_style && (underline_range || fragment_color) && options.fetch(:number_of_lines, 1) == 1
+        Prime.logger.debug "If attributed text has paragraph style and underline - you must set number of lines != 1"
+      end
+
+      if underline_range
+        underline_range = [0, options[:text].length] if underline_range === true
+        prepared_text.addAttributes({NSUnderlineStyleAttributeName => NSUnderlineStyleSingle}, range: underline_range)
+      end
+      if fragment_color
+        prepared_text.addAttributes({NSForegroundColorAttributeName => fragment_color[:color].uicolor}, range: fragment_color[:range])
+      end
+      prepared_text
+    end
+
+    def extract_attributed_string_options(options)
       attributes = {}
       line_height = options[:line_height]
       line_spacing = options[:line_spacing]
@@ -51,25 +71,9 @@ module MotionPrime
         end
         attributes[NSParagraphStyleAttributeName] = paragrah_style
       end
-
       attributes[NSForegroundColorAttributeName] = options[:text_color].uicolor if options[:text_color]
       attributes[NSFontAttributeName] = options[:font].uifont if options[:font]
-
-      prepared_text = NSMutableAttributedString.alloc.initWithString(options[:text].to_s, attributes: attributes)
-      underline_range = options[:underline]
-      fragment_color = options[:fragment_color]
-      if paragrah_style && (underline_range || fragment_color) && options.fetch(:number_of_lines, 1) == 1
-        Prime.logger.debug "If attributed text has paragraph style and underline - you must set number of lines != 1"
-      end
-
-      if underline_range
-        underline_range = [0, options[:text].length] if underline_range === true
-        prepared_text.addAttributes({NSUnderlineStyleAttributeName => NSUnderlineStyleSingle}, range: underline_range)
-      end
-      if fragment_color
-        prepared_text.addAttributes({NSForegroundColorAttributeName => fragment_color[:color].uicolor}, range: fragment_color[:range])
-      end
-      prepared_text
+      [attributes, paragrah_style]
     end
   end
 end

data/motion-prime/elements/draw/label.rb

@@ -52,7 +52,8 @@ module MotionPrime
 
       UIGraphicsPushContext(context)
       options = draw_options
-      if options[:is_html] || options[:line_spacing] || options[:line_height] || options[:underline]
+      if options[:is_html] || options[:line_spacing] || 
+        options[:line_height] || options[:underline] || options[:force_attributed]
         prepared_text = options[:is_html] ? html_string(options) : attributed_string(options)
 
         CGContextSaveGState(context)

data/motion-prime/version.rb

@@ -1,3 +1,3 @@
 module MotionPrime
-  VERSION = "0.9.2"
+  VERSION = "0.9.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motion-prime
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - Iskander Haziev