ProMotion 1.0.4 → 1.1.0.rc1

data/lib/ProMotion/screen/screen_navigation.rb

@@ -23,8 +23,8 @@ module ProMotion
       elsif args[:in_tab] && self.tab_bar
         present_view_controller_in_tab_bar_controller screen, args[:in_tab]
 
-      elsif self.navigation_controller
-        push_view_controller screen
+      elsif self.navigationController
+        push_view_controller screen, self.navigationController, args[:animated].nil? ? true : args[:animated]
 
       else
         open_root_screen (screen.navigationController || screen)
@@ -55,7 +55,7 @@ module ProMotion
       if self.modal?
         close_modal_screen args
 
-      elsif self.navigation_controller
+      elsif self.navigationController
         close_nav_screen args
         send_on_return(args) # TODO: this would be better implemented in a callback or view_did_disappear.
 
@@ -76,14 +76,13 @@ module ProMotion
       end
     end
 
-    def push_view_controller(vc, nav_controller=nil)
-      unless self.navigation_controller
+    def push_view_controller(vc, nav_controller=nil, animated=true)
+      unless self.navigationController
         PM.logger.error "You need a nav_bar if you are going to push #{vc.to_s} onto it."
       end
-      nav_controller ||= self.navigation_controller
+      nav_controller ||= self.navigationController
       vc.first_screen = false if vc.respond_to?(:first_screen=)
-      vc.navigation_controller = nav_controller if vc.respond_to?(:navigation_controller=)
-      nav_controller.pushViewController(vc, animated: true)
+      nav_controller.pushViewController(vc, animated: animated)
     end
 
     protected
@@ -113,7 +112,7 @@ module ProMotion
 
     def ensure_wrapper_controller_in_place(screen, args={})
       unless args[:close_all] || args[:modal] || args[:in_detail] || args[:in_master]
-        screen.navigation_controller ||= self.navigation_controller if screen.respond_to?("navigation_controller=")
+        screen.navigationController ||= self.navigationController
         screen.tab_bar ||= self.tab_bar if screen.respond_to?("tab_bar=")
       end
     end
@@ -127,7 +126,6 @@ module ProMotion
       if vc
 
         if vc.is_a?(UINavigationController)
-          screen.navigation_controller = vc if screen.respond_to?("navigation_controller=")
           push_view_controller(screen, vc)
         else
           # TODO: This should probably open the vc, shouldn't it?
@@ -150,12 +148,12 @@ module ProMotion
     def close_nav_screen(args={})
       args[:animated] = true unless args.has_key?(:animated)
       if args[:to_screen] == :root
-        self.navigation_controller.popToRootViewControllerAnimated args[:animated]
+        self.navigationController.popToRootViewControllerAnimated args[:animated]
       elsif args[:to_screen] && args[:to_screen].is_a?(UIViewController)
         self.parent_screen = args[:to_screen]
-        self.navigation_controller.popToViewController(args[:to_screen], animated: args[:animated])
+        self.navigationController.popToViewController(args[:to_screen], animated: args[:animated])
       else
-        self.navigation_controller.popViewControllerAnimated(args[:animated])
+        self.navigationController.popViewControllerAnimated(args[:animated])
       end
     end
 

data/lib/ProMotion/table/extensions/indexable.rb

@@ -2,9 +2,9 @@ module ProMotion
   module Table
     module Indexable
       def table_data_index
-        return nil if @promotion_table_data.filtered || !self.class.get_indexable
+        return nil if self.promotion_table_data.filtered || !self.class.get_indexable
 
-        index = @promotion_table_data.sections.collect{ |section| section[:title][0] }
+        index = self.promotion_table_data.sections.collect{ |section| section[:title][0] }
         index.unshift("{search}") if self.class.get_searchable
         index
       end

data/lib/ProMotion/table/extensions/searchable.rb

@@ -42,19 +42,20 @@ module ProMotion
       ######### iOS methods, headless camel case #######
 
       def searchDisplayController(controller, shouldReloadTableForSearchString:search_string)
-        @promotion_table_data.search(search_string)
+        self.promotion_table_data.search(search_string)
         true
       end
 
       def searchDisplayControllerWillEndSearch(controller)
-        @promotion_table_data.stop_searching
-        @promotion_table_data_data = nil
+        self.promotion_table_data.stop_searching
         self.table_view.setScrollEnabled true
         self.table_view.reloadData
