motion-prime 1.0.3 → 1.0.4

data/motion-prime/sections/table/refresh_mixin.rb

@@ -14,7 +14,7 @@ module MotionPrime
         custom_offset_threshold: - collection_view.contentInset.top - refresh_view.size.height,
         original_top_inset: collection_view.contentInset.top
       }
-      screen.set_options_for refresh_view, base_options.merge(options)
+      screen.set_options_for refresh_view, base_options.deep_merge(options)
     end
 
     def finish_pull_to_refresh

data/motion-prime/sections/table/table_delegate.rb

@@ -5,13 +5,14 @@ module MotionPrime
 
     def initialize(options)
       self.table_section = options[:section].try(:weak_ref)
+      @_section_info = table_section.to_s
       @section_instance = table_section.to_s
     end
 
-    # def dealloc
-    #   pp 'Deallocating table_delegate for ', @section_instance
-    #   super
-    # end
+    def dealloc
+      Prime.logger.dealloc_message :collection_delegate, @_section_info
+      super
+    end
 
     def init_pull_to_refresh
       return unless block = table_section.class.pull_to_refresh_block
@@ -60,6 +61,7 @@ module MotionPrime
 
     def scrollViewDidScroll(scroll)
       table_section.scroll_view_did_scroll(scroll)
+      table_section.update_pull_to_refresh_after_scroll(scroll)
     end
 
     def scrollViewWillBeginDragging(scroll)

data/motion-prime/styles/base.rb

@@ -11,7 +11,7 @@ MotionPrime::Styles.define :base do
     left: 0,
     right: 0,
     bottom: 0,
-    separator_inset: 0
+    separator_inset: [0,0]
 
   style :collection,
     top: 0,

data/motion-prime/support/consts.rb

@@ -8,4 +8,9 @@ UIControlContentHorizontalAlignmentFill
 UIControlContentVerticalAlignmentCenter
 UIControlContentVerticalAlignmentTop
 UIControlContentVerticalAlignmentBottom
-UIControlContentVerticalAlignmentFill
+UIControlContentVerticalAlignmentFill
+
+if defined?(ALAssetsLibrary)
+  ALAuthorizationStatusNotDetermined
+  ALAssetsGroupAll
+end

data/motion-prime/support/mp_table_view.rb

@@ -1,6 +1,6 @@
 class MPTableView < UITableView
-  # def dealloc
-  #   pp 'Deallocating table view', self.to_s
-  #   super
-  # end
+  def dealloc
+    Prime.logger.dealloc_message :view, self.to_s
+    super
+  end
 end

data/motion-prime/version.rb

@@ -1,3 +1,3 @@
 module MotionPrime
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
 end

data/motion-prime/views/styles.rb

@@ -70,7 +70,7 @@ module MotionPrime
 
       def extend_and_normalize_options(options = {})
         style_options = self.for(options.delete(:styles))
-        normalize_options(style_options.merge(options))
+        normalize_options(style_options.deep_merge(options))
       end
     end
   end

data/motion-prime/views/view_builder.rb

@@ -64,12 +64,16 @@ module MotionPrime
             image = options.delete(:image)
             highlighted_image = options.delete(:highlighted_image)
 
-            if !image.nil? && !highlighted_image.nil?
-              klass.alloc.initWithImage image.uiimage, highlightedImage: highlighted_image.uiimage
-            elsif !image.nil?
-              klass.alloc.initWithImage image.uiimage
-            else
+            if image.nil?
               klass.alloc.initWithFrame CGRectZero
