motion-prime 0.3.2 → 0.3.3

data/motion-prime/sections/form.rb

@@ -20,22 +20,23 @@ module MotionPrime
 
     class_attribute :text_field_limits, :text_view_limits
     class_attribute :fields_options, :section_header_options
-    attr_accessor :fields, :field_indexes, :keyboard_visible, :rendered_views, :section_headers
+    attr_accessor :fields, :field_indexes, :keyboard_visible, :rendered_views, :section_headers, :section_header_options
 
     def table_data
       if @groups_count == 1
         fields.values
       else
         section_indexes = []
-        fields.inject([]) do |result, (key, field)|
+        data = fields.inject([]) do |result, (key, field)|
           section = self.class.fields_options[key][:group].to_i
-
           section_indexes[section] ||= 0
           result[section] ||= []
           result[section][section_indexes[section]] = field
           section_indexes[section] += 1
           result
         end
+        self.section_header_options.delete_if.each_with_index { |opts, id| data[id].nil? }
+        data.compact
       end
     end
 
@@ -56,7 +57,7 @@ module MotionPrime
 
     def render_cell(index, table)
       field = rows_for_section(index.section)[index.row]
-      screen.table_view_cell section: field, styles: cell_styles(field).values.flatten, reuse_identifier: cell_name(table, index), parent_view: table_view do |cell_view|
+      screen.table_view_cell section: field, reuse_identifier: cell_name(table, index), parent_view: table_view do |cell_view|
         field.cell_view = cell_view if field.respond_to?(:cell_view)
         field.render(to: screen)
       end
@@ -168,6 +169,9 @@ module MotionPrime
     def textFieldShouldReturn(text_field)
       on_input_return(text_field)
     end
+    def textFieldShouldBeginEditing(text_field)
+      text_field.respond_to?(:readonly) ? !text_field.readonly : true
+    end
     def textFieldDidBeginEditing(text_field)
       on_input_edit(text_field)
     end
@@ -176,16 +180,12 @@ module MotionPrime
     end
 
     def textView(text_view, shouldChangeTextInRange:range, replacementText:string)
-      limit = (self.class.text_view_limits || {}).find do |field_name, limit|
-        view("#{field_name}:input")
-      end.try(:last)
-      return true unless limit
-      allow_string_replacement?(text_view, limit, range, string)
+      textField(text_view, shouldChangeCharactersInRange:range, replacementString:string)
     end
 
     def textField(text_field, shouldChangeCharactersInRange:range, replacementString:string)
       limit = (self.class.text_field_limits || {}).find do |field_name, limit|
-        view("#{field_name}:input")
+        view("#{field_name}:input") == text_field
       end.try(:last)
       return true unless limit
       allow_string_replacement?(text_field, limit, range, string)
@@ -205,18 +205,16 @@ module MotionPrime
     end
 
     def render_field?(name, options)
-      condition = options.delete(:if)
-      if condition.nil?
-        true
-      elsif condition.is_a?(Proc)
+      return true unless condition = options[:if]
+      if condition.is_a?(Proc)
         self.instance_eval(&condition)
       else
-        condition
+        condition.to_proc.call(self)
       end
     end
 
     def render_header(section)
-      return unless options = self.class.section_header_options.try(:[], section)
+      return unless options = self.section_header_options.try(:[], section)
       self.section_headers[section] ||= BaseHeaderSection.new(options.merge(table: self))
     end
 
@@ -265,6 +263,12 @@ module MotionPrime
       end
     end
 
+    def reload_data
+      @groups_count = nil
+      init_form_fields
+      super
+    end
+
     private
       def init_form_fields
         self.fields = {}
@@ -273,12 +277,18 @@ module MotionPrime
         (self.class.fields_options || []).each do |key, field|
           next unless render_field?(key, field)
           section_id = field[:group].to_i
-          section_indexes[section_id] ||= 0
           @groups_count = [@groups_count || 1, section_id + 1].max
           self.fields[key] = load_field(field)