+        @table_search_display_controller.delegate.will_end_search if @table_search_display_controller.delegate.respond_to? "will_end_search"
       end
 
       def searchDisplayControllerWillBeginSearch(controller)
         self.table_view.setScrollEnabled false
+        @table_search_display_controller.delegate.will_begin_search if @table_search_display_controller.delegate.respond_to? "will_begin_search"
       end
     end
   end

data/lib/ProMotion/table/grouped_table.rb

@@ -1,7 +1,12 @@
 module ProMotion
   module GroupedTable
-    def table_style
-      UITableViewStyleGrouped
+    module GroupedTableClassMethods
+      def table_style
+        UITableViewStyleGrouped
+      end
+    end
+    def self.included(base)
+      base.extend(GroupedTableClassMethods)
     end
   end
 end

data/lib/ProMotion/table/table.rb

@@ -6,22 +6,14 @@ module ProMotion
     include ProMotion::Table::Refreshable
     include ProMotion::Table::Indexable
 
-    def table_view
-      @table_view ||= begin
-        t = UITableView.alloc.initWithFrame(self.view.frame, style: table_style)
-        t.dataSource = self
-        t.delegate = self
-        t
-      end
-    end
+    attr_reader :promotion_table_data
 
-    def table_style
-      UITableViewStylePlain
+    def table_view
+      self.view
     end
 
     def screen_setup
       check_table_data
-      set_up_table_view
       set_up_searchable
       set_up_refreshable
     end
@@ -30,11 +22,8 @@ module ProMotion
       PM.logger.error "Missing #table_data method in TableScreen #{self.class.to_s}." unless self.respond_to?(:table_data)
     end
 
-    def set_up_table_view
-      # before access self.table_data, create UITableView and call on_load
-      table_view
-
-      self.view = self.create_table_view_from_data(self.table_data)
+    def promotion_table_data
+      @promotion_table_data ||= TableData.new(table_data, table_view)
     end
 
     def set_up_searchable
@@ -53,37 +42,31 @@ module ProMotion
       end
     end
 
-    def create_table_view_from_data(data)
-      @promotion_table_data = TableData.new(data, table_view)
-      table_view
-    end
-
     def searching?
-      @promotion_table_data.filtered
+      self.promotion_table_data.filtered
     end
 
     def original_search_string
-      @promotion_table_data.original_search_string
+      self.promotion_table_data.original_search_string
     end
 
     def search_string
-      @promotion_table_data.search_string
+      self.promotion_table_data.search_string
     end
 
     def update_table_view_data(data)
-      create_table_view_from_data(data) unless @promotion_table_data
-      @promotion_table_data.data = data
+      self.promotion_table_data.data = data
       table_view.reloadData
     end
 
     # Methods to retrieve data
 
     def section_at_index(index)
-      @promotion_table_data.section(index)
+      self.promotion_table_data.section(index)
     end
 
     def cell_at_section_and_index(section, index)
-      @promotion_table_data.cell(section: section, index: index)
+      self.promotion_table_data.cell(section: section, index: index)
     end
 
     def trigger_action(action, arguments)
@@ -121,9 +104,9 @@ module ProMotion
 
       index_paths.each do |index_path|
         delete_cell = false
-        delete_cell = send(:on_cell_deleted, @promotion_table_data.cell(index_path: index_path)) if self.respond_to?("on_cell_deleted:")
+        delete_cell = send(:on_cell_deleted, self.promotion_table_data.cell(index_path: index_path)) if self.respond_to?("on_cell_deleted:")
         unless delete_cell == false
-          @promotion_table_data.delete_cell(index_path: index_path)
+          self.promotion_table_data.delete_cell(index_path: index_path)
           deletable_index_paths << index_path
         end
       end
@@ -136,7 +119,7 @@ module ProMotion
         params[:index] = params[:index_path].row
       end
 
-      data_cell = @promotion_table_data.cell(section: params[:section], index: params[:index])
+      data_cell = self.promotion_table_data.cell(section: params[:section], index: params[:index])
       return UITableViewCell.alloc.init unless data_cell # No data?
 
       table_cell = create_table_cell(data_cell)
@@ -165,28 +148,24 @@ module ProMotion
 
     ########## Cocoa touch methods #################
     def numberOfSectionsInTableView(table_view)
