ProMotion 0.6.5 → 0.7.0

data/lib/ProMotion/screen_helpers/screen_navigation.rb

@@ -40,6 +40,10 @@ module ProMotion
       app_delegate.open_root_screen(screen)
     end
 
+    def open_modal(screen, args = {})
+      open screen, args.merge({ modal: true })
+    end
+
     def app_delegate
       UIApplication.sharedApplication.delegate
     end
@@ -48,7 +52,7 @@ module ProMotion
       args ||= {}
       args[:animated] ||= true
 
-      if self.is_modal?
+      if self.modal?
         close_modal_screen args
 
       elsif self.navigation_controller

data/lib/ProMotion/screen_helpers/screen_tabs.rb

@@ -34,9 +34,9 @@ module ProMotion
     def open_tab_bar(*screens)
       tab_bar = tab_bar_controller(*screens)
 
-      a = self.respond_to?(:load_root_screen) ? self : UIApplication.sharedApplication.delegate
+      a = self.respond_to?(:open_root_screen) ? self : UIApplication.sharedApplication.delegate
 
-      a.load_root_screen(tab_bar)
+      a.open_root_screen(tab_bar)
       tab_bar
     end
 

data/lib/ProMotion/screens/_compatibility/formotion_screen.rb

@@ -0,0 +1,65 @@
+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)
+
+        if s.respond_to?(:table_data)
+          s.form = s.table_data
+        elsif args[:form]
+          s.form = args[:form]
+        else
+          PM.logger.error "PM::FormotionScreen requires a `table_data` method or form: to be passed into `new`."
+        end
+
+        s.tableView.allowsSelectionDuringEditing = true
+
+        s
+      end
+
+      def viewDidLoad
+        super
+        self.view_did_load if self.respond_to?(:view_did_load)
+      end
+
+      def viewWillAppear(animated)
+        super
+        self.view_will_appear(animated) if self.respond_to?(:view_will_appear)
+      end
+
+      def viewDidAppear(animated)
+        super
+        self.view_did_appear(animated) if self.respond_to?(:view_did_appear)
+      end
+
+      def viewWillDisappear(animated)
+        self.view_will_disappear(animated) if self.respond_to?(:view_will_disappear)
+        super
+      end
+
+      def viewDidDisappear(animated)
+        self.view_did_disappear(animated) if self.respond_to?(:view_did_disappear)
+        super
+      end
+
+      def shouldAutorotateToInterfaceOrientation(orientation)
+        self.should_rotate(orientation)
+      end
+
+      def shouldAutorotate
+        self.should_autorotate
+      end
+
+      def willRotateToInterfaceOrientation(orientation, duration:duration)
+        self.will_rotate(orientation, duration)
+      end
+
+      def didRotateFromInterfaceOrientation(orientation)
+        self.on_rotate
+      end
+    end
+  end
+end

data/lib/ProMotion/screens/_screen_module.rb

@@ -13,7 +13,6 @@ module ProMotion
         raise StandardError.new("ERROR: Screens must extend UIViewController or a subclass of UIViewController.")
       end
 
-
       self.title = self.class.send(:get_title)
 
       args.each do |k, v|
@@ -21,17 +20,28 @@ module ProMotion
       end
 
       self.add_nav_bar if args[:nav_bar]
+      self.navigationController.toolbarHidden = !args[:toolbar] unless args[:toolbar].nil?
       self.on_init if self.respond_to?(:on_init)
       self.table_setup if self.respond_to?(:table_setup)
       self
     end
 
     def is_modal?
+      PM.logger.deprecated "`is_modal?` is deprecated. Use `modal?`."
+      modal?
+    end
+
+    def modal?
       self.modal == true
     end
 
     def has_nav_bar?
-      self.navigation_controller.nil? != true
+      PM.logger.deprecated "`has_nav_bar? is deprecated. Use `nav_bar?`."
+      nav_bar?
+    end
+
+    def nav_bar?
+      !!self.navigation_controller
     end
 
     def navigation_controller
@@ -45,7 +55,7 @@ module ProMotion
 
     # [DEPRECATED]
     def load_view_controller
-      warn "[DEPRECATION] `load_view_controller` is deprecated and doesn't actually do anything anymore. You can safely remove it from your code."
+      PM.logger.deprecated  "`load_view_controller` is deprecated and doesn't actually do anything anymore. You can safely remove it from your code."
     end
 
     def set_tab_bar_item(args = {})