+
+          section_indexes[section_id] ||= 0
           self.field_indexes[key] = "#{section_id}_#{section_indexes[section_id]}"
           section_indexes[section_id] += 1
         end
+        init_form_headers
+      end
+
+      def init_form_headers
+        self.section_header_options = Array.wrap(self.class.section_header_options).clone
       end
   end
 end

data/motion-prime/sections/form/base_field_section.rb

@@ -1,7 +1,6 @@
 motion_require '../table/base_cell_section'
 module MotionPrime
   class BaseFieldSection < BaseCellSection
-    include CellSection
     include BW::KVO
 
     attr_reader :form

data/motion-prime/sections/form/base_header_section.rb

@@ -5,14 +5,15 @@ module MotionPrime
     DEFAULT_HEADER_HEIGHT = 20
 
     element :title, text: proc { @options[:title] }
+    element :hint, text: proc { @options[:hint] }
 
     def initialize(options = {})
       @cell_type = :header
       super
     end
 
-    def section_styles
-      table.cell_styles(self)
+    def render_element?(name)
+      @options[name].present?
     end
 
     def container_height

data/motion-prime/sections/form/password_field_section.rb

@@ -4,7 +4,7 @@ module MotionPrime
       options[:label] || {}
     end
     element :input, type: :text_field do
-      options[:input] || {}
+      {secure_text_entry: true}.merge(options[:input] || {})
     end
     element :error_message, type: :error_message, text: proc { all_errors.join("\n") if observing_errors? }
     after_render :bind_text_input

data/motion-prime/sections/table.rb

@@ -61,24 +61,45 @@ module MotionPrime
     end
 
     def cell_styles(cell)
-      # type: cell/field/header
+      # type = [`cell`, `header`, `field`]
+
+      # UserFormSection example: field :email, type: :string
+      # form_name = `user`
+      # type = `field`
+      # field_name = `email`
+      # field_type = `string_field`
+
+      # CategoriesTableSection example: table is a `CategoryTableSection`, cell is a `CategoryTitleSection`, element :icon, type: :image
+      # table_name = `categories`
+      # type = `cell` (always true)
+      # table_cell_name = `title`
       type = cell.respond_to?(:cell_type) ? cell.cell_type : 'cell'
 
       suffixes = [type]
       if cell.is_a?(BaseFieldSection)
         suffixes << cell.default_name
-      elsif cell.respond_to?(:cell_name)
-        suffixes << cell.cell_name
       end
 
-      styles = {
-        common: build_styles_chain(table_styles[:common], suffixes),
-        specific: build_styles_chain(table_styles[:specific], suffixes)
-      }
+      styles = {}
+      # table: base_table_<type>
+      # form: base_form_<type>, base_form_<field_type>
+      styles[:common] = build_styles_chain(table_styles[:common], suffixes)
 
-      if cell.respond_to?(:container_styles) && cell.container_styles.present?
-        styles[:specific] += Array.wrap(cell.container_styles)
+      if cell.is_a?(BaseFieldSection)
+        # form cell: _<type>_<field_name> = `_field_email`
+        suffixes << :"#{type}_#{cell.name}" if cell.name
+      elsif cell.respond_to?(:cell_name) # BaseCellSection
+        # table cell: _<table_cell_name> = `_title`
+        suffixes << cell.cell_name
       end
+      # table: <table_name>_table_<type>, <table_name>_table_<table_cell_name> = `categories_table_cell`, `categories_table_title`
+      # form: <form_name>_form_<type>, <form_name>_form_<field_type>, user_form_<type>_email = `user_form_field`, `user_form_string_field`, `user_form_field_email`
+      styles[:specific] = build_styles_chain(table_styles[:specific], suffixes)
+
+      if respond_to?(:container_styles) && container_styles.present?
+        @section_styles[:specific] += Array.wrap(container_styles)
+      end
+
       styles
     end
 
@@ -133,7 +154,7 @@ module MotionPrime
           reuse_identifier: cell_name(table, index)
         )
       else
