motion-prime 0.2.1 → 0.3.0

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

@@ -1,6 +1,8 @@
 module MotionPrime
   module TableSectionRefreshMixin
-    def add_pull_to_refresh(&block)
+    def add_pull_to_refresh(options = {}, &block)
+      screen.automaticallyAdjustsScrollViewInsets = false
+
       table_view.addPullToRefreshWithActionHandler(block)
       screen.setup table_view.pullToRefreshView, styles: [:base_pull_to_refresh]
     end

data/motion-prime/styles/base.rb

@@ -10,7 +10,11 @@ MotionPrime::Styles.define :base do
     top: 0,
     left: 0,
     width: 320,
-    bottom: 0
+    bottom: 0,
+    separatorInset: 0
+
+  style :table_cell,
+    background_color: :clear
 
   # basic form styles
   # ----------
@@ -24,52 +28,11 @@ MotionPrime::Styles.define :base do
     separator_color: :clear,
     scroll_enabled: true
 
-  style :form_field,
-    selection_style: UITableViewCellSelectionStyleNone
-
-  # available options for string label:
-  # @background_color: COLOR
-  # @text_color: COLOR
-  style :field_label,
-    background_color: :clear,
-    text_color: :gray,
-    top: 6,
-    height: 20,
-    left: 0,
-    right: 0,
-    font: proc { MotionPrime::Config.font.name.uifont(12) },
-    size_to_fit: true
-
-  # available options for input:
-  # @layer: @border_width: FLOAT
-  # @layer: @border_color: COLOR
-  # @background_color: COLOR
-  # @background_image: PATH_TO_FILE
-  style :field_input,
-    layer: {
-      border_width: 1,
-      border_color: :gray
-    },
-    font: proc { MotionPrime::Config.font.name.uifont(16) },
-    placeholder_font: proc { MotionPrime::Config.font.name.uifont(16) },
-    background_color: :white,
-    left: 0,
-    right: 0,
-    top: 30,
-    bottom: 0,
-    padding_top: 4
-
-  style :field_input_with_errors,
-    layer: {
-      border_color: proc { MotionPrime::Config.color.error }
-    },
-    text_color: proc { MotionPrime::Config.color.error }
-
   # available options for submit button:
   # @button_type: :rounded, :custom
   # @background_color: COLOR
   # @background_image: PATH_TO_FILE
-  style :submit_button,
+  style :submit_button, :form_submit_field_button,
     background_color: :gray,
     title_color: :white,
     left: 0,
@@ -77,59 +40,14 @@ MotionPrime::Styles.define :base do
     top: 10,
     height: 44
 
-  style :select_field_button,
-    background_color: :white,
-    left: 0,
-    right: 0,
-    top: 30,
-    height: 36,
-    title_color: 0x16759a,
-    title_shadow_color: :white,
-    contentHorizontalAlignment: UIControlContentHorizontalAlignmentLeft,
-    layer: {
-      border_color: :gray,
-      border_width: 1
-    },
-    title_color: :gray,
-    title_label: {
-      font: proc { MotionPrime::Config.font.name.uifont(16) }
-    }
-  style :select_field_arrow,
-    image: "images/forms/select_arrow.png",
-    top: 42,
-    right: 5,
-    width: 9,
-    height: 14
-
   style :segmented_control,
     height: 40, width: 320, top: 0
 
   style :google_map,
     top: 0, left: 0, right: 0, bottom: 0
 
-  style :date_picker,
+  style :date_picker, :form_field_date_picker,
     width: 300,
     height: 150,
     top: 30, left: 0
-
-  style :error_message,
-    top: nil,
-    bottom: 0,
-    width: 300,
-    line_break_mode: :wordwrap,
-    number_of_lines: 0,
-    text_color: proc { MotionPrime::Config.color.error }
-
-  style :field_switch,
-    top: 10,
-    width: 79,
-    height: 27,
-    right: 0
-
-  style :switch_label,
-    top: 10,
-    font: proc { MotionPrime::Config.font.name.uifont(16) }
-
-  style :switch_hint,
-    top: 40
 end