@@ -74,25 +84,13 @@ module ProMotion
       set_nav_bar_button :left, args
     end
 
-    # If you call set_nav_bar_button with a nil title and system_icon: UIBarButtonSystemItemAdd (or any other
-    # system icon), the button is initialized with a barButtonSystemItem instead of a title.
     def set_nav_bar_button(side, args={})
       args[:style]  ||= UIBarButtonItemStyleBordered
       args[:target] ||= self
       args[:action] ||= nil
+      button_type = args[:image] || args[:button] || args[:system_icon] || args[:title] || "Button"
 
-      button = case args[:title]
-        when String
-          UIBarButtonItem.alloc.initWithTitle(args[:title], style: args[:style], target: args[:target], action: args[:action])
-        when UIImage
-          UIBarButtonItem.alloc.initWithImage(args[:title], style: args[:style], target: args[:target], action: args[:action])
-        when Symbol, NilClass
-          UIBarButtonItem.alloc.initWithBarButtonSystemItem(args[:system_icon], target: args[:target], action: args[:action]) if args[:system_icon]
-        when UIBarButtonItem
-          args[:title]
-        else
-          PM.logger.error("Please supply a title string, a UIImage or :system.")
-      end
+      button = bar_button_item button_type, args
 
       self.navigationItem.leftBarButtonItem = button if side == :left
       self.navigationItem.rightBarButtonItem = button if side == :right
@@ -100,6 +98,23 @@ module ProMotion
       button
     end
 
+    def bar_button_item(button_type, args)
+      case button_type
+        when UIBarButtonItem
+          button_type
+        when UIImage
+          UIBarButtonItem.alloc.initWithImage(button_type, style: args[:style], target: args[:target], action: args[:action])
+        when String
+          UIBarButtonItem.alloc.initWithTitle(button_type, style: args[:style], target: args[:target], action: args[:action])
+        else
+          if args[:system_icon]
+            UIBarButtonItem.alloc.initWithBarButtonSystemItem(args[:system_icon], target: args[:target], action: args[:action])
+          else
+            PM.logger.error("Please supply a title string, a UIImage or :system.")
+          end
+      end
+    end
+
     # [DEPRECATED]
     def view_controller=(vc)
       set_view_controller(vc)
@@ -116,9 +131,6 @@ module ProMotion
     end
 
     def view_did_load; end
-    def on_opened
-      warn "[DEPRECATION] `on_opened` is deprecated.  Please use `on_appear` instead."
-    end
 
     def view_will_appear(animated)
       self.will_appear
@@ -193,6 +205,7 @@ module ProMotion
 
     def supported_device_families
       NSBundle.mainBundle.infoDictionary["UIDeviceFamily"].map do |m|
+        # TODO: What about universal apps?
         case m
         when "1"
           :iphone

data/lib/ProMotion/screens/_table_screen_module.rb

@@ -1,9 +1,9 @@
 module ProMotion
   module TableScreenModule
-    include MotionTable::PlainTable
-    include MotionTable::SearchableTable
-    include MotionTable::RefreshableTable
-    include ProMotion::ScreenModule
+    include PlainTable
+    include SearchableTable
+    include RefreshableTable
+    include ScreenModule
 
     def update_table_data
       self.update_table_view_data(table_data)

data/lib/ProMotion/{screen_helpers → screens}/_tables/_refreshable_table.rb

@@ -1,4 +1,4 @@
-module ProMotion::MotionTable
+module ProMotion
   module RefreshableTable
     def make_refreshable(params={})
       pull_message = params[:pull_message] || "Pull to refresh"
@@ -39,4 +39,4 @@ module ProMotion::MotionTable
       @refresh_control.endRefreshing
     end
   end
-end
+end

data/lib/ProMotion/{screen_helpers → screens}/_tables/_searchable_table.rb

@@ -1,18 +1,10 @@
-module ProMotion::MotionTable
+module ProMotion
   module SearchableTable
-    def make_searchable(params={})
-      params[:content_controller] ||= params[:contentController]
-      params[:data_source] ||= params[:searchResultsDataSource]
-      params[:search_results_delegate] ||= params[:searchResultsDelegate]
 
