motion-prime 0.9.9 → 0.9.9.1

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

@@ -3,13 +3,13 @@ module MotionPrime
     def add_pull_to_refresh(options = {}, &block)
       screen.automaticallyAdjustsScrollViewInsets = false
 
-      table_view.addPullToRefreshWithActionHandler(block) # block must be a variable
-      screen.set_options_for table_view.pullToRefreshView, styles: [:base_pull_to_refresh]
+      collection_view.addPullToRefreshWithActionHandler(block) # block must be a variable
+      screen.set_options_for collection_view.pullToRefreshView, styles: [:base_pull_to_refresh]
     end
 
     def finish_pull_to_refresh
       reload_data
-      table_view.pullToRefreshView.stopAnimating
+      collection_view.pullToRefreshView.stopAnimating
     end
   end
 end

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

@@ -2,6 +2,7 @@ module MotionPrime
   class TableDelegate
     include DelegateMixin
     attr_accessor :table_section
+
     def initialize(options)
       self.table_section = options[:section].try(:weak_ref)
       @section_instance = table_section.to_s

data/motion-prime/styles/_mixins.rb

@@ -1,4 +1,4 @@
-motion_require '../views/styles.rb'
+motion_require '../views/styles'
 MotionPrime::Styles.define :_mixin do
   style :label_reset,
     top: nil, left: nil, height: nil, right: nil, bottom: nil, top: nil,

data/motion-prime/styles/base.rb

@@ -1,4 +1,4 @@
-motion_require '../views/styles.rb'
+motion_require '../views/styles'
 MotionPrime::Styles.define :base do
   # basic screen styles
   style :screen,
@@ -9,17 +9,23 @@ MotionPrime::Styles.define :base do
   style :table,
     top: 0,
     left: 0,
-    width: 320,
+    right: 0,
     bottom: 0,
     separator_inset: 0
 
+  style :collection,
+    top: 0,
+    left: 0,
+    right: 0,
+    bottom: 0
+
   style :table_cell,
     background_color: :clear
 
   # basic form styles
   # ----------
   style :form,
-    width: 320,
+    right: 0,
     left: 0,
     top: 0,
     right: 0,
@@ -41,14 +47,22 @@ MotionPrime::Styles.define :base do
     height: 44
 
   style :segmented_control,
-    height: 40, width: 320, top: 0
+    height: 40,
+    left: 0,
+    right: 0,
+    top: 0
 
   style :google_map,
-    top: 0, left: 0, right: 0, bottom: 0
+    top: 0,
+    left: 0,
+    right: 0,
+    bottom: 0
 
   style :spinner,
     annular: true,
-    center: proc { screen.view.center }, width: 37, height: 37,
+    center: proc { screen.view.center },
+    width: 37,
+    height: 37,
     progress_tint_color: :app_base.uicolor,
     background_tint_color: :black.uicolor(0.05),
     progress: 0.25

data/motion-prime/styles/form.rb

@@ -1,4 +1,4 @@
-motion_require '../views/styles.rb'
+motion_require '../views/styles'
 MotionPrime::Styles.define :base_form do
   style :header, container: {height: 25}
   style :header_label, mixins: [:multiline],

data/motion-prime/support/_control_content_alignment.rb

@@ -0,0 +1,39 @@
+module MotionPrime
+  module SupportControlContentAlignment
+    VERTICAL_ALIGNMENT_CONSTS = {
+      UIControlContentVerticalAlignmentCenter => :center,
+      UIControlContentVerticalAlignmentTop => :top,
+      UIControlContentVerticalAlignmentBottom => :bottom,
+      UIControlContentVerticalAlignmentFill => :fill # TODO: handle this value
+    }
+    def setContentVerticalAlignment(value)
+      return unless @_content_vertical_alignment = VERTICAL_ALIGNMENT_CONSTS[value]
+      super
+    end
+
+    def padding_top
+      padding_top = self.paddingTop || self.padding
+      if @_content_vertical_alignment == :bottom
+        padding_bottom = self.paddingBottom || self.padding
+        bounds_height - padding_bottom.to_i - line_height
+      elsif @_content_vertical_alignment == :top
+        padding_top.to_i
+      else # center label
+        padding_top_offset = padding_top.to_i - (self.paddingBottom || self.padding).to_i
+        (bounds_height - line_height)/2 + 1 + padding_top_offset
+      end
+    end
+
+    def padding_bottom
+      (bounds_height - (line_height + padding_top))
+    end
+
+    def line_height
+      @_line_height || self.font.pointSize
+    end
+
+    def bounds_height
+      self.bounds.size.height
+    end
+  end
+end

