motion-prime 0.9.4 → 0.9.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTEwYzU5NjkxYjdmZjk4NjU2MGViODJlY2U4YmI5NDBkMDJhNDJmZQ==
+    NGU1Njc4YzVkNGIyNmZjNDg0MWIwZGYzYmMwMDliNWZhMDVkNWI5Mg==
   data.tar.gz: !binary |-
-    Nzg1YmZmODZiYmM3MTM0NzI5YmExNWExNDdkNmUxN2IwNGRiZGI1MA==
+    OGNiYjkyMThmM2QwZWU5YzQzM2E0YWI0ZDgxZjlkMzAzZDQ3NDU1MQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YTU0Y2QyNTMyMDlhNzcwMWU3M2RjNmY3OTgyM2Q4NDlhZDNiZTdiMWY4MDk4
-    NzdiODU5NzgxODc3NDlhODRlN2EzYzdiNTA2MDQ3YmY0MTQwOWRiYjc2MWRh
-    YWI5NjJlOGQ0MmFjNTUwMGVmZWMxYjRjMmY2ZjJhZjQ0NGU2YjA=
+    ODg2YmIyZTc5Y2ZhMGQxZTMzNDlhM2RmNDdlM2FmN2RiOTVjZGJhMjE4ODBl
+    NjU3NTY2MDNjYjk3ZWMzNmM1MWJjMTI4OGY5NjUzMWRhOWRlNzI2ZmIzNTdl
+    MjdhYzdjMTk0OGUwODZlYTIzNWQ1ZmZkNTQ3YzBlZWY0YzFhNmM=
   data.tar.gz: !binary |-
-    ODJhNDcxMDg5YWE3YjVkOWRlMmQ2MWIzZGFjZjA1NzQ2ZTY5MmFjMGYxNTFj
-    NTAxYzljOWZhMWE0NmQ1NmI5YjIxMmRkM2QwYjg5OTdiZTZjZDU2MTM2YzUw
-    MTlhYjNiM2Y4NzFkNGY2NzdlYjcwOThlZTYyM2Y4OTJmZGRmODg=
+    YzdiYTliMTNmNWVhMzI2NDZjNzRlZGVmYzllODI1YTg2ZjAyYmRiMGIyYmU3
+    N2EzODQ2YWM2OGE2M2U4ZGRjM2NmN2RkODA2NTM3ZTJmNzhkYmEyYmJjYmIw
+    MWU5ZTkzNzdiY2JjNjhiYTUyZjY0MmE2ZjhiZDk3MmMwYmFhMzk=

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+=== 0.9.5
+* Ability to set wrapper for sections in screen.
+* Screen refresh reloads all sections in screen.
+* Fix overriding title color of button in nav bar.
+* Better support for edge inset attributes.
+
 === 0.9.4
 * Ability to render multiple sections inside screen action.
 

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    motion-prime (0.9.4)
+    motion-prime (0.9.5)
       activesupport
-      afmotion (~> 2.0.0)
+      afmotion (~> 2.1.0)
       bubble-wrap (~> 1.5.0)
       cocoapods
       methadone
@@ -20,7 +20,7 @@ GEM
     activesupport (3.2.17)
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
-    afmotion (2.0.0)
+    afmotion (2.1.0)
       motion-cocoapods (~> 1.4.0)
       motion-require (~> 0.0.7)
     bubble-wrap (1.5.0)

data/ROADMAP.md

@@ -1,4 +1,5 @@
 === 1.0.0
+* bug: size_to_fit makes draw label multiline by default.
 * bug: content_vertical_alignment conflicts with padding.
 * bug: content_vertical_alignment has not ideal centering.
 * bug: if mp label do not have text and was set as hidden, it should unhide after setting text.

data/files/Gemfile

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

data/generators/scaffold_generator.rb

@@ -8,8 +8,8 @@ class MotionPrime::ScaffoldGenerator < MotionPrime::Generator
     @p_class_name = @p_name.camelize
     template 'scaffold/screen.rb', "app/screens/#{@p_name}.rb"
     template 'scaffold/model.rb', "app/models/#{@s_name}.rb"