-      params[:frame] ||= CGRectMake(0, 0, 320, 44) # TODO: Don't hardcode this...
-      params[:content_controller] ||= self
-      params[:delegate] ||= self
-      params[:data_source] ||= self
-      params[:search_results_delegate] ||= self
+    def make_searchable(params={})
+      params = set_searchable_param_defaults(params)
 
-      search_bar = UISearchBar.alloc.initWithFrame(params[:frame])
-      search_bar.autoresizingMask = UIViewAutoresizingFlexibleWidth
+      search_bar = create_search_bar(params)
 
       if params[:search_bar] && params[:search_bar][:placeholder]
         search_bar.placeholder = params[:search_bar][:placeholder]
@@ -27,40 +19,41 @@ module ProMotion::MotionTable
     end
     alias :makeSearchable :make_searchable
 
-    ######### iOS methods, headless camel case #######
+    def set_searchable_param_defaults(params)
+      params[:content_controller] ||= params[:contentController]
+      params[:data_source] ||= params[:searchResultsDataSource]
+      params[:search_results_delegate] ||= params[:searchResultsDelegate]
 
-    def searchDisplayController(controller, shouldReloadTableForSearchString:search_string)
-      @mt_filtered_data = nil
-      @mt_filtered_data = []
+      params[:frame] ||= CGRectMake(0, 0, 320, 44) # TODO: Don't hardcode this...
+      params[:content_controller] ||= self
+      params[:delegate] ||= self
+      params[:data_source] ||= self
+      params[:search_results_delegate] ||= self
+      params
+    end
 
-      @mt_table_view_groups.each do |section|
-        new_section = {}
-        new_section[:cells] = []
+    def create_search_bar(params)
+      search_bar = UISearchBar.alloc.initWithFrame(params[:frame])
+      search_bar.autoresizingMask = UIViewAutoresizingFlexibleWidth
+      search_bar
+    end
 
-        section[:cells].each do |cell|
-          if cell[:title].to_s.downcase.strip.include?(search_string.downcase.strip)
-            new_section[:cells] << cell
-          end
-        end
+    ######### iOS methods, headless camel case #######
 
-        if new_section[:cells] && new_section[:cells].length > 0
-          new_section[:title] = section[:title]
-          @mt_filtered_data << new_section
-        end
-      end
+    def searchDisplayController(controller, shouldReloadTableForSearchString:search_string)
+      @promotion_table_data.search(search_string)
       true
     end
 
     def searchDisplayControllerWillEndSearch(controller)
-      @mt_filtered = false
-      @mt_filtered_data = nil
+      @promotion_table_data.stop_searching
+      @promotion_table_data_data = nil
       self.table_view.setScrollEnabled true
     end
 
     def searchDisplayControllerWillBeginSearch(controller)
-      @mt_filtered = true
-      @mt_filtered_data = []
       self.table_view.setScrollEnabled false
     end
+
   end
-end
+end

data/lib/ProMotion/screens/_tables/_sectioned_table.rb

@@ -0,0 +1,5 @@
+module ProMotion
+  module SectionedTable
+    include Table
+  end
+end

data/lib/ProMotion/screens/_tables/_table.rb

