motion-prime 0.4.3 → 0.4.4

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

@@ -0,0 +1,48 @@
+module MotionPrime
+  class TableDelegate
+    attr_accessor :table_section
+    def initialize(options)
+      self.table_section = options[:section].try(:weak_ref)
+    end
+
+    def numberOfSectionsInTableView(table)
+      table_section.number_of_sections(table)
+    end
+
+    def tableView(table, cellForRowAtIndexPath: index)
+      table_section.cell_for_index(table, index)
+    end
+
+    def tableView(table, numberOfRowsInSection: section)
+      table_section.rows_for_section(section).try(:count).to_i
+    end
+
+    def tableView(table, heightForRowAtIndexPath: index)
+      table_section.height_for_index(table, index)
+    end
+
+    def tableView(table, didSelectRowAtIndexPath:index)
+      table_section.on_click(table, index)
+    end
+
+    def tableView(table, viewForHeaderInSection: section)
+      table_section.view_for_header_in_section(table, section)
+    end
+
+    def tableView(table, heightForHeaderInSection: section)
+      table_section.height_for_header_in_section(table, section)
+    end
+
+    def scrollViewWillBeginDragging(scroll)
+      table_section.scroll_view_will_begin_dragging(scroll)
+    end
+
+    def scrollViewDidEndDecelerating(scroll)
+      table_section.scroll_view_did_end_decelerating(scroll)
+    end
+
+    def scrollViewDidEndDragging(scroll, willDecelerate: will_decelerate)
+      table_section.scroll_view_did_end_dragging(scroll, willDecelerate: will_decelerate)
+    end
+  end
+end

data/motion-prime/styles/form.rb

@@ -14,7 +14,7 @@ MotionPrime::Styles.define :base_form do
     width: 320
 
   style :field,
-    selection_style: UITableViewCellSelectionStyleNone,
+    selection_style: :none,
     background_color: :clear
 
   style :with_sections,

data/motion-prime/support/mp_cell_with_section.rb

@@ -2,11 +2,15 @@ class MPCellWithSection < UITableViewCell
   attr_accessor :section
 
   def setSection(section)
-    @section = section
+    @section = section.try(:weak_ref)
   end
 
   def drawRect(rect)
     super
-    section.draw_in(rect) if section.respond_to?(:draw_in)
+    draw_in(rect)
+  end
+
+  def draw_in(rect)
+    section and section.draw_in(rect) if section.respond_to?(:draw_in)
   end
 end

data/motion-prime/support/mp_view_with_section.rb

@@ -2,7 +2,7 @@ class MPViewWithSection < UIView
   attr_accessor :section
 
   def setSection(section)
-    @section = section
+    @section = section.try(:weak_ref)
   end
 
   def drawRect(rect)

data/motion-prime/version.rb

@@ -1,3 +1,3 @@
 module MotionPrime
-  VERSION = "0.4.3"
+  VERSION = "0.4.4"
 end

data/motion-prime/views/_frame_calculator_mixin.rb

@@ -43,31 +43,27 @@ module MotionPrime
 
       if !left.nil? && !right.nil?
         frame.origin.x = left
-        frame.size.width = max_width - left - right
+        width = max_width - left - right
       elsif !right.nil?
         frame.origin.x = max_width - width - right
-        frame.size.width = width
       elsif !left.nil?
         frame.origin.x = left
-        frame.size.width = width
       else
         frame.origin.x = max_width / 2 - width / 2
-        frame.size.width = width
       end
+      frame.size.width = width
 
       if !top.nil? && !bottom.nil?
         frame.origin.y = top
-        frame.size.height = max_height - top - bottom
+        height = max_height - top - bottom if options[:height_to_fit].nil?
       elsif !bottom.nil?
         frame.origin.y = max_height - height - bottom
-        frame.size.height = height
       elsif !top.nil?
         frame.origin.y = top