-    template 'scaffold/table.rb', "app/sections/#{@p_name}/table.rb"
-    template 'scaffold/cell.rb', "app/sections/#{@p_name}/cell.rb"
+    template 'scaffold/table.rb', "app/sections/#{@p_name}/index_table.rb"
+    template 'scaffold/cell.rb', "app/sections/#{@p_name}/index_cell.rb"
     template 'scaffold/form.rb', "app/sections/#{@p_name}/form.rb"
     template 'scaffold/show.rb', "app/sections/#{@p_name}/show.rb"
     template 'scaffold/styles.rb', "app/styles/#{@p_name}.rb"

data/generators/templates/scaffold/styles.rb

@@ -6,7 +6,7 @@ Prime::Styles.define :<%= @p_name %> do
       top: 10,
       width: 280,
       font: :app_base.uifont(16),
-      size_to_fit: true
+      height: 20
   end
   style :show do
     style :title,

data/motion-prime.gemspec

@@ -26,9 +26,9 @@ Gem::Specification.new do |spec|
   spec.add_dependency "motion-support", '~> 0.2.6'
   spec.add_dependency 'bubble-wrap', '~> 1.5.0'
   spec.add_dependency 'sugarcube', '~> 1.5.2'
-  spec.add_dependency 'afmotion', '~> 2.0.0'
+  spec.add_dependency 'afmotion', '~> 2.1.0'
   spec.add_dependency "methadone"
-  spec.add_dependency "rm-digest" 
-  spec.add_dependency "thor" 
-  spec.add_dependency "activesupport" 
+  spec.add_dependency "rm-digest"
+  spec.add_dependency "thor"
+  spec.add_dependency "activesupport"
 end

data/motion-prime/config/base.rb

@@ -6,12 +6,13 @@ MotionPrime::Config.configure do |config|
     config.model.store_type = :file
   end
   config.model.auto_generate_id = true
-  
+
   config.fonts do |fonts|
     fonts.base = :system
   end
 
   config.colors do |colors|
+    colors.navigation_base = 0x1b75bc
     colors.base = 0x1b75bc
     colors.dark = 0x333333
     colors.error = 0xef471f

data/motion-prime/delegate/_base_mixin.rb

@@ -18,6 +18,7 @@ module MotionPrime
     def application(application, didRegisterForRemoteNotificationsWithDeviceToken: token)
       on_apn_register_success(application, token)
     end
+
     def application(application, didFailToRegisterForRemoteNotificationsWithError: error)
       on_apn_register_fail(application, error)
     end
@@ -25,8 +26,14 @@ module MotionPrime
     def on_load(application, launch_options)
     end
 
-    def app_window
-      self.app_delegate.window
+    # Return the main controller.
+    def main_controller
+      window.rootViewController
+    end
+
+    # Return content controller (without sidebar)
+    def content_controller
+      main_controller.content_controller
     end
   end
 end

data/motion-prime/elements/draw.rb