-        screen.table_view_cell section: item, styles: cell_styles(item).values.flatten, reuse_identifier: cell_name(table, index), parent_view: table_view do
+        screen.table_view_cell section: item, reuse_identifier: cell_name(table, index), parent_view: table_view do
           item.render(to: screen)
         end
       end

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

@@ -1,26 +1,5 @@
 module MotionPrime
   class BaseCellSection < BaseSection
-    attr_accessor :table, :cell_type
-
-    def initialize(options = {})
-      @table ||= options[:table]
-      super
-    end
-
-    def section_styles
-      @table.try(:cell_styles, self) || {}
-    end
-
-    def cell_type
-      @cell_type ||= begin
-        self.is_a?(BaseFieldSection) ? :field : :cell
-      end
-    end
-
-    def cell_name
-      return name unless table
-      table_name = table.name.gsub('_table', '')
-      name.gsub("#{table_name}_", '')
-    end
+    include CellSectionMixin
   end
 end

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

@@ -0,0 +1,5 @@
+module MotionPrime
+  class DrawCellSection < DrawSection
+    include CellSectionMixin
+  end
+end

data/motion-prime/styles/form.rb

@@ -2,8 +2,16 @@ 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
+    left: 0,
+    bottom: 5,
+    top: nil,
+    width: 320,
+    size_to_fit: true
+  style :header_hint,
+    left: 0,
+    bottom: 5,
+    top: nil,
+    width: 320
 
   style :field,
     selection_style: UITableViewCellSelectionStyleNone,
@@ -71,7 +79,7 @@ MotionPrime::Styles.define :base_form do
     title_label: {
       font: proc { MotionPrime::Config.font.name.uifont(16) }
     }
-  style :select_field_arrow,
+  style :select_field_image,
     image: "images/forms/select_arrow.png",
     top: 40,
     right: 5,
@@ -85,7 +93,7 @@ MotionPrime::Styles.define :base_form do
     left: 20,
     right: 20
 
-  style :with_sections_select_field_arrow,
+  style :with_sections_select_field_image,
     right: 25
 
   style :with_sections_switch_field_input,

data/motion-prime/support/_key_value_store.rb

@@ -1,7 +1,5 @@
 module MotionPrime
   module SupportKeyValueStore
-    extend ::MotionSupport::Concern
-
     # Key-Value accessors
     def setValue(value, forUndefinedKey: key)
       self.send(:"#{key}=", key)

data/motion-prime/support/dm_text_field.rb

@@ -4,7 +4,7 @@
 class DMTextField < UITextField
   include MotionPrime::SupportKeyValueStore
   include MotionPrime::SupportPaddingAttribute
-  attr_accessor :placeholderColor, :placeholderFont
+  attr_accessor :placeholderColor, :placeholderFont, :readonly
 
   # placeholder position
   def textRectForBounds(bounds)
@@ -26,7 +26,7 @@ class DMTextField < UITextField
   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 + 2
+      (self.bounds.size.height - single_line_height)/2 + 1
     end
   end
 

data/motion-prime/support/tab_bar_controller.rb

@@ -0,0 +1,28 @@
+module MotionPrime
+  class TabBarController < UITabBarController
+    
+    def self.new(screens)
+      controller = alloc.init
+
+      view_controllers = []
+
+      screens.each_with_index do |screen, index|
+        screen.tabBarItem.tag = index
+        screen.send(:on_screen_load) if screen.respond_to?(:on_screen_load)
+        screen.wrap_in_navigation if screen.respond_to?(:wrap_in_navigation)
+        screen.tab_bar = controller if screen.respond_to?(:tab_bar=)
+        view_controllers << screen.main_controller
+      end
+
+      controller.viewControllers = view_controllers
+      controller
+    end
+    
+    def open_tab(tab)
+      controller = viewControllers[tab]
+      if controller
+        self.selectedViewController = controller
+      end
+    end
+  end
+end

data/motion-prime/version.rb

@@ -1,3 +1,3 @@
 module MotionPrime
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

data/motion-prime/views/_frame_calculator_mixin.rb