-        frame.size.height = height
       else
         frame.origin.y = max_height / 2 - height / 2
-        frame.size.height = height
       end
+      frame.size.height = height
 
       frame
     end

data/motion-prime/views/layout.rb

@@ -17,6 +17,7 @@ module MotionPrime
       elsif view_stack.any?
         view_stack.last.addSubview(view)
       end
+
       setup(view, options, &block)
       view.on_added if view.respond_to?(:on_added)
 

data/motion-prime/views/view_styler.rb

@@ -28,8 +28,7 @@ module MotionPrime
     end
 
     def prepare_frame_for(bounds)
-      options[:frame] = calculate_frome_for(bounds, options)
-
+      options[:frame] = calculate_frome_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?
@@ -37,7 +36,7 @@ module MotionPrime
         mask |= UIViewAutoresizingFlexibleBottomMargin if options[:bottom].nil?
         mask |= UIViewAutoresizingFlexibleRightMargin if options[:right].nil?
         mask |= UIViewAutoresizingFlexibleWidth if !options[:left].nil? && !options[:right].nil?
-        mask |= UIViewAutoresizingFlexibleHeight if !options[:top].nil? && !options[:bottom].nil?
+        mask |= UIViewAutoresizingFlexibleHeight if options[:height_to_fit].nil? && (!options[:top].nil? && !options[:bottom].nil?)
         options[:autoresizingMask] = mask
       end
     end
@@ -47,7 +46,7 @@ module MotionPrime
       # ignore options
       return if key == 'section' && !view.respond_to?(:section=)
       return if key == 'size_to_fit' && view.is_a?(UILabel)
-      return if (key == 'url' || key == 'default') && view.is_a?(UIImageView)
+      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
@@ -105,14 +104,6 @@ module MotionPrime
         mask_layer.frame = bounds
         mask_layer.path = mask_path.CGPath
         view.mask = mask_layer
-      elsif key == 'mask'
-        radius = value[:radius]
-        bounds = CGRectMake(0, 0, value[:width], value[:height])
-        mask_path = UIBezierPath.bezierPathWithRoundedRect(bounds, byRoundingCorners: UIRectCornerAllCorners, cornerRadii: CGSizeMake(radius, radius))
-        mask_layer = CAShapeLayer.layer
-        mask_layer.frame = bounds
-        mask_layer.path = mask_path.CGPath
-        view.layer.mask = mask_layer
       elsif key == 'attributed_text_options'
         attributes = {}
         if line_spacing = value[:line_spacing]

metadata

@@ -1,153 +1,153 @@
 --- !ruby/object:Gem::Specification
 name: motion-prime
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Iskander Haziev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-14 00:00:00.000000000 Z
+date: 2013-12-23 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'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bubble-wrap
   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: sugarcube
   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: 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'
 description: RubyMotion apps development framework
@@ -172,6 +172,7 @@ files:
 - doc/SECTION.md
 - doc/STYLE.md
 - doc/code/getting_started.rb
+- doc/code/screens.rb
 - doc/docs/docco.css
 - doc/docs/getting_started.html
 - doc/docs/public/fonts/aller-bold.eot
@@ -184,10 +185,13 @@ files:
 - doc/docs/public/fonts/novecento-bold.ttf
 - doc/docs/public/fonts/novecento-bold.woff
 - doc/docs/public/stylesheets/normalize.css
+- doc/docs/screens.html
 - files/Gemfile
+- files/Gemfile.lock
 - files/Rakefile
 - files/app/app_delegate.rb
 - files/app/config/base.rb
+- files/app/environment.rb
 - files/app/models/.gitkeep
 - files/app/screens/application_screen.rb
 - files/app/screens/help_screen.rb
@@ -202,6 +206,8 @@ files:
 - files/resources/Icon.png
 - files/resources/fonts/ubuntu.ttf
 - files/resources/images/arrow.png