data/motion-prime/styles/form.rb

@@ -0,0 +1,116 @@
+motion_require '../views/styles.rb'
+MotionPrime::Styles.define :base_form do
+  style :header, container: {height: 25}
+  style :header_label,
+    left: 0, right: 0, size_to_fit: true,
+    bottom: 20, top: nil
+
+  style :field,
+    selection_style: UITableViewCellSelectionStyleNone,
+    background_color: :clear
+
+  style :with_sections,
+    left: 0,
+    right: 0
+
+  # available options for string label:
+  # @background_color: COLOR
+  # @text_color: COLOR
+  style :field_label,
+    background_color: :clear,
+    text_color: :gray,
+    top: 15,
+    height: 16,
+    left: 0,
+    right: 0,
+    font: proc { MotionPrime::Config.font.name.uifont(12) },
+    size_to_fit: true
+
+  style :field_error_message,
+    top: nil,
+    bottom: 0,
+    width: 300,
+    line_break_mode: :wordwrap,
+    number_of_lines: 0,
+    size_to_fit: true,
+    text_color: proc { MotionPrime::Config.color.error },
+    font: proc { MotionPrime::Config.font.name.uifont(12) }
+
+  # available options for input:
+  # @layer: @border_width: FLOAT
+  # @layer: @border_color: COLOR
+  # @background_color: COLOR
+  # @background_image: PATH_TO_FILE
+  style :field_text_field, :field_text_view,
+    layer: {
+      border_width: 1,
+      border_color: :gray
+    },
+    font: proc { MotionPrime::Config.font.name.uifont(16) },
+    placeholder_font: proc { MotionPrime::Config.font.name.uifont(16) },
+    background_color: :white,
+    left: 0,
+    right: 0,
+    top: 30,
+    bottom: 0
+
+  style :select_field_button,
+    background_color: :white,
+    left: 0,
+    right: 0,
+    top: 30,
+    height: 35,
+    title_color: 0x16759a,
+    title_shadow_color: :white,
+    contentHorizontalAlignment: UIControlContentHorizontalAlignmentLeft,
+    layer: {
+      border_color: :gray,
+      border_width: 1
+    },
+    title_color: :gray,
+    title_label: {
+      font: proc { MotionPrime::Config.font.name.uifont(16) }
+    }
+  style :select_field_arrow,
+    image: "images/forms/select_arrow.png",
+    top: 40,
+    right: 5,
+    width: 9,
+    height: 14
+
+  style :with_sections_field_switch,
+    right: 20
+
+  style :with_sections_field_text_field, :with_sections_field_text_view, :with_sections_field_password_field, :with_sections_field_label, :with_sections_field_button,
+    left: 20,
+    right: 20
+
+  style :with_sections_select_field_arrow,
+    right: 25
+
+  style :with_sections_switch_field_input,
+    right: 25
+  style :with_sections_switch_field_label,
+    left: 25
+  style :with_sections_switch_hint,
+    left: 25
+
+  style :field_input_with_errors,
+    layer: {
+      border_color: proc { MotionPrime::Config.color.error }
+    },
+    text_color: proc { MotionPrime::Config.color.error }
+
+  style :switch_field_input,
+    top: 10,
+    right: 0,
+    width: 51
+
+  style :switch_field_label,
+    top: 10,
+    font: proc { MotionPrime::Config.font.name.uifont(16) }
+
+  style :switch_field_hint,
+    top: 40,
+    font: proc { MotionPrime::Config.font.name.uifont(12) }
+end

data/motion-prime/support/dm_button.rb

@@ -1,18 +1,45 @@
 class DMButton < UIButton
   include MotionPrime::KeyValueStore