-      return @promotion_table_data.data.size
+      Array(self.promotion_table_data.data).length
     end
 
     # Number of cells
     def tableView(table_view, numberOfRowsInSection:section)
-      return @promotion_table_data.section_length(section)
-      0
+      self.promotion_table_data.section_length(section)
     end
 
     def tableView(table_view, titleForHeaderInSection:section)
-      return section_at_index(section)[:title] if section_at_index(section) && section_at_index(section)[:title]
+      section = section_at_index(section) || return
+      section[:title]
     end
 
     # Set table_data_index if you want the right hand index column (jumplist)
     def sectionIndexTitlesForTableView(table_view)
-      return nil if @promotion_table_data.filtered
-
-      if self.respond_to?(:table_data_index)
-        self.table_data_index
-      else
-        nil
-      end
+      return if self.promotion_table_data.filtered
+      return self.table_data_index if self.respond_to?(:table_data_index)
+      nil
     end
 
     def tableView(table_view, cellForRowAtIndexPath:index_path)
@@ -194,18 +173,18 @@ module ProMotion
     end
 
     def tableView(table_view, willDisplayCell: table_cell, forRowAtIndexPath: index_path)
-      data_cell = @promotion_table_data.cell(index_path: index_path)
+      data_cell = self.promotion_table_data.cell(index_path: index_path)
       table_cell.backgroundColor = data_cell[:background_color] || UIColor.whiteColor
       table_cell.send(:restyle!) if table_cell.respond_to?(:restyle!)
     end
 
     def tableView(table_view, heightForRowAtIndexPath:index_path)
-      (@promotion_table_data.cell(index_path: index_path)[:height] || table_view.rowHeight).to_f
+      (self.promotion_table_data.cell(index_path: index_path)[:height] || table_view.rowHeight).to_f
     end
 
     def tableView(table_view, didSelectRowAtIndexPath:index_path)
-      data_cell = @promotion_table_data.cell(index_path: index_path)
-      table_view.deselectRowAtIndexPath(index_path, animated: true)
+      data_cell = self.promotion_table_data.cell(index_path: index_path)
+      table_view.deselectRowAtIndexPath(index_path, animated: true) unless data_cell[:keep_selection] == true
 
       data_cell[:arguments] ||= {}
       data_cell[:arguments][:cell] = data_cell if data_cell[:arguments].is_a?(Hash) # TODO: Should we really do this?
@@ -214,7 +193,7 @@ module ProMotion
     end
 
     def tableView(table_view, editingStyleForRowAtIndexPath: index_path)
-      data_cell = @promotion_table_data.cell(index_path: index_path)
+      data_cell = self.promotion_table_data.cell(index_path: index_path)
 
       case data_cell[:editing_style]
       when nil, :none
@@ -250,6 +229,30 @@ module ProMotion
       delete_row(index_paths, animation)
     end
 
+    # Section view methods
+    def tableView(table_view, viewForHeaderInSection: index)
+      section = section_at_index(index)
+
+      if section[:title_view]
+        klass      = section[:title_view]
+        view       = klass.new if klass.respond_to?(:new)
+        view.title = section[:title] if view.respond_to?(:title=)
+        view
+      else
+        nil
+      end
+    end
+
+    def tableView(table_view, heightForHeaderInSection: index)
+      section = section_at_index(index)
+
+      if section[:title_view] || (section[:title] && !section[:title].empty?)
+        section[:title_view_height] || tableView.sectionHeaderHeight
+      else
+        0.0
+      end
+    end
+
     protected
 
     def map_row_animation_symbol(symbol)
@@ -268,6 +271,10 @@ module ProMotion
     end
 
     module TableClassMethods
+      def table_style
+        UITableViewStylePlain
+      end
+
       # Searchable
       def searchable(params={})
         @searchable_params = params

data/lib/ProMotion/thirdparty/formotion_screen.rb

@@ -2,7 +2,7 @@ module ProMotion
   if defined?(Formotion) && defined?(Formotion::FormController)
     class FormotionScreen < Formotion::FormController
       include ProMotion::ScreenModule
-      
+
       def self.new(args = {})
         s = self.alloc.initWithStyle(UITableViewStyleGrouped)
         s.on_create(args) if s.respond_to?(:on_create)
@@ -19,6 +19,8 @@ module ProMotion
         s.tableView.allowsSelectionDuringEditing = true
         s.title = t
 
