motion-prime 0.2.1 → 0.3.0

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

@@ -1,26 +1,12 @@
 module MotionPrime
   class PasswordFieldSection < BaseFieldSection
     element :label, type: :label do
-      {
-        styles: [
-          :base_field_label,
-          :base_password_field_label,
-          :"#{form_name}_field_label",
-          :"#{form_name}_#{name}_field_label"
-        ]
-      }.merge(options[:label] || {})
+      options[:label] || {}
     end
     element :input, type: :text_field do
-      {
-        styles: [
-          :base_field_input,
-          :base_password_field_input,
-          :"#{form_name}_field_input",
-          :"#{form_name}_#{name}_field_input"
-        ],
-        secureTextEntry: true
-      }.merge(options[:input] || {})
+      options[:input] || {}
     end
+    element :error_message, type: :error_message, text: proc { all_errors.join("\n") if observing_errors? }
     after_render :bind_text_input
   end
 end

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

@@ -1,46 +1,15 @@
 module MotionPrime
   class SelectFieldSection < BaseFieldSection
     element :label, type: :label do
-      {
-        styles: [
-          :base_field_label,
-          :base_select_field_label,
-          :"#{form_name}_field_label",
-          :"#{form_name}_#{name}_field_label"
-        ]
-      }.merge(options[:label] || {})
+      options[:label] || {}
     end
     element :button, type: :button do
-      {
-        styles: [
-          :base_select_field_button,
-          :"#{form_name}_field_button",
-          :"#{form_name}_#{name}_field_button"
-        ],
-      }.merge(options[:button] || {})
+      options[:button] || {}
     end
     element :arrow, type: :image do
-      {
-        styles: [
-          :base_select_field_arrow,
-          :"#{form_name}_field_arrow",
-          :"#{form_name}_#{name}_field_arrow"
-        ],
-      }.merge(options[:arrow] || {})
-    end
-    element :error_message, type: :error_message do
-      {
-        styles: [
-          :base_field_label,
-          :base_string_field_label,
-          :"#{form_name}_field_label",
-          :"#{form_name}_#{name}_field_label",
-          :base_error_message
-        ],
-        hidden: proc { form.model && form.model.errors[name].blank? },
-        text: proc { form.model and form.model.errors[name].join("\n") }
-      }
+      options[:arrow] || {}
     end
+    element :error_message, type: :error_message, text: proc { observing_errors? and all_errors.join("\n") }
 
     after_render :bind_select_button
 

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

@@ -1,40 +1,14 @@
 module MotionPrime
   class StringFieldSection < BaseFieldSection
     element :label, type: :label do
-      {
-        styles: [
-          :base_field_label,
-          :base_string_field_label,
-          :"#{form_name}_field_label",
-          :"#{form_name}_#{name}_field_label"
-        ]
-      }.merge(options[:label] || {})
+      options[:label] || {}
     end
 
     element :input, type: :text_field do
-      styles = [
-        :base_field_input,
-        :base_string_field_input,
-        :"#{form_name}_field_input",
-        :"#{form_name}_#{name}_field_input"
-      ]
-      styles << :base_field_input_with_errors if form.model && form.model.errors[name].present?
-      {styles: styles}.merge(options[:input] || {})
+      options[:input] || {}
     end
 
-    element :error_message, type: :error_message do
-      {
-        styles: [
-          :base_field_label,
-          :base_string_field_label,
-          :"#{form_name}_field_label",
-          :"#{form_name}_#{name}_field_label",
-          :base_error_message
-        ],
-        hidden: proc { form.model && form.model.errors[name].blank? },
-        text: proc { form.model and form.model.errors[name].join("\n") }
-      }
-    end
+    element :error_message, type: :error_message, text: proc { all_errors.join("\n") if observing_errors? }
     after_render :bind_text_input
   end
 end

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

@@ -1,13 +1,7 @@
 module MotionPrime
   class SubmitFieldSection < BaseFieldSection
     element :submit, type: :button do