-  attr_accessor :paddingLeft, :paddingRight, :paddingTop, :padding
+  DEFAULT_PADDING_LEFT = 5
+  attr_accessor :paddingLeft, :paddingRight, :paddingTop, :padding, :sizeToFit
 
   def setTitle(value)
     setTitle value, forState: UIControlStateNormal
   end
 
+  def setImage(value)
+    setImage value, forState: UIControlStateNormal
+  end
+
+  def setTitleEdgeInsets(value)
+    @custom_title_inset_drawn = true
+    super
+  end
+
+  def padding_left
+    self.paddingLeft || self.padding || DEFAULT_PADDING_LEFT
+  end
+
+  def padding_right
+    self.paddingRight || padding_left || DEFAULT_PADDING_LEFT
+  end
+
+  def padding_top
+    self.paddingTop || self.padding || default_padding_top
+  end
+
+  def default_padding_top # to center title label
+    single_line_height = self.font.pointSize
+    (self.bounds.size.height - single_line_height)/2 + 1
+  end
+
   def drawPadding(rect)
-    padding_left = self.paddingLeft || self.padding || 5
-    padding_right = self.paddingRight || padding_left || 5
-    padding_top = self.paddingTop || self.padding || 0
+    return if @custom_title_inset_drawn || [padding_top, padding_left, padding_right].all?(&:zero?)
+
+    height_diff = self.bounds.size.height - (self.font.pointSize + padding_top*2)
     self.setTitleEdgeInsets UIEdgeInsetsMake(
       padding_top, padding_left,
-      padding_top, padding_right
+      padding_top + height_diff, padding_right
     )
   end
 

data/motion-prime/support/dm_text_field.rb

@@ -2,23 +2,20 @@
 # * support padding, padding_left, padding_right options
 # * support placeholder_color, placeholder_font options
 class DMTextField < UITextField
+  DEFAULT_PADDING_LEFT = 5
   include MotionPrime::KeyValueStore
 
-  attr_accessor :paddingLeft, :paddingTop, :padding,
+  attr_accessor :paddingLeft, :paddingRight, :paddingTop, :padding,
     :placeholderColor, :placeholderFont
 
   # placeholder position
   def textRectForBounds(bounds)
-    padding_left = self.paddingLeft || self.padding || 5
-    padding_top = self.paddingTop || self.padding || 3
-    CGRectInset(bounds, padding_left, padding_top)
+    calculate_rect_for(bounds)
   end
 
   # text position
   def editingRectForBounds(bounds)
-    padding_left = self.paddingLeft || self.padding || 5
-    padding_top = self.paddingTop || self.padding || 3
-    CGRectInset(bounds, padding_left, padding_top)
+    calculate_rect_for(bounds)
   end
 
   def drawPlaceholderInRect(rect)
@@ -27,4 +24,31 @@ class DMTextField < UITextField
     font = self.placeholderFont || self.font || :system.uifont(16)
     self.placeholder.drawInRect(rect, withFont: font)
   end
+
+  def padding_left
+    self.paddingLeft || self.padding || DEFAULT_PADDING_LEFT
+  end
+
+  def padding_right
+    self.paddingRight || self.padding_left
+  end
+
+  def padding_top
+    self.paddingTop || self.padding || default_padding_top
+  end
+
+  def default_padding_top # to center title label
+    single_line_height = self.font.pointSize
+    (self.bounds.size.height - single_line_height)/2 + 2
+  end
+
+  private
+    def calculate_rect_for(bounds)
+      height_diff = self.bounds.size.height - (self.font.pointSize + padding_top*2)
+      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*2)
+    end
+
 end

data/motion-prime/support/dm_text_view.rb

@@ -8,10 +8,14 @@ class DMTextView < UITextView
   attr_accessor :paddingLeft, :paddingTop, :padding,
     :placeholderColor, :placeholderFont, :placeholder
 
+  def padding_top
+    paddingTop || padding || paddingLeft || 5
+  end
+
   def drawPadding(rect)
     # add padding to UITextView