@@ -0,0 +1,75 @@
+module MotionPrime
+  module FrameCalculatorMixin
+    def calculate_frome_for(bounds, options)
+      width   = options[:width]
+      height  = options[:height]
+      top     = options[:top]
+      right   = options[:right]
+      bottom  = options[:bottom]
+      left    = options[:left]
+      value_type = options[:value_type].to_s # absolute/relative
+
+      if options[:height_to_fit].present? && height.nil? && (top.nil? || bottom.nil?)
+        height = options[:height_to_fit]
+      end
+
+      return bounds if width.nil? && height.nil? && right.nil? && bottom.nil?
+      frame = CGRectMake(0,0,0,0)
+
+      max_width = bounds.size.width
+      max_height = bounds.size.height
+      width = 0.0 if width.nil?
+      height = 0.0 if height.nil?
+
+      # calculate left and right if width is relative, e.g 0.7
+      if width && width > 0 && width <= 1 && value_type != 'absolute'
+        if right.nil?
+          left ||= 0
+          right = max_width - max_width * width
+        else
+          left = max_width - max_width * width
+        end
+      end
+
+      # calculate top and bottom if height is relative, e.g 0.7
+      if height && height > 0 && height <= 1 && value_type != 'absolute'
+        if bottom.nil?
+          top ||= 0
+          bottom = max_height - max_height * height
+        else
+          top = max_height - max_height * height
+        end
+      end
+
+      if !left.nil? && !right.nil?
+        frame.origin.x = left
+        frame.size.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
+
+      if !top.nil? && !bottom.nil?
+        frame.origin.y = top
+        frame.size.height = max_height - top - bottom
+      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
+    end
+  end
+end

data/motion-prime/views/view_styler.rb

@@ -1,104 +1,40 @@
 module MotionPrime
   class ViewStyler
+    include FrameCalculatorMixin
+    include HasStyles
+
     attr_reader :view, :options
 
     def initialize(view, bounds = CGRectZero, options = {})
       @options = Styles.extend_and_normalize_options options
       @view = view
-      calculate_frame_for(bounds) if @options.delete(:calculate_frame)
+      prepare_frame_for(bounds) if @options.delete(:calculate_frame)
     end
 
     def apply
-      convert_primitives_to_objects(options)
-      setValuesForKeysWithDictionary(options)
+      converted_options = convert_primitives_to_objects(options)
+      setValuesForKeysWithDictionary(converted_options)
     end
 
     def convert_primitives_to_objects(options)
-      options.each do |k,v|
-        options[k] = STRUCTS_MAP[v.class].call(v) if STRUCTS_MAP.has_key?(v.class)
+      options.inject({}) do |result, (k, v)|
+        v = STRUCTS_MAP[v.class].call(v) if STRUCTS_MAP.has_key?(v.class)
+        result[k] = v
+        result
       end
     end
 
-    def calculate_frame_for(bounds)
-      width   = options.delete(:width)
-      height  = options.delete(:height)
-      top     = options.delete(:top)
-      right   = options.delete(:right)
-      bottom  = options.delete(:bottom)
-      left    = options.delete(:left)
-      value_type = options.delete(:value_type).to_s # absolute/relative
-
-      if options[:height_to_fit].present? && height.nil? && (top.nil? || bottom.nil?)
-        height = options[:height_to_fit]
-      end
-
-      if width.nil? && height.nil? && right.nil? && bottom.nil?
-        options[:frame] = bounds
-      else
-        frame = CGRectZero
-
-        max_width = bounds.size.width
-        max_height = bounds.size.height
-        width = 0.0 if width.nil?
-        height = 0.0 if height.nil?
-
-        # calculate left and right if width is relative, e.g 0.7
-        if width && width > 0 && width <= 1 && value_type != 'absolute'
-          if right.nil?
-            left ||= 0
-            right = max_width - max_width * width
-          else
-            left = max_width - max_width * width
-          end
-        end
-
-        # calculate top and bottom if height is relative, e.g 0.7
-        if height && height > 0 && height <= 1 && value_type != 'absolute'
-          if bottom.nil?
-            top ||= 0
-            bottom = max_height - max_height * height
-          else
-            top = max_height - max_height * height
-          end
-        end
+    def prepare_frame_for(bounds)
+      options[:frame] = calculate_frome_for(bounds, options)
 