-      {
-        styles: [
-          :base_submit_button,
-          :"#{form_name}_submit_button",
-          :"#{form_name}_#{name}_button"
-        ]
-      }.merge(title: options[:title])
+      {title: options[:title]}
     end
     after_render :bind_submit
 

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

@@ -1,33 +1,13 @@
 module MotionPrime
   class SwitchFieldSection < BaseFieldSection
     element :label, type: :label do
-      {
-        styles: [
-          :base_field_label,
-          :base_switch_label,
-          :"#{form_name}_switch_label",
-          :"#{form_name}_#{name}_switch_label"
-        ]
-      }.merge(options[:label] || {})
+      options[:label] || {}
     end
     element :input, type: :switch do
-      {
-        styles: [
-          :base_field_switch,
-          :"#{form_name}_field_switch",
-          :"#{form_name}_#{name}_field_switch"
-        ]
-      }.merge(options[:input] || {})
+      options[:input] || {}
     end
     element :hint, type: :label do
-      {
-        styles: [
-          :base_field_label,
-          :base_switch_hint,
-          :"#{form_name}_switch_hint",
-          :"#{form_name}_#{name}_switch_hint"
-        ]
-      }.merge(options[:hint] || {})
+      options[:hint] || {}
     end
   end
 end

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

@@ -1,43 +1,13 @@
 module MotionPrime
   class TextFieldSection < BaseFieldSection
     element :label, type: :label do
-      {
-        styles: [
-          :base_field_label,
-          :base_text_field_label,
-          :"#{form_name}_field_label",
-          :"#{form_name}_#{name}_field_label"
-        ]
-      }.merge(options[:label] || {})
+      options[:label] || {}
     end
     element :input, type: :text_view do
-      styles = [
-        :base_field_input,
-        :base_text_field_input,
-        :"#{form_name}_field_input",
-        :"#{form_name}_#{name}_field_input"
-      ]
-      styles << :base_field_input_with_errors if form.model && form.model.errors[name].present?
-
-      {
-        styles: styles,
-        editable: true
-      }.merge(options[:input] || {})
+      {editable: true}.merge(options[:input] || {})
     end
 
-    element :error_message, type: :error_message do
-      {
-        styles: [
-          :base_field_label,
-          :base_string_field_label,
-          :"#{form_name}_field_label",
-          :"#{form_name}_#{name}_field_label",
-          :base_error_message
-        ],
-        hidden: proc { form.model && form.model.errors[name].blank? },
-        text: proc { form.model and form.model.errors[name].join("\n") }
-      }
-    end
+    element :error_message, type: :error_message, text: proc { observing_errors? and all_errors.join("\n") }
     after_render :bind_text_input
   end
 end

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

@@ -1,51 +1,15 @@
 module MotionPrime
   class TextWithButtonFieldSection < BaseFieldSection
     element :label, type: :label do
-      {
-        styles: [
-          :base_field_label,
-          :base_text_field_label,
-          :"#{form_name}_field_label",
-          :"#{form_name}_#{name}_field_label"
-        ]
-      }.merge(options[:label] || {})
+      options[:label] || {}
     end
     element :input, type: :text_view do
-      styles = [
-        :base_field_input,
-        :base_text_field_input,
-        :"#{form_name}_field_input",
-        :"#{form_name}_#{name}_field_input"
-      ]
-      styles << :base_field_input_with_errors if form.model && form.model.errors[name].present?
-
-      {
-        styles: styles,
-        editable: true
-      }.merge(options[:input] || {})
+      {editable: true}.merge(options[:input] || {})
     end
     element :button, type: :button do
-      {
-        styles: [
-          :base_text_button,
-          :"#{form_name}_text_button",
-          :"#{form_name}_#{name}_text_button"
-        ]
-      }.merge(options[:button] || {}).except(:action)
-    end
-    element :error_message, type: :error_message do
-      {
-        styles: [
-          :base_field_label,
-          :base_string_field_label,
-          :"#{form_name}_field_label",
-          :"#{form_name}_#{name}_field_label",
-          :base_error_message
-        ],
-        hidden: proc { form.model && form.model.errors[name].blank? },
-        text: proc { form.model and form.model.errors[name].join("\n") }
-      }
+      (options[:button] || {}).except(:action)
     end