-    padding_left = 0 - DEFAULT_PADDING_LEFT + (self.paddingLeft || self.padding || 5)
-    padding_top = 0 - DEFAULT_PADDING_LEFT + (self.paddingTop || self.padding || 5)
+    padding_left = (self.paddingLeft || self.padding || 5) - 5
+    padding_top = self.padding_top - 8
     padding = UIEdgeInsetsMake(
       padding_top, padding_left,
       padding_top, padding_left
@@ -30,7 +34,6 @@ class DMTextView < UITextView
 
   def drawPlaceholder(rect)
     padding_left = self.paddingLeft || self.padding || 5
-    padding_top = self.paddingTop || self.padding || 5
     padding = UIEdgeInsetsMake(
       padding_top, padding_left,
       padding_top, padding_left

data/motion-prime/support/dm_view_controller.rb

@@ -1,8 +1,8 @@
 class DMViewController < UIViewController
   def self.new(args = {})
-    s = self.alloc.initWithNibName(nil, bundle: nil)
-    s.on_create(args) if s.respond_to?(:on_create)
-    s
+    self.alloc.initWithNibName(nil, bundle: nil).tap do |screen|
+      screen.on_create(args) if screen.respond_to?(:on_create)
+    end
   end
 
   def viewDidLoad

data/motion-prime/support/ui_search_bar_custom.rb

@@ -2,7 +2,7 @@
 class UISearchBarCustom < UISearchBar
   def layoutSubviews
     super
-    text_field = subviews.detect do |view|
+    text_field = subviews.objectAtIndex(0).subviews.detect do |view|
       view.is_a?(UISearchBarTextField)
     end
     text_field.frame = CGRectMake(0, 0, 320, 44)

data/motion-prime/version.rb

@@ -1,3 +1,3 @@
 module MotionPrime
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

data/motion-prime/views/layout.rb

@@ -1,25 +1,33 @@
 # TODO: make it part of Sections
 module MotionPrime
   module Layout
-    def setup(view, options = {}, &block)
-      ViewStyler.new(view, options.delete(:bounds), options).apply
-      view_stack.push(view)
-      block.call(view) if block_given?
-      view_stack.pop
-    end
-
     def add_view(klass, options = {}, &block)
-      bounds = view_stack.empty? ? CGRectZero : view_stack.last.bounds
+      bounds = if view_stack.empty?
+        options.delete(:parent_view).try(:bounds) || CGRectZero
+      else
+        view_stack.last.bounds
+      end
       builder = ViewBuilder.new(klass, options)
       options = builder.options.merge(calculate_frame: true, bounds: bounds)
       view = builder.view
-      view_stack.last.addSubview(view) unless view_stack.empty?
+      if render_target = options.delete(:render_target)
+        render_target.addSubview(view)
+      elsif view_stack.any?
+        view_stack.last.addSubview(view)
+      end
       setup(view, options, &block)
       view.on_added if view.respond_to?(:on_added)
 
       view
     end
 
+    def setup(view, options = {}, &block)
+      ViewStyler.new(view, options.delete(:bounds), options).apply
+      view_stack.push(view)
+      block.call(view) if block_given?
+      view_stack.pop
+    end
+
     def view_stack
       @view_stack ||= []
     end
@@ -29,7 +37,7 @@ module MotionPrime
         [::UIActionSheet, ::UIActivityIndicatorView, ::UIButton, ::UIDatePicker, ::UIImageView, ::UILabel,
           ::UIPageControl, ::UIPickerView, ::UIProgressView, ::UIScrollView, ::UISearchBar, ::UISegmentedControl,
           ::UISlider, ::UIStepper, ::UISwitch, ::UITabBar, ::UITableView, ::UITableViewCell, ::UITextField, ::UITextView,
-          ::UIToolbar, ::UIWebView].each do |klass|
+          ::UIToolbar, ::UIWebView, ::UINavigationBar].each do |klass|
 
           shorthand = "#{klass}"[2..-1].underscore.to_sym