+- files/resources/images/menu_button.png
+- files/resources/images/menu_button@2x.png
 - lib/motion-prime.rb
 - motion-prime.gemspec
 - motion-prime/api_client.rb
@@ -211,6 +217,7 @@ files:
 - motion-prime/core_ext/kernel.rb
 - motion-prime/elements/_content_padding_mixin.rb
 - motion-prime/elements/_content_text_mixin.rb
+- motion-prime/elements/_text_mixin.rb
 - motion-prime/elements/base_element.rb
 - motion-prime/elements/button.rb
 - motion-prime/elements/draw.rb
@@ -255,7 +262,7 @@ files:
 - motion-prime/screens/extensions/_navigation_bar_mixin.rb
 - motion-prime/screens/sidebar_container_screen.rb
 - motion-prime/sections/_cell_section_mixin.rb
-- motion-prime/sections/_draw_mixin.rb
+- motion-prime/sections/_draw_section_mixin.rb
 - motion-prime/sections/base_section.rb
 - motion-prime/sections/form.rb
 - motion-prime/sections/form/base_field_section.rb
@@ -270,6 +277,7 @@ files:
 - motion-prime/sections/tabbed.rb
 - motion-prime/sections/table.rb
 - motion-prime/sections/table/refresh_mixin.rb
+- motion-prime/sections/table/table_delegate.rb
 - motion-prime/services/table_data_indexes.rb
 - motion-prime/styles/_mixins.rb
 - motion-prime/styles/base.rb
@@ -318,17 +326,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.5
+rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
 summary: RubyMotion apps development framework

data/motion-prime/sections/_draw_mixin.rb

@@ -1,66 +0,0 @@
-module MotionPrime
-  module DrawMixin
-    include HasStyles
-    attr_accessor :container_element, :container_gesture_recognizers
-
-    def container_view
-      container_element.try(:view)
-    end
-
-    def draw_in(rect)
-      draw_background(rect)
-      draw_elements(rect)
-    end
-
-    def bind_gesture_on_container_for(element, action, receiver = nil)
-      self.container_gesture_recognizers ||= begin
-        set_container_gesture_recognizer
-        []
-      end
-      self.container_gesture_recognizers << {element: element, action: action, receiver: receiver}
-    end
-
-    private
-      def set_container_gesture_recognizer
-        single_tap = UITapGestureRecognizer.alloc.initWithTarget(self, action: 'on_container_tap_gesture:')
-        single_tap.cancelsTouchesInView = false
-        container_view.addGestureRecognizer single_tap
-        container_view.setUserInteractionEnabled true
-      end
-
-      def on_container_tap_gesture(recognizer)
-        target = Array.wrap(container_gesture_recognizers).detect do |gesture_data|
-          CGRectContainsPoint(gesture_data[:element].computed_frame, recognizer.locationInView(container_view))
-        end
-        (target[:receiver] || self).send(target[:action], recognizer, target[:element]) if target
-      end
-
-      def draw_elements(rect)
-        elements_to_draw.each do |key, element|
-          element.draw_in(rect)
-        end
-      end
-
-      def draw_background(rect)
-        options = container_element.computed_options
-
-        if gradient_options = options[:gradient]
-          start_point = CGPointMake(CGRectGetMidX(rect), CGRectGetMinY(rect))
-          end_point = CGPointMake(CGRectGetMidX(rect), CGRectGetMaxY(rect))
-
-          context = UIGraphicsGetCurrentContext()
-          # CGContextSaveGState(context)
-          CGContextAddRect(context, rect)
-          CGContextClip(context)
-          gradient = prepare_gradient(gradient_options)
-          CGContextDrawLinearGradient(context, gradient, start_point, end_point, 0)
-          # CGContextRestoreGState(context)
-        elsif background_color = options[:background_color]
-          unless background_color.uicolor == :clear.uicolor
-            background_color.uicolor.setFill
-            UIRectFill(rect)
-          end
-        end
-      end
-  end
-end