data/motion-prime/support/mp_button.rb

@@ -1,8 +1,11 @@
-motion_require '../support/_key_value_store'
-motion_require '../support/_padding_attribute'
+motion_require '_key_value_store'
+motion_require '_padding_attribute'
+motion_require '_control_content_alignment'
 class MPButton < UIButton
   include MotionPrime::SupportKeyValueStore
   include MotionPrime::SupportPaddingAttribute
+  include MotionPrime::SupportControlContentAlignment
+
   attr_accessor :sizeToFit
 
   def setTitle(value)
@@ -26,17 +29,6 @@ class MPButton < UIButton
     5
   end
 
-  def padding_top # to center title label
-    self.paddingTop || self.padding || begin
-      single_line_height = self.font.pointSize
-      (self.bounds.size.height - single_line_height)/2 + 1
-    end
-  end
-
-  def padding_bottom
-    self.bounds.size.height - (self.font.pointSize + padding_top)
-  end
-
   def apply_padding!(rect)
     self.setTitleEdgeInsets(padding_insets)
   end

data/motion-prime/support/mp_collection_cell_with_section.rb

@@ -0,0 +1,12 @@
+class MPCollectionCellWithSection < UICollectionViewCell
+  attr_reader :section
+
+  def setSection(section)
+    @section = section.try(:weak_ref)
+  end
+
+  def drawRect(rect)
+    section.try(:draw_in, rect)
+    super
+  end
+end

data/motion-prime/support/{mp_cell_with_section.rb → mp_table_cell_with_section.rb}

@@ -1,4 +1,4 @@
-class MPCellWithSection < UITableViewCell
+class MPTableCellWithSection < UITableViewCell
   attr_reader :section
   attr_accessor :scroll_view, :content_view
 

data/motion-prime/support/mp_text_field.rb

@@ -1,13 +1,15 @@
 # This class have some modifications for UITextField:
 # * support padding, padding_left, padding_right options
 # * support placeholder_color, placeholder_font options
-motion_require '../support/_key_value_store'
-motion_require '../support/_padding_attribute'
+motion_require '_key_value_store'
+motion_require '_padding_attribute'
+motion_require '_control_content_alignment'
 class MPTextField < UITextField
   include MotionPrime::SupportKeyValueStore
   include MotionPrime::SupportPaddingAttribute
-  attr_accessor :placeholderColor, :placeholderFont, :readonly, :placeholderAlignment
+  include MotionPrime::SupportControlContentAlignment
 
+  attr_accessor :placeholderColor, :placeholderFont, :readonly, :placeholderAlignment
 
   def self.default_padding_left
     5
@@ -19,38 +21,42 @@ class MPTextField < UITextField
 
   # placeholder position
   def textRectForBounds(bounds)
-    calculate_rect_for(bounds)
+    @_line_height = placeholder_font.pointSize
+    rect = calculate_rect_for(bounds)
+    @_line_height = nil
+    rect
   end
 
   # text position
   def editingRectForBounds(bounds)
-    calculate_rect_for(bounds)
+    @_line_height = self.font.pointSize
+    rect = calculate_rect_for(bounds)
+    @_line_height = nil
+    rect
   end
 
   def drawPlaceholderInRect(rect)
     color = self.placeholderColor || :gray.uicolor
     color.setFill
-    font = self.placeholderFont || self.font || :system.uifont(16)
 
     truncation = :tail_truncation.uilinebreakmode
-    alignment = (placeholderAlignment || :left)
-    alignment = alignment.nstextalignment if alignment.is_a?(Symbol)
-    self.placeholder.drawInRect(rect, withFont: font, lineBreakMode: truncation, alignment: alignment)
+    alignment = (placeholderAlignment || :left.nstextalignment)
+    self.placeholder.drawInRect(rect, withFont: placeholder_font, lineBreakMode: truncation, alignment: alignment)
   end
 
-  def padding_top # to center title label
-    self.paddingTop || self.padding || begin
-      single_line_height = self.font.pointSize
-      (self.bounds.size.height - single_line_height)/2 + 1
+  private
+    def placeholder_font
+      self.placeholderFont || self.font || :system.uifont(16)
     end
-  end
 
-  private
     def calculate_rect_for(bounds)