+            else
+              image = image.uiimage
+              image = image.imageWithRenderingMode(2) if options[:tint_color].present?
+              if highlighted_image.nil?
+                klass.alloc.initWithImage image.uiimage
+              else
+                klass.alloc.initWithImage image.uiimage, highlightedImage: highlighted_image.uiimage
+              end
             end
           },
           'UIProgressView' => Proc.new{|klass, options|

data/motion-prime/views/view_styler.rb

@@ -4,10 +4,11 @@ module MotionPrime
     include HasStyles
     include HasClassFactory
     include ElementTextMixin
+    include HasStyleOptions
 
     ORDER = %w[
       frame
-      font placeholder_font text title_label title
+      font text title_label title
       minimum_value maximum_value value
       ]
 
@@ -57,13 +58,12 @@ module MotionPrime
 
       if options.slice(:html, :line_spacing, :line_height, :underline, :fragment_color).any?
         text_options = extract_attributed_text_options(options)
-
         html = text_options.delete(:html)
         text_options[:text] = html if html
         options[:attributed_text] = html ? html_string(text_options) : attributed_string(text_options)
 
         # ios 7 bug fix when text is invisible
-        if text_options.slice(:line_height, :line_spacing, :text_alignment, :line_break_mode).any? && options.fetch(:number_of_lines, 1) == 1
+        if view.is_a?(UILabel) && 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
@@ -79,32 +79,29 @@ module MotionPrime
 
     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
+      options[key] = extract_font_from(options, prefix)
     end
 
     def extract_attributed_text_options(options)
       text_attributes = [
         :text, :html, :line_spacing, :line_height, :underline, :fragment_color,
-        :text_alignment, :font, :line_break_mode, :number_of_lines
+        :text_alignment, :font, :font_name, :font_size, :line_break_mode, :number_of_lines, :text_color
       ]
       attributed_text_options = options.slice(*text_attributes)
+      exclude_attributes = text_attributes
       if view.is_a?(UIButton)
+        attributed_text_options[:text_color] ||= options[:title_color]
         attributed_text_options[:text] ||= options[:title]
+        exclude_attributes.delete(:line_break_mode)
       end
-      options.except!(*text_attributes)
+      options.except!(*exclude_attributes)
       attributed_text_options
     end
 
     def set_option(key, value)
       # return if value.nil?
       # ignore options
-      return if ignore_option?(key)
+      return if ignore_option?(key) || value.nil?
 
       # apply options
       result ||= set_color_options(key, value)
@@ -220,14 +217,17 @@ module MotionPrime
           mask_path = UIBezierPath.bezierPathWithRoundedRect(layer_bounds, byRoundingCorners: corners, cornerRadii: CGSizeMake(radius, radius))
           mask_layer = CAShapeLayer.layer
 
-
           mask_layer.frame = layer_bounds
           mask_layer.path = mask_path.CGPath
           view.mask = mask_layer
 
           if value[:border_color] && value[:border_width]
             stroke_layer = CAShapeLayer.layer
-            stroke_layer.path = mask_path.CGPath
+            unless value[:sides]
+              stroke_layer.path = mask_path.CGPath
+            else # suuport sides
+              stroke_layer.path = mask_path.CGPath
+            end
             stroke_layer.fillColor = :clear.uicolor.cgcolor
             stroke_layer.strokeColor = value[:border_color].uicolor.cgcolor
             stroke_layer.lineWidth = value[:border_width].to_f*2 # another half is hidden by the mask
@@ -277,6 +277,7 @@ module MotionPrime
           width height top right bottom left
           max_width max_outer_width min_width min_outer_width
           max_height max_outer_height min_height min_outer_width
+          font_name font_size placeholder_font_name placeholder_font_size placeholder_font
           bounds
         ].include?(key.to_s)
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motion-prime
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Iskander Haziev
@@ -9,202 +9,202 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-18 00:00:00.000000000 Z
+date: 2014-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: motion-stump
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: motion-redgreen
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: cocoapods
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: motion-cocoapods
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: motion-require
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: motion-support
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.6
 - !ruby/object:Gem::Dependency
   name: bubble-wrap
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: sugarcube
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: afmotion
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: methadone
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rm-digest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: RubyMotion apps development framework
@@ -215,9 +215,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
-- .yardopts
+- ".gitignore"
+- ".travis.yml"
+- ".yardopts"
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
@@ -299,6 +299,7 @@ files:
 - motion-prime/helpers/has_normalizer.rb
 - motion-prime/helpers/has_search_bar.rb
 - motion-prime/helpers/has_style_chain_builder.rb
+- motion-prime/helpers/has_style_options.rb
 - motion-prime/helpers/has_styles.rb
 - motion-prime/models/_association_mixin.rb
 - motion-prime/models/_base_mixin.rb
@@ -432,17 +433,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: RubyMotion apps development framework