+      if options.slice(:width, :height, :right, :bottom, :height_to_fit).values.any?
         mask = UIViewAutoresizingNone
-        mask |= UIViewAutoresizingFlexibleTopMargin if top.nil?
-        mask |= UIViewAutoresizingFlexibleLeftMargin if left.nil?
-        mask |= UIViewAutoresizingFlexibleBottomMargin if bottom.nil?
-        mask |= UIViewAutoresizingFlexibleRightMargin if right.nil?
-        mask |= UIViewAutoresizingFlexibleWidth if !left.nil? && !right.nil?
-        mask |= UIViewAutoresizingFlexibleHeight if !top.nil? && !bottom.nil?
-
-        if !left.nil? && !right.nil?
-          frame.origin.x = left
-          frame.size.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
-
-        if !top.nil? && !bottom.nil?
-          frame.origin.y = top
-          frame.size.height = max_height - top - bottom
-        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
-
-        options[:frame] = frame
+        mask |= UIViewAutoresizingFlexibleTopMargin if options[:top].nil?
+        mask |= UIViewAutoresizingFlexibleLeftMargin if options[:left].nil?
+        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?
         options[:autoresizingMask] = mask
       end
     end
@@ -106,12 +42,15 @@ module MotionPrime
     def setValue(value, forUndefinedKey: key)
       # return if value.nil?
       # ignore options
+      return if options[:section].is_a?(DrawSection) && %w[gradient].include?(key.to_s)
       return if key == 'size_to_fit' && view.is_a?(UILabel)
       return if (key == 'url' || key == 'default') && view.is_a?(UIImageView)
       return if %w[
+        styles
+        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].include? key.to_s
+        height_to_fit container parent_frame].include? key.to_s
 
       # apply options
       if key.end_with?('title_color')
@@ -152,6 +91,17 @@ module MotionPrime
         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 == 'mask'
         radius = value[:radius]
         bounds = CGRectMake(0, 0, value[:width], value[:height])
@@ -160,11 +110,6 @@ module MotionPrime
         mask_layer.frame = bounds
         mask_layer.path = mask_path.CGPath
         view.layer.mask = mask_layer
-        # TODO: apply for corner_radius_top/bottom
-        # CAShapeLayer *shape = [[CAShapeLayer alloc] init];
-        # shape.path = [UIBezierPath bezierPathWithRoundedRect:CGRectMake(0, 0, self.bounds.size.width, self.bounds.size.height) byRoundingCorners:UIRectCornerTopLeft|UIRectCornerTopRight cornerRadii:CGSizeMake(10, 10)].CGPath;
-        # self.layer.mask = shape;
-        # self.layer.masksToBounds = YES;
       elsif key == 'attributed_text_options'
         attributes = {}
         if line_spacing = value[:line_spacing]
@@ -184,13 +129,10 @@ module MotionPrime
           view.attributedText = attributedString
         end
       elsif key == 'gradient'
-        gradient = CAGradientLayer.layer
-        gradient.frame = CGRectMake(value[:frame_x].to_f, value[:frame_y].to_f, value[:frame_width].to_f, value[:frame_height].to_f)
-        gradient.colors = value[:colors].map(&:uicolor).map(&:cgcolor)
-        gradient.locations = value[:locations] if value[:locations]
+        gradient = prepare_gradient(value)
         view.layer.insertSublayer(gradient, atIndex: 0)
       elsif value.is_a?(Hash)
-        self.class.new(view.send(key.camelize(:lower).to_sym), nil, value).apply
+        self.class.new(view.send(key.camelize(:lower).to_sym), nil, value.merge(parent_frame: options[:frame] || options[:parent_frame])).apply
       else
         view.setValue value, forKey: key.camelize(:lower)
       end