+    element :error_message, type: :error_message, text: proc { observing_errors? and all_errors.join("\n") }
 
     after_render :bind_text_input
     after_render :bind_button_action

data/motion-prime/sections/tabbed.rb

@@ -10,6 +10,7 @@ module MotionPrime
     #   # e.g. in this sample: InfoTabSection.new(model: model).render(to: screen)
     # end
     #
+    include MotionPrime::HasNormalizer
 
     class_attribute :tabs_options, :tabs_default, :tabs_indexes
     attr_accessor :tab_pages
@@ -21,7 +22,7 @@ module MotionPrime
     after_render :render_tab_controls
 
     def tab_options
-      @tab_options ||= self.class.tabs_options
+      @tab_options ||= normalize_options(self.class.tabs_options.clone)
     end
 
     def tab_control_items
@@ -32,7 +33,6 @@ module MotionPrime
       @tab_default ||= self.class.tabs_default || 0
     end
 
-
     # Make tab button disabled by index
     # @param Fixnum index
     def disable_at(index)
@@ -58,15 +58,35 @@ module MotionPrime
     # on click to segment tab
     # @param UISegemtedControl control
     def on_click(*control)
+      show_at_index(control.selectedSegment)
+    end
+
+    def show_at_index(index)
       @tab_pages.each_with_index do |page, i|
-        page.hide if control.selectedSegment != i
+        page.hide if index != i
       end
-      @tab_pages[control.selectedSegment].show
+      view(:control).setSelectedSegmentIndex index
+      @tab_pages[index].show
+    end
+
+    def show_by_key(key)
+      id = self.class.tabs_indexes[key]
+      show_at_index(id)
+    end
+
+    def tab_page(key)
+      id = self.class.tabs_indexes[key]
+      tab_pages[id]
+    end
+
+    def set_title(key, title)
+      id = self.class.tabs_indexes[key]
+      view(:control).setTitle(title, forSegmentAtIndex: id)
     end
 
     class << self
       def tab(id, options = {})
-        options[:name] = id.to_s.titleize
+        options[:name] ||= id.to_s.titleize
         options[:id] = id
 
         self.tabs_indexes ||= {}

data/motion-prime/sections/table.rb

@@ -4,7 +4,7 @@ module MotionPrime
     include TableSectionRefreshMixin
     include HasSearchBar
 
-    attr_accessor :table_view, :did_appear
+    attr_accessor :table_element, :did_appear
     before_render :render_table
 
     def table_data
@@ -16,18 +16,32 @@ module MotionPrime
     end
 
     def data_stamp_for(id)
-      @data_stamp[id.to_i]
+      @data_stamp[id]
     end
 
     def set_data_stamp(cell_ids)
-      @data_stamp ||= []
-      cell_ids.each { |id| @data_stamp[id] = Time.now.to_f }
+      @data_stamp ||= {}
+      [*cell_ids].each { |id| @data_stamp[id] = Time.now.to_f }
+    end
+
+    def reset_data_stamps
+      keys = data.each_with_index.map do |row, id|
+        if row.is_a?(Array)
+          section = id
+          rows = (0...row.count)
+        else
+          section = 0
+          rows = [id]
+        end
+        rows.map { |row| "#{section}_#{row}" }
+      end.flatten
+      set_data_stamp(keys)
     end
 
     def reload_data
       @did_appear = false
       @data = nil
-      set_data_stamp((0..elements_options.count-1).to_a)
+      reset_data_stamps
       table_view.reloadData
     end
 
@@ -38,15 +52,46 @@ module MotionPrime
     end
 
     def render_table