@@ -11,7 +11,7 @@ module MotionPrime
       options = computed_options
       background_color = options[:background_color].try(:uicolor)
       {
-        rect: CGRectMake(computed_left, computed_top, computed_outer_width, computed_outer_height),
+        rect: CGRectMake(frame_left, frame_top, frame_outer_width, frame_outer_height),
         background_color: background_color,
         masks_to_bounds: options[:layer].try(:[], :masks_to_bounds) || options[:clips_to_bounds],
         corner_radius: options[:layer].try(:[], :corner_radius).to_f,
@@ -27,39 +27,13 @@ module MotionPrime
     end
 
     def computed_frame
-      @computed_frame ||= calculate_frome_for(view.try(:bounds) || section.container_bounds, computed_options)
+      @computed_frame ||= calculate_frame_for(view.try(:bounds) || section.container_bounds, computed_options)
     end
 
     def default_padding_for(side)
       0
     end
 
-    def computed_max_width
-      view.bounds.size.width
-    end
-
-    def computed_max_height
-      view.bounds.size.height
-    end
-
-    def computed_outer_width; computed_frame.size.width end
-    def computed_width; computed_outer_width - content_padding_width end
-
-    def computed_outer_height; computed_frame.size.height end
-    def computed_height; computed_outer_height - content_padding_height end
-
-    def computed_top; computed_frame.origin.y end
-    def computed_inner_top; computed_top + content_padding_top end
-
-    def computed_left; computed_frame.origin.x end
-    def computed_inner_left; computed_left + content_padding_left end
-
-    def computed_bottom; computed_top + computed_outer_height end
-    def computed_inner_bottom; computed_bottom - content_padding_bottom end
-
-    def computed_right; computed_left + computed_width end
-    def computed_inner_right; computed_right - content_padding_right end
-
     def bind_gesture(action, receiver = nil, target = nil)
       target ||= section
       target.bind_gesture_on_container_for(self, action, receiver)
@@ -92,6 +66,24 @@ module MotionPrime
     end
 
     private
+      def frame_outer_width; computed_frame.size.width end
+      def frame_width; frame_outer_width - content_padding_width end
+
+      def frame_outer_height; computed_frame.size.height end
+      def frame_height; frame_outer_height - content_padding_height end
+
+      def frame_top; computed_frame.origin.y end
+      def frame_inner_top; frame_top + content_padding_top end
+
+      def frame_left; computed_frame.origin.x end
+      def frame_inner_left; frame_left + content_padding_left end
+
+      def frame_bottom; frame_top + frame_outer_height end
+      def frame_inner_bottom; frame_bottom - content_padding_bottom end
+
+      def frame_right; frame_left + frame_outer_width end
+      def frame_inner_right; frame_right - content_padding_right end
+
       def reset_computed_values
         @content_height = nil
         @content_width = nil

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

@@ -16,9 +16,9 @@ module MotionPrime
       line_break_mode_name = options.fetch(:line_break_mode, :tail_truncation)
       line_break_mode = line_break_mode_name.uilinebreakmode
 
-      top_left_corner = CGPointMake(computed_inner_left, computed_inner_top)
+      top_left_corner = CGPointMake(frame_inner_left, frame_inner_top)
       if options[:number_of_lines].to_i.zero?
-        inner_rect = CGRectMake(*top_left_corner.to_a, computed_width, computed_height)
+        inner_rect = CGRectMake(*top_left_corner.to_a, frame_width, frame_height)
       end
       super.merge({
         text: text,
@@ -97,10 +97,10 @@ module MotionPrime
 
     def set_text_position
       if computed_options.slice(:padding_top, :padding_bottom, :padding).values.none?
-        computed_options[:width] ||= computed_width
+        computed_options[:width] ||= frame_width
         content_height = cached_content_height
-        content_height = computed_outer_height if content_height > computed_outer_height
-        @padding_top = (computed_outer_height - content_height)/2
+        content_height = frame_outer_height if content_height > frame_outer_height
+        @padding_top = (frame_outer_height - content_height)/2
         # @padding_top += 1 unless @padding_top.zero?
       end
     end

data/motion-prime/models/_finder_mixin.rb

@@ -64,12 +64,8 @@ module MotionPrime
           raise "Unexpected parameters: #{arg}."
         end
         search = NSFNanoSearch.searchWithStore(self.store)
-
-        expressions = expressions_with_options(options)
-        search.expressions = expressions
-
-        sort_descriptors = sort_descriptor_with_options(sort_options)
-        search.sort = sort_descriptors
+        search.expressions = expressions_with_options(options)
+        search.sort = sort_descriptor_with_options(sort_options)
         search.filterClass = self.bare_class_name
 
         error_ptr = Pointer.new(:id)
@@ -86,28 +82,18 @@ module MotionPrime
       # Find model keys by criteria
       #
       # @example:
-      #   User.find_keys(:name, NSFEqualTo, "Bob") # => ["1"]
       #   User.find_keys(:name => "Bob") # => ["1"]
       #   User.find_keys(:name => {NSFEqualTo => "Bob"}) # => ["1"]
       #
       # @return keys [Array] array of models
       def find_keys(*arg)
         if arg[0].is_a?(Hash)
-          # hash style
           options = arg[0]
           if arg[1] && arg[1].is_a?(Hash)
             sort_options = arg[1][:sort] || {}
           else
             sort_options = {}
           end
-        elsif arg[0] && arg[1] && arg[2]
-          # standard way to find
-          options = {arg[0] => {arg[1] => arg[2]}}
-          if arg[4] && arg[4].is_a?(Hash)
-            sort_options = arg[4][:sort] || {}
-          else
-            sort_options = {}
-          end
         elsif arg.empty?
           options = {}
           sort_options = {}
@@ -116,12 +102,8 @@ module MotionPrime
         end
 
         search = NSFNanoSearch.searchWithStore(self.store)
-
-        expressions = expressions_with_options(options)
-        search.expressions = expressions
-
-        sort_descriptors = sort_descriptor_with_options(sort_options)
-        search.sort = sort_descriptors
+        search.expressions = expressions_with_options(options)
+        search.sort = sort_descriptor_with_options(sort_options)
         search.filterClass = self.bare_class_name
 
         error_ptr = Pointer.new(:id)

data/motion-prime/prime.rb

@@ -8,7 +8,7 @@ module MotionPrime
   end
 
   def self.low_camelize_factory_cache
-    @camelize_factory_cache ||= {}
+    @low_camelize_factory_cache ||= {}
   end
 
   def self.env

data/motion-prime/screens/_base_mixin.rb

@@ -59,12 +59,14 @@ module MotionPrime
     end
     alias_method :set_title, :title=
 
+    # Return the main controller.
     def main_controller
       has_navigation? ? navigation_controller : self
     end
 
-    def refresh
-      main_section.try(:reload)
+    # Return content controller (without sidebar)
+    def content_controller
+      self
     end
 
     # Class methods

data/motion-prime/screens/_navigation_mixin.rb

@@ -118,7 +118,7 @@ module MotionPrime
       end
 
       def wrap_in_navigation!
-        self.navigation_controller = UINavigationController.alloc.initWithRootViewController(self)
+        self.navigation_controller = NavigationController.alloc.initWithRootViewController(self)
       end
   end
 end

data/motion-prime/screens/_sections_mixin.rb

@@ -19,12 +19,24 @@ module MotionPrime
       Array.wrap(@sections.try(:values))
     end
 
+    def all_sections_with_main
+      (all_sections + [main_section]).compact.uniq
+    end
+
     def set_section(name, options = {})
       self._action_section_options ||= {}
       self._action_section_options[name.to_sym] = options
     end
     alias_method :section, :set_section
 
+    def set_sections_wrapper(value)
+      self.class.set_sections_wrapper(value)
+    end
+
+    def refresh
+      all_sections_with_main.each { |s| s.try(:reload) }
+    end
+
     protected
       def add_sections
         @main_section ||= nil
@@ -52,17 +64,33 @@ module MotionPrime
         _action_section_options || {}
       end
 
+      def sections_wrapper
+        self.class.sections_wrapper
+      end
+
       def render_sections
         return unless @sections.present?
-        if all_sections.count > 1
-          @main_section = MotionPrime::TableSection.new(model: all_sections, screen: self)
+        table_wrap = sections_wrapper.nil? ? all_sections.count > 1 : sections_wrapper
+        if table_wrap
+          table_class = table_wrap.is_a?(TrueClass) ? MotionPrime::TableSection : table_class
+          @main_section = table_class.new(model: all_sections, screen: self)
           @main_section.render
         else
-          all_sections.first.render
+          all_sections.each do |section|
+            section.render
+          end
         end
       end
 
     module ClassMethods
+      def sections_wrapper
+        @sections_wrapper
+      end
+
+      def set_sections_wrapper(value)
+        @sections_wrapper = value
+      end
+
       def section_options
         _section_options || {}
       end

data/motion-prime/screens/controllers/navigation_controller.rb

@@ -0,0 +1,12 @@
+module MotionPrime
+  class NavigationController < UINavigationController
+    # Return the main controller.
+    def main_controller
+      self
+    end
+    # Return content controller (without sidebar)
+    def content_controller
+      self
+    end
+  end
+end

data/motion-prime/screens/extensions/_navigation_bar_mixin.rb

@@ -69,7 +69,7 @@ module MotionPrime
       face = UIButton.buttonWithType UIButtonTypeCustom
       face.setImage(image, forState: UIControlStateNormal) if args[:icon]
       face.setTitle(title, forState: UIControlStateNormal)
-      face.setTitleColor((:app_base || args[:title_color]).uicolor, forState: UIControlStateNormal)
+      face.setTitleColor((args[:title_color] || :app_navigation_base).uicolor, forState: UIControlStateNormal)
       face.setContentHorizontalAlignment UIControlContentHorizontalAlignmentLeft
       face.sizeToFit
       face.on :touch do

data/motion-prime/sections/_cell_section_mixin.rb

@@ -61,6 +61,13 @@ module MotionPrime
       container_view.setNeedsDisplay
     end
 
+    def cell
+      container_view || begin
+        first_element = elements.values.first
+        first_element.view.superview.superview
+      end
+    end
+
     def dealloc
       # TODO: remove this when solve this problem: dealloc TableCells on TableView.reloadData (in case when reuseIdentifier has been used)
       container_view.section = nil if container_view.respond_to?(:setSection)

data/motion-prime/sections/base_section.rb

@@ -190,13 +190,6 @@ module MotionPrime
       true
     end
 
-    def cell
-      container_view || begin
-        first_element = elements.values.first
-        first_element.view.superview.superview
-      end
-    end
-
     def render(container_options = {})
       create_elements
       self.container_options.merge!(container_options)
@@ -233,19 +226,35 @@ module MotionPrime
       element(name).view
     end
 
+    # Hide all elements of section.
+    # It will hide all base elements and container of draw elements.
+    # FIXME: container_view manipulation should be in draw mixin.
     def hide
       if container_view
         container_view.hidden = true
-      else
-        elements.values.each(&:hide)
       end
+      elements_to_render.values.each(&:hide)
     end
 
+    # Show all elements of section.
+    # It will show all base elements and container of draw elements.
+    # FIXME: container_view manipulation should be in draw mixin.
     def show
       if container_view
         container_view.hidden = false
-      else
-        elements.values.each(&:show)
+      end
+      elements_to_render.values.each(&:show)
+    end
+
+    # Bring all views of section to front.
+    # It will bring to front all base elements and container of draw elements.
+    # FIXME: container_view manipulation should be in draw mixin.
+    def bring_to_front
+      if container_view
+        container_view.superview.bringSubviewToFront container_view
+      end
+      elements_to_render.values.each do |element|
+        element.view.superview.bringSubviewToFront element.view
       end
     end
 
@@ -331,9 +340,7 @@ module MotionPrime
       end
 
       def has_drawn_content?
-        self.elements.values.any? do |element|
-          element.is_a?(DrawElement)
-        end
+        elements_to_draw.any?
       end
 
       # Force load section

data/motion-prime/sections/table.rb

@@ -121,7 +121,7 @@ module MotionPrime
     end
 
     # Delete section from data at index
-    # 
+    #
     # @param index [NSIndexPath] index of cell which will be removed from table data.
     def delete_from_data(index)
       if flat_data?
@@ -230,7 +230,7 @@ module MotionPrime
     end
 
     def table_view
-      table_element.view
+      table_element.try(:view)
     end
 
     def hide
@@ -321,10 +321,10 @@ module MotionPrime
       return cached if cached.present?
 
       styles = cell_section_styles(header).values.flatten
-      wrapper = MotionPrime::BaseElement.factory(:table_header, 
-        screen: screen, 
-        styles: styles, 
-        parent_view: table_view, 
+      wrapper = MotionPrime::BaseElement.factory(:table_header,
+        screen: screen,
+        styles: styles,
+        parent_view: table_view,
         reuse_identifier: reuse_identifier,
         section: header
       )

data/motion-prime/version.rb

@@ -1,3 +1,3 @@
 module MotionPrime
-  VERSION = "0.9.4"
+  VERSION = "0.9.5"
 end

data/motion-prime/views/_frame_calculator_mixin.rb

@@ -1,6 +1,6 @@
 module MotionPrime
   module FrameCalculatorMixin
-    def calculate_frome_for(bounds, options)
+    def calculate_frame_for(bounds, options)
       width   = options[:width]
       height  = options[:height]
       top     = options[:top]

data/motion-prime/views/view_styler.rb

@@ -30,7 +30,7 @@ module MotionPrime
     end
 
     def prepare_frame_for(bounds)
-      options[:frame] = calculate_frome_for(bounds, options.merge(test: view.is_a?(UITextView)))
+      options[:frame] = calculate_frame_for(bounds, options.merge(test: view.is_a?(UITextView)))
       if options.slice(:width, :height, :right, :bottom, :height_to_fit).values.any?
         mask = UIViewAutoresizingNone
         mask |= UIViewAutoresizingFlexibleTopMargin if options[:top].nil?
@@ -84,91 +84,151 @@ module MotionPrime
     def set_option(key, value)
       # return if value.nil?
       # ignore options
-      return if key == 'section' && !view.respond_to?(:section=)
-      return if key == 'size_to_fit' && view.is_a?(UILabel)
-      return if %w[url default draw_in_rect].include?(key.to_s) && view.is_a?(UIImageView)
-      return if %w[
-        styles has_drawn_content
-        width height top right bottom left value_type
-        max_width max_outer_width min_width min_outer_width
-        max_height max_outer_height min_height min_outer_width
-        height_to_fit container parent_frame].include? key.to_s
+      return if ignore_option?(key)
 
       # apply options
-      if key.end_with?('title_color')
-        view.setTitleColor value.uicolor, forState: UIControlStateNormal
-      elsif key.end_with?('alignment') && value.is_a?(Symbol)
-        view.setValue value.uitextalignment, forKey: camelize_factory(key)
-      elsif key.end_with?('line_break_mode') && value.is_a?(Symbol)
-        view.setValue value.uilinebreakmode, forKey: camelize_factory(key)
-      elsif key.end_with?('title_shadow_color')
-        view.setTitleShadowColor value.uicolor, forState: UIControlStateNormal
-      elsif key.end_with?('color')
-        color = value.try(:uicolor)
-        color = color.cgcolor if view.is_a?(CALayer)
-        view.send :"#{low_camelize_factory(key)}=", color
-      elsif key.end_with?('background_image')
-        if view.is_a?(UIButton)
-          view.setBackgroundImage value.uiimage, forState: UIControlStateNormal
-        elsif view.is_a?(UISearchBar) && key == 'search_field_background_image'
-          view.setSearchFieldBackgroundImage value.uiimage, forState: UIControlStateNormal
-        else
-          view.setBackgroundColor value.uiimage.uicolor
+      result ||= set_color_options(key, value)
+      result ||= set_image_options(key, value)
+      result ||= set_text_options(key, value)
+      result ||= set_inset_options(key, value)
+      result ||= set_layer_options(key, value)
+      result ||= set_other_options(key, value)
+      result ||= set_hash_options(key, value)
+
+      unless result
+        view.setValue value, forKey: low_camelize_factory(key)
+      end
+    end
+
+    protected
+      def set_color_options(key, value)
+        if key.end_with?('color') && view.is_a?(UIControl)
+          view.send :"set#{camelize_factory(key)}:forState", value.uicolor, UIControlStateNormal
+          true
+        elsif key.end_with?('color')
+          color = value.try(:uicolor)
+          color = color.cgcolor if view.is_a?(CALayer)
+          view.send :"#{low_camelize_factory(key)}=", color
+          true
+        elsif key == 'gradient'
+          gradient = prepare_gradient(value)
+          view.layer.insertSublayer(gradient, atIndex: 0)
+          true
         end
-      elsif key.end_with?('background_view')
-        if view.is_a?(UITableView)
-          bg_view = UIView.alloc.initWithFrame(view.bounds)
-          bg_view.backgroundColor = value[:color].uicolor
-          view.backgroundView = bg_view
-        else
-          view.setValue value, forKey: low_camelize_factory(key)
+      end
+
+      def set_image_options(key, value)
+        if key.end_with?('background_image')
+          if view.is_a?(UIControl) || view.is_a?(UISearchBar)
+            view.send :"set#{camelize_factory(key)}:forState", value.uiimage, UIControlStateNormal
+          else
+            view.setBackgroundColor value.uiimage.uicolor
+          end
+          true
+        elsif key.end_with?('background_view')
+          if view.is_a?(UITableView)
+            bg_view = UIView.alloc.initWithFrame(view.bounds)
+            bg_view.backgroundColor = value[:color].uicolor
+            view.backgroundView = bg_view
+          else
+            view.setValue value, forKey: low_camelize_factory(key)
+          end
+          true
+        elsif key.end_with?('image')
+          view.setValue value.uiimage, forKey: camelize_factory(key)
+          true
         end
-      elsif key.end_with?('image')
-        view.setValue value.uiimage, forKey: camelize_factory(key)
-      elsif key.end_with?('_content_inset')
-        current_inset = view.contentInset
-        current_inset.send("#{key.partition('_').first}=", value)
-        view.contentInset = current_inset
-      elsif key == 'autocapitalization'
-        view.autocapitalizationType = UITextAutocapitalizationTypeNone if value === false
-      elsif key == 'keyboard_type'
-        view.setKeyboardType value.uikeyboardtype
-      elsif key == 'rounded_corners'
-        radius = value[:radius].to_f
-        corner_consts = {top_left: UIRectCornerTopLeft, bottom_left: UIRectCornerBottomLeft, bottom_right: UIRectCornerBottomRight, top_right: UIRectCornerTopRight}
-        corners = value[:corners].inject(0) { |result, corner| result|corner_consts[corner] }
-        size = options[:parent_frame].size
-        bounds = CGRectMake(0, 0, size.width, size.height)
-        mask_path = UIBezierPath.bezierPathWithRoundedRect(bounds, byRoundingCorners: corners, cornerRadii: CGSizeMake(radius, radius))
-        mask_layer = CAShapeLayer.layer
-        mask_layer.frame = bounds
-        mask_layer.path = mask_path.CGPath
-        view.mask = mask_layer
-      elsif key == 'attributed_text'
-        if view.is_a?(UIButton)
-          view.setAttributedTitle value, forState: UIControlStateNormal
-        else
-          view.attributedText = value
+      end
+
+      def set_text_options(key, value)
+        if key.end_with?('alignment') && value.is_a?(Symbol)
+          view.setValue value.uitextalignment, forKey: camelize_factory(key)
+          true
+        elsif key.end_with?('line_break_mode') && value.is_a?(Symbol)
+          view.setValue value.uilinebreakmode, forKey: camelize_factory(key)
+          true
+        elsif key == 'autocapitalization'
+          view.autocapitalizationType = UITextAutocapitalizationTypeNone if value === false
+          true
+        elsif key == 'attributed_text'
+          if view.is_a?(UIButton)
+            view.setAttributedTitle value, forState: UIControlStateNormal
+          else
+            view.attributedText = value
+          end
+          true
         end
-      elsif key == 'gradient'
-        gradient = prepare_gradient(value)
-        view.layer.insertSublayer(gradient, atIndex: 0)
-      elsif key == 'selection_style' && view.is_a?(UITableViewCell) && value.is_a?(Symbol)
-        view.setSelectionStyle value.uitablecellselectionstyle
-      elsif key == 'estimated_cell_height' && view.is_a?(UITableView)
-        view.setEstimatedRowHeight value
-      elsif key == 'separator_inset' && (view.is_a?(UITableViewCell) || view.is_a?(UITableView))
-        if value.to_s == 'none'
-          view.separatorInset = UIEdgeInsetsMake(0, 320, 0, 0)
-        elsif value.is_a?(Array) && value.count == 2
-          view.separatorInset = UIEdgeInsetsMake(0, value.first, 0, value.last)
+      end
+
+      def set_inset_options(key, value)
+        if key.end_with?('_content_inset')
+          current_inset = view.contentInset
+          current_inset.send("#{key.partition('_').first}=", value)
+          view.contentInset = current_inset
+          true
+        elsif key.end_with?('inset')
+          inset = if value.to_s == 'none'
+            UIEdgeInsetsMake(0, 320, 0, 0)
+          elsif value.is_a?(Array) && value.count == 2
+            UIEdgeInsetsMake(0, value.first, 0, value.last)
+          elsif value.is_a?(Array) && value.count == 4
+            UIEdgeInsetsMake(value[0], value[1], value[2], value[3])
+          end
+          view.send(:"#{low_camelize_factory(key)}=", inset) if inset
+          true
         end
-      elsif value.is_a?(Hash)
-        self.class.new(view.send(low_camelize_factory(key).to_sym), nil, value.merge(parent_frame: options[:frame] || options[:parent_frame])).apply
-      else
-        view.setValue value, forKey: low_camelize_factory(key)
       end
-    end
+
+      def set_layer_options(key, value)
+        if key == 'rounded_corners'
+          radius = value[:radius].to_f
+          corner_consts = {top_left: UIRectCornerTopLeft, bottom_left: UIRectCornerBottomLeft, bottom_right: UIRectCornerBottomRight, top_right: UIRectCornerTopRight}
+          corners = value[:corners].inject(0) { |result, corner| result|corner_consts[corner] }
+          size = options[:parent_frame].size
+          bounds = CGRectMake(0, 0, size.width, size.height)
+          mask_path = UIBezierPath.bezierPathWithRoundedRect(bounds, byRoundingCorners: corners, cornerRadii: CGSizeMake(radius, radius))
+          mask_layer = CAShapeLayer.layer
+          mask_layer.frame = bounds
+          mask_layer.path = mask_path.CGPath
+          view.mask = mask_layer
+          true
+        end
+      end
+
+      def set_hash_options(key, value)
+        if value.is_a?(Hash)
+          self.class.new(
+            view.send(low_camelize_factory(key).to_sym), nil,
+            value.merge(parent_frame: options[:frame] || options[:parent_frame])
+          ).apply
+          true
+        end
+      end
+
+      def set_other_options(key, value)
+        if key == 'keyboard_type'
+          view.setKeyboardType value.uikeyboardtype
+          true
+        elsif key == 'selection_style' && view.is_a?(UITableViewCell) && value.is_a?(Symbol)
+          view.setSelectionStyle value.uitablecellselectionstyle
+          true
+        elsif key == 'estimated_cell_height' && view.is_a?(UITableView)
+          view.setEstimatedRowHeight value
+          true
+        end
+      end
+
+      def ignore_option?(key)
+        (key == 'section' && !view.respond_to?(:section=)) ||
+        (key == 'size_to_fit' && view.is_a?(UILabel)) ||
+        (%w[url default draw_in_rect].include?(key.to_s) && view.is_a?(UIImageView)) ||
+        %w[
+          styles has_drawn_content value_type height_to_fit container parent_frame
+          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
+        ].include?(key.to_s)
+      end
 
     STRUCTS_MAP = {
       CGAffineTransform   => Proc.new {|v| NSValue.valueWithCGAffineTransform(v) },

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motion-prime
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors:
 - Iskander Haziev
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-15 00:00:00.000000000 Z
+date: 2014-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -143,14 +143,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: methadone
   requirement: !ruby/object:Gem::Requirement
@@ -346,6 +346,8 @@ files:
 - motion-prime/screens/_navigation_mixin.rb
 - motion-prime/screens/_orientations_mixin.rb
 - motion-prime/screens/_sections_mixin.rb
+- motion-prime/screens/controllers/navigation_controller.rb
+- motion-prime/screens/controllers/tab_bar_controller.rb
 - motion-prime/screens/extensions/_indicators_mixin.rb
 - motion-prime/screens/extensions/_navigation_bar_mixin.rb
 - motion-prime/screens/screen.rb
@@ -392,7 +394,6 @@ files:
 - motion-prime/support/mp_text_view.rb
 - motion-prime/support/mp_view_controller.rb
 - motion-prime/support/mp_view_with_section.rb
-- motion-prime/support/tab_bar_controller.rb
 - motion-prime/support/temp_fixes.rb
 - motion-prime/support/ui_view.rb
 - motion-prime/version.rb