-      height_diff = self.bounds.size.height - (self.font.pointSize + padding_top + padding_bottom)
+      height_diff = self.bounds.size.height - (line_height + padding_top + padding_bottom)
       bounds = CGRectMake(bounds.origin.x, bounds.origin.y, bounds.size.width, bounds.size.height - height_diff)
       CGRectMake(
-        bounds.origin.x + padding_left, bounds.origin.y + padding_top,
-        bounds.size.width - (padding_left + padding_right), bounds.size.height - (padding_top + padding_bottom))
+        bounds.origin.x + padding_left,
+        bounds.origin.y + padding_top,
+        bounds.size.width - (padding_left + padding_right),
+        bounds.size.height - (padding_top + padding_bottom)
+      )
     end
 end

data/motion-prime/support/mp_text_view.rb

@@ -6,6 +6,7 @@ motion_require '../support/_padding_attribute'
 class MPTextView < UITextView
   include MotionPrime::SupportKeyValueStore
   include MotionPrime::SupportPaddingAttribute
+
   attr_accessor :placeholderColor, :placeholderFont, :placeholder
 
   def self.default_padding_left

data/motion-prime/version.rb

@@ -1,3 +1,3 @@
 module MotionPrime
-  VERSION = "0.9.9"
+  VERSION = "0.9.9.1"
 end

data/motion-prime/views/_frame_calculator_mixin.rb

@@ -19,8 +19,8 @@ module MotionPrime
 
       max_width = parent_bounds.size.width
       max_height = parent_bounds.size.height
-      width = 0.0 if width.nil?
-      height = 0.0 if height.nil?
+      temp_width = width || 0.0
+      temp_height = height || 0.0
 
       if left && left > 0 && left <= 1 && value_type != 'absolute' && left.is_a?(Float)
         left = max_width * left
@@ -41,7 +41,7 @@ module MotionPrime
       end
 
       # calculate top and bottom if height is relative, e.g 0.7
-      if height && height > 0 && height <= 1 && value_type != 'absolute' && width.is_a?(Float)
+      if height && height > 0 && height <= 1 && value_type != 'absolute' && height.is_a?(Float)
         if bottom.nil?
           top ||= 0
           bottom = max_height - max_height * height
@@ -52,27 +52,31 @@ module MotionPrime
 
       if !left.nil? && !right.nil?
         frame.origin.x = left
-        width = max_width - left - right if options[:height_to_fit].nil?
+        if options[:height_to_fit].nil? && width.nil?
+          width = max_width - left - right
+        end
       elsif !right.nil?
-        frame.origin.x = max_width - width - right
+        frame.origin.x = max_width - temp_width - right
       elsif !left.nil?
         frame.origin.x = left
       else
-        frame.origin.x = max_width / 2 - width / 2
+        frame.origin.x = max_width / 2 - temp_width / 2
       end
-      frame.size.width = width
+      frame.size.width = width || 0.0
 
       if !top.nil? && !bottom.nil?
         frame.origin.y = top
-        height = max_height - top - bottom if options[:height_to_fit].nil?
+        if options[:height_to_fit].nil? && height.nil?
+          height = max_height - top - bottom
+        end
       elsif !bottom.nil?
-        frame.origin.y = max_height - height - bottom
+        frame.origin.y = max_height - temp_height - bottom
       elsif !top.nil?
         frame.origin.y = top
       else
-        frame.origin.y = max_height / 2 - height / 2
+        frame.origin.y = max_height / 2 - temp_height / 2
       end
-      frame.size.height = height
+      frame.size.height = height || 0.0
 
       frame
     rescue => e

data/motion-prime/views/layout.rb

@@ -1,5 +1,6 @@
 # TODO: make it part of Sections
-motion_require '../support/mp_cell_with_section'
+motion_require '../support/mp_table_cell_with_section'
+motion_require '../support/mp_collection_cell_with_section'
 motion_require '../support/mp_spinner'
 motion_require '../support/mp_button'
 motion_require '../support/mp_label'
@@ -17,7 +18,7 @@ module MotionPrime
       else
         view_stack.last.bounds
       end
-      builder = ViewBuilder.new(klass, options)
+      builder = ViewBuilder.new(klass, options.merge(parent_bounds: parent_bounds))
       options = builder.options.merge(calculate_frame: true, parent_bounds: parent_bounds)
       view = builder.view
       insert_index = options.delete(:at_index)