+        s.form.on_submit { |form| s.on_submit(form) if s.respond_to?(:on_submit) }
+
         s
       end
 
@@ -28,11 +30,11 @@ module ProMotion
         self.form.controller = self
         self.tableView.reloadData
       end
-      
+
       def screen_setup
         self.title = self.class.send(:get_title)
       end
-    
+
       def loadView
         super
         self.send(:on_load) if self.respond_to?(:on_load)

data/lib/ProMotion/version.rb

@@ -1,3 +1,3 @@
 module ProMotion
-  VERSION = "1.0.4" unless defined?(ProMotion::VERSION)
+  VERSION = "1.1.0.rc1" unless defined?(ProMotion::VERSION)
 end

data/lib/ProMotion/view/styling.rb

@@ -1,8 +1,9 @@
 module ProMotion
   module Styling
     include Conversions
-    
+
     def set_attributes(element, args = {})
+      args = get_attributes_from_symbol(args)
       args.each { |k, v| set_attribute(element, k, v) }
       element
     end
@@ -34,6 +35,8 @@ module ProMotion
         args[:resize].each { |r| attributes[:autoresizingMask] |= map_resize_symbol(r) }
       end
 
+      args[:left] = args.delete(:x) if args[:x]
+      args[:top] = args.delete(:y) if args[:y]
       if [:left, :top, :width, :height].select{ |a| args[a] && args[a] != :auto }.length == 4
         attributes[:frame] = CGRectMake(args[:left], args[:top], args[:width], args[:height])
       end
@@ -64,33 +67,35 @@ module ProMotion
       end
       nil
     end
-    
+
     def add(element, attrs = {})
       add_to view_or_self, element, attrs
     end
     alias :add_element :add
     alias :add_view :add
 
-    def remove(element)
-      element.removeFromSuperview
-      element = nil
+    def remove(elements)
+      Array(elements).each(&:removeFromSuperview)
     end
     alias :remove_element :remove
     alias :remove_view :remove
 
-    def add_to(parent_element, element, attrs = {})
-      parent_element.addSubview element
-      if attrs && attrs.length > 0
-        set_attributes(element, attrs)
-        set_easy_attributes(parent_element, element, attrs)
+    def add_to(parent_element, elements, attrs = {})
+      attrs = get_attributes_from_symbol(attrs)
+      Array(elements).each do |element|
+        parent_element.addSubview element
+        if attrs && attrs.length > 0
+          set_attributes(element, attrs)
+          set_easy_attributes(parent_element, element, attrs)
+        end
       end
-      element
+      elements
     end
-    
+
     def view_or_self
       self.respond_to?(:view) ? self.view : self
     end
-    
+
     # These three color methods are stolen from BubbleWrap.
     def rgb_color(r,g,b)
       rgba_color(r,g,b,1)
@@ -103,7 +108,7 @@ module ProMotion
 
     def hex_color(str)
       hex_color = str.gsub("#", "")
-      case hex_color.size 
+      case hex_color.size
       when 3
         colors = hex_color.scan(%r{[0-9A-Fa-f]}).map{ |el| (el * 2).to_i(16) }
       when 6
@@ -111,16 +116,24 @@ module ProMotion
       else
         raise ArgumentError
       end
-      
+
       if colors.size == 3
         rgb_color(colors[0], colors[1], colors[2])
       else
         raise ArgumentError
-      end 
+      end
     end
-    
+
     protected
-    
+
+    def get_attributes_from_symbol(attrs)
+      return attrs if attrs.is_a?(Hash)
+      PM.logger.error "#{attrs} styling method is not defined" unless self.respond_to?(attrs)
+      new_attrs = send(attrs)
+      PM.logger.error "#{attrs} should return a hash" unless new_attrs.is_a?(Hash)
+      new_attrs
+    end
+
     def map_resize_symbol(symbol)
       @_resize_symbols ||= {
         left:     UIViewAutoresizingFlexibleLeftMargin,
@@ -128,10 +141,10 @@ module ProMotion
         top:      UIViewAutoresizingFlexibleTopMargin,
         bottom:   UIViewAutoresizingFlexibleBottomMargin,
         width:    UIViewAutoresizingFlexibleWidth,
-        height:   UIViewAutoresizingFlexibleHeight     
+        height:   UIViewAutoresizingFlexibleHeight
       }
       @_resize_symbols[symbol] || symbol
     end
-    
+
   end
 end