@@ -0,0 +1,149 @@
+module ProMotion
+  module Table
+    include ProMotion::ViewHelper
+
+    def table_setup
+      check_table_data
+      set_up_table_view
+      set_up_searchable
+      set_up_refreshable
+    end
+
+    def check_table_data
+      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
+      self.view = self.create_table_view_from_data(self.table_data)
+    end
+
+    def set_up_searchable
+      if self.class.respond_to?(:get_searchable) && self.class.get_searchable
+        self.make_searchable(content_controller: self, search_bar: self.class.get_searchable_params)
+      end
+    end
+
+    def set_up_refreshable
+      if self.class.respond_to?(:get_refreshable) && self.class.get_refreshable
+        if defined?(UIRefreshControl)
+          self.make_refreshable(self.class.get_refreshable_params)
+        else
+          PM.logger.warn "To use the refresh control on < iOS 6, you need to include the CocoaPod 'CKRefreshControl'."
+        end
+      end
+    end
+
+    def create_table_view_from_data(data)
+      @promotion_table_data = TableData.new(data, table_view)
+      table_view
+    end
+
+    def update_table_view_data(data)
+      @promotion_table_data.data = data
+      table_view.reloadData
+    end
+
+    # Methods to retrieve data
+
+    def section_at_index(index)
+      @promotion_table_data.section(index)
+    end
+
+    def cell_at_section_and_index(section, index)
+      @promotion_table_data.cell(section: section, index: index)
+    end
+
+    def trigger_action(action, arguments)
+      if self.respond_to?(action)
+        expected_arguments = self.method(action).arity
+        if expected_arguments == 0
+          self.send(action)
+        elsif expected_arguments == 1 || expected_arguments == -1
+          self.send(action, arguments)
+        else
+          PM.logger.warn "#{action} expects #{expected_arguments} arguments. Maximum number of required arguments for an action is 1."
+        end
+      else
+        PM.logger.info "Action not implemented: #{action.to_s}"
+      end
+    end
+
+    def accessory_toggled_switch(switch)
+      table_cell = switch.superview
+      index_path = table_cell.superview.indexPathForCell(table_cell)
+
+      data_cell = cell_at_section_and_index(index_path.section, index_path.row)
+      data_cell[:arguments] = {} unless data_cell[:arguments]
+      data_cell[:arguments][:value] = switch.isOn if data_cell[:arguments].is_a? Hash
+      data_cell[:accessory_action] ||= data_cell[:accessoryAction] # For legacy support
+
+      trigger_action(data_cell[:accessory_action], data_cell[:arguments]) if data_cell[:accessory_action]
+    end
+
+    def delete_row(index_paths, animation = nil)
+      animation ||= UITableViewRowAnimationAutomatic
+      index_paths = Array(index_paths)
+
+      index_paths.each do |index_path|
+        @promotion_table_data.delete_cell(index_path: index_path)
+      end
+      table_view.deleteRowsAtIndexPaths(index_paths, withRowAnimation:animation)
+    end
+
+    ########## Cocoa touch methods #################
+    def numberOfSectionsInTableView(table_view)
+      return Array(@promotion_table_data.data).length
+    end
+
+    # Number of cells
+    def tableView(table_view, numberOfRowsInSection:section)
+      return @promotion_table_data.section_length(section)
+      0
+    end
+
+    def tableView(table_view, titleForHeaderInSection:section)
+      return section_at_index(section)[:title] if section_at_index(section) && section_at_index(section)[:title]
+    end
+
+    # Set table_data_index if you want the right hand index column (jumplist)
+    def sectionIndexTitlesForTableView(table_view)
+      self.table_data_index if self.respond_to?(:table_data_index)
+    end
+
+    def tableView(table_view, cellForRowAtIndexPath:index_path)
+      @promotion_table_data.table_view_cell(index_path: index_path)
+    end
+
+    def tableView(table_view, heightForRowAtIndexPath:index_path)
+      (@promotion_table_data.cell(index_path: index_path)[:height] || table_view.rowHeight).to_f
+    end
+
+    def tableView(table_view, didSelectRowAtIndexPath:index_path)
+      cell = @promotion_table_data.cell(index_path: index_path)
+      table_view.deselectRowAtIndexPath(index_path, animated: true)
+
+      cell[:arguments] ||= {}
+      cell[:arguments][:cell] = cell if cell[:arguments].is_a?(Hash) # TODO: Should we really do this?
+
+      trigger_action(cell[:action], cell[:arguments]) if cell[:action]
+    end
+
+    def tableView(tableView, commitEditingStyle:editing_style, forRowAtIndexPath:index_path)
+      if editing_style == UITableViewCellEditingStyleDelete
+        delete_cell(index_path)
+      end
+    end
+
+    def deleteRowsAtIndexPaths(indexPaths, withRowAnimation:animation)
+      PM.logger.warn "ProMotion expects you to use 'delete_cell(index_paths, animation)'' instead of 'deleteRowsAtIndexPaths(indexPaths, withRowAnimation:animation)'."
+      delete_cell(indexPaths, animation)
+    end
+
+
+    # Old aliases, deprecated, will be removed
+    alias :createTableViewFromData :create_table_view_from_data
+    alias :updateTableViewData :update_table_view_data
+    alias :cellAtSectionAndIndex :cell_at_section_and_index
+
+  end
+end