-      set_data_stamp((0..elements_options.count-1))
+      reset_data_stamps
+      options = {
+        styles: table_styles,
+        delegate: self,
+        data_source: self,
+        style: (UITableViewStyleGrouped unless flat_data?)
+      }
+      self.table_element = screen.table_view(options)
+    end
+
+    def table_view
+      table_element.view
+    end
+
+    def hide
+      table_view.try(:hide)
+    end
+
+    def show
+      table_view.try(:show)
+    end
+
+    def numberOfSectionsInTableView(tableView)
+      number_of_sections
+    end
+
+    def number_of_sections
+      has_many_sections? ? data.count : 1
+    end
 
-      self.table_view = screen.table_view(
-        styles: table_styles, delegate: self, data_source: self
-      ).view
+    def has_many_sections?
+      data.any? && data.first.is_a?(Array)
+    end
+
+    def row_by_index(index)
+      rows_for_section(index.section)[index.row]
     end
 
     def render_cell(index, table)
-      item = data[index.row]
+      item = row_by_index(index)
 
       # define default styles for cell
       styles = [:"#{name}_cell"]
@@ -67,7 +112,7 @@ module MotionPrime
           reuse_identifier: cell_name(table, index)
         )
       else
-        screen.table_view_cell styles: [:base_table_cell] + styles, reuse_identifier: cell_name(table, index) do
+        screen.table_view_cell styles: [:base_table_cell] + styles, reuse_identifier: cell_name(table, index), parent_view: table_view do
           item.render(to: screen)
         end
       end
@@ -76,16 +121,16 @@ module MotionPrime
     def on_click(table, index)
     end
 
-    def on_appear
-    end
+    def on_appear; end
+    def on_row_render(cell, index); end
 
     def cell_name(table, index)
-      record = data[index.row]
+      record = row_by_index(index)
       if record && record.model &&
          record.model.respond_to?(:id) && record.model.id.present?
-        "cell_#{record.model.id}_#{data_stamp_for(index.row)}"
+        "cell_#{record.model.id}_#{data_stamp_for("#{index.section}_#{index.row}")}"
       else
-        "cell_#{index.section}_#{index.row}_#{data_stamp_for(index.row)}"
+        "cell_#{index.section}_#{index.row}_#{data_stamp_for("#{index.section}_#{index.row}")}"
       end
     end
 
@@ -94,23 +139,34 @@ module MotionPrime
       table.dequeueReusableCellWithIdentifier(cell_name(table, index))
     end
 
+    # def tableView(table, viewForFooterInSection: section) # cause bug in ios7.0.0-7.0.2
+    #   UIView.new
+    # end
+    # def tableView(table, heightForFooterInSection: section)
+    #   0.1
+    # end
+
     # ALIASES
     # ---------------------
 
     def tableView(table, cellForRowAtIndexPath:index)
-      cell = cached_cell(index, table) || render_cell(index, table)
+      @rendered_cells ||= []
+      @rendered_cells[index.section] ||= []
+
+      cell = cached_cell(index, table) || render_cell(index, table).tap do |cell|
+        @rendered_cells[index.section][index.row] = cell
+        on_row_render(cell, index)
+      end
 
       # run table view is appeared callback if needed
-      if index.row == data.size - 1 && !@did_appear
-        @did_appear = true
+      if !@did_appear && index.row == rows_for_section(index.section).size - 1
         on_appear
       end
-
       cell.is_a?(UIView) ? cell : cell.view
     end
 
     def tableView(table, numberOfRowsInSection:section)
-      data.length
+      rows_for_section(section).length
     end
 
     def tableView(table, didSelectRowAtIndexPath:index)
@@ -118,7 +174,15 @@ module MotionPrime
     end
 
     def tableView(table, heightForRowAtIndexPath:index)
-      data[index.row].container_height
+      rows_for_section(index.section)[index.row].container_height
+    end
+
+    def flat_data?
+      number_of_sections == 1
+    end
+
+    def rows_for_section(section)
+      flat_data? ? data : data[section]
     end
   end
 end