@@ -51,8 +52,9 @@ module MotionPrime
       base.class_eval do
         [::UIActionSheet, ::UIActivityIndicatorView, ::MPButton, ::UIDatePicker, ::UIImageView, ::MPLabel,
           ::UIPageControl, ::UIPickerView, ::UIProgressView, ::UIScrollView, ::UISearchBar, ::UISegmentedControl,
-          ::UISlider, ::UIStepper, ::UISwitch, ::UITabBar, ::UITableView, ::UITableViewCell, ::MPTextField, ::MPTextView,
-          ::UIToolbar, ::UIWebView, ::UINavigationBar, ::MPCellWithSection, ::MBProgressHUD, ::MPSpinner].each do |klass|
+          ::UISlider, ::UIStepper, ::UISwitch, ::UITabBar, ::UICollectionView, ::UITableView, ::UITableViewCell,
+          ::MPTextField, ::MPTextView, ::UIToolbar, ::UIWebView, ::UINavigationBar,
+          ::MPTableCellWithSection, ::MPCollectionCellWithSection, ::MBProgressHUD, ::MPSpinner].each do |klass|
 
           shorthand = "#{klass}"[2..-1].underscore.to_sym
 

data/motion-prime/views/view_builder.rb

@@ -86,6 +86,16 @@ module MotionPrime
             view.tableFooterView = UIView.new
             view
           },
+          'UICollectionView' => Proc.new{|klass, options|
+            unless layout = options.delete(:layout)
+              layout = UICollectionViewFlowLayout.alloc.init
+              total_width = options[:parent_bounds].size.width / (options.delete(:grid_size) || 4)
+              width = total_width - layout.minimumInteritemSpacing
+              layout.setItemSize CGSizeMake(width, options.delete(:item_height) || 100)
+            end
+            view = klass.alloc.initWithFrame CGRectZero, collectionViewLayout: layout
+            view
+          },
           'UITableViewCell' => Proc.new{|klass, options|
             style = options.delete(:style) || UITableViewCellStyleDefault
             if options[:has_drawn_content]

data/motion-prime/views/view_styler.rb

@@ -5,6 +5,8 @@ module MotionPrime
     include HasClassFactory
     include ElementTextMixin
 
+    ORDER = %w[font placeholder_font text]
+
     attr_reader :view, :options
 
     def initialize(view, parent_bounds = CGRectZero, options = {})
@@ -46,7 +48,7 @@ module MotionPrime
     def prepare_options!
       if options[:size_to_fit]
         options[:line_break_mode] ||= :word_wrap
-        options[:number_of_lines] ||= 0
+        options[:number_of_lines] ||= 0 if view.is_a?(UILabel)
       end
 
       if options.slice(:html, :line_spacing, :line_height, :underline, :fragment_color).any?
@@ -63,6 +65,8 @@ module MotionPrime
       end
       extract_font_options(options)
       extract_font_options(options, 'placeholder')
+
+      @options = Hash[options.sort_by { |k,v| ORDER.index(k.to_s).to_i }]
     end
 
     def extract_font_options(options, prefix = nil)

data/spec/factories/scaffold/sections/tasks/index_table.rb

@@ -1,5 +1,5 @@
 class TasksIndexTableSection < Prime::TableSection
-  def table_data
+  def collection_data
     Task.all.map do |model|
       TasksIndexCellSection.new(model: model)
     end

data/spec/unit/support/filter_mixin_spec.rb

@@ -1,4 +1,8 @@
 describe MotionPrime::FilterMixin do
+  before do
+    @subject = MotionPrime::FilterMixin.new
+  end
+
   def data
     model_stub = Struct.new(:info, :id) # :id is used for sorting
     data_array.map do |item|
@@ -11,15 +15,15 @@ describe MotionPrime::FilterMixin do
   end
 
   it "should filter array by inclusion" do
-    MotionPrime::FilterMixin.new.filter_array(data, {id: %w[4 5]}).count.should.equal 2
+    @subject.filter_array(data, {id: %w[4 5]}).count.should.equal 2
   end
 
   it "should find a single record (case sensitive)" do
-    MotionPrime::FilterMixin.new.filter_array(data, {id: 4, name: 'iPhone'}).count.should.equal 1
+    @subject.filter_array(data, {id: 4, name: 'iPhone'}).count.should.equal 1
   end
 
   it "order filtered records" do
-    result = MotionPrime::FilterMixin.new.filter_array(data, {id: %w[4 5]}, sort: {id: :desc})
+    result = @subject.filter_array(data, {id: %w[4 5]}, sort: {id: :desc})
     result.first[:id].should.equal 5
   end
 end