ProMotion 0.5.2 → 0.6.0

data/lib/ProMotion/screen_helpers/_tables/_searchable_table.rb

@@ -22,13 +22,13 @@ module ProMotion::MotionTable
       @contacts_search_display_controller.delegate = params[:delegate]
       @contacts_search_display_controller.searchResultsDataSource = params[:data_source]
       @contacts_search_display_controller.searchResultsDelegate = params[:search_results_delegate]
-      
+
       self.table_view.tableHeaderView = search_bar
     end
     alias :makeSearchable :make_searchable
 
     ######### iOS methods, headless camel case #######
-    
+
     def searchDisplayController(controller, shouldReloadTableForSearchString:search_string)
       @mt_filtered_data = nil
       @mt_filtered_data = []

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

@@ -1,12 +1,22 @@
 module ProMotion::MotionTable
   module SectionedTable
+    include ProMotion::ViewHelper
+    
     def table_setup
-      ProMotion::Console.log(" - #table_data method needed in TableScreen #{self.class.to_s}.", with_color: ProMotion::Console::RED_COLOR) unless self.respond_to?(:table_data)
+      PM.logger.error "Missing #table_data method in TableScreen #{self.class.to_s}." unless self.respond_to?(:table_data)
 
       self.view = self.create_table_view_from_data(self.table_data)
+      
       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
+      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
 
     # @param [Array] Array of table data
@@ -37,7 +47,9 @@ module ProMotion::MotionTable
     end
 
     def cell_at_section_and_index(section, index)
-      return section_at_index(section)[:cells].at(index) if section_at_index(section) && section_at_index(section)[:cells]
+      if section_at_index(section) && section_at_index(section)[:cells]
+        return section_at_index(section)[:cells].at(index)
+      end
     end
     alias :cellAtSectionAndIndex :cell_at_section_and_index
 
@@ -49,36 +61,22 @@ module ProMotion::MotionTable
         elsif expected_arguments == 1 || expected_arguments == -1
           self.send(action, arguments)
         else
-          ProMotion::Console.log("MotionTable warning: #{action} expects #{expected_arguments} arguments. Maximum number of required arguments for an action is 1.", with_color: MotionTable::ProMotion::Console::RED_COLOR)
+          PM.logger.warn "#{action} expects #{expected_arguments} arguments. Maximum number of required arguments for an action is 1."
         end
       else
-        ProMotion::Console.log("Action not implemented: #{action.to_s}", with_color: ProMotion::Console::RED_COLOR)
-      end
-    end
-  
-    def set_cell_attributes(element, args = {})
-      args.each do |k, v|
-        if v.is_a? Hash
-          v.each do
-            sub_element = element.send("#{k}")
-            set_cell_attributes(sub_element, v)
-          end
-        else
-          element.send("#{k}=", v) if element.respond_to?("#{k}=")
-        end
+        PM.logger.info "Action not implemented: #{action.to_s}"
       end
-      element
     end
 
     def accessory_toggled_switch(switch)
       table_cell = switch.superview
-      indexPath = table_cell.superview.indexPathForCell(table_cell)
+      index_path = table_cell.superview.indexPathForCell(table_cell)
 
-      data_cell = cell_at_section_and_index(indexPath.section, indexPath.row)
+      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
 
@@ -105,14 +103,14 @@ module ProMotion::MotionTable
     # Set table_data_index if you want the right hand index column (jumplist)
     def sectionIndexTitlesForTableView(table_view)
       if self.respond_to?(:table_data_index)
-        self.table_data_index 
+        self.table_data_index
       end
     end
-    
+
     def remap_data_cell(data_cell)
       # Re-maps legacy data cell calls
-      mappings = { 
-        cell_style: :cellStyle, 
+      mappings = {
+        cell_style: :cellStyle,
         cell_identifier: :cellIdentifier,
         cell_class: :cellClass,
         masks_to_bounds: :masksToBounds,
@@ -138,14 +136,12 @@ module ProMotion::MotionTable
       data_cell
     end
 
-    def tableView(table_view, cellForRowAtIndexPath:indexPath)
-      # Aah, magic happens here...
-
-      data_cell = cell_at_section_and_index(indexPath.section, indexPath.row)
+    def tableView(table_view, cellForRowAtIndexPath:index_path)
+      data_cell = cell_at_section_and_index(index_path.section, index_path.row)
       return UITableViewCell.alloc.init unless data_cell
-      
+
       data_cell = self.remap_data_cell(data_cell)
-      
+
       data_cell[:cell_style] ||= UITableViewCellStyleDefault
       data_cell[:cell_identifier] ||= "Cell"
       cell_identifier = data_cell[:cell_identifier]
@@ -154,7 +150,7 @@ module ProMotion::MotionTable
       table_cell = table_view.dequeueReusableCellWithIdentifier(cell_identifier)
       unless table_cell
         table_cell = data_cell[:cell_class].alloc.initWithStyle(data_cell[:cell_style], reuseIdentifier:cell_identifier)
-        
+
         # Add optimizations here
         table_cell.layer.masksToBounds = true if data_cell[:masks_to_bounds]
         table_cell.backgroundColor = data_cell[:background_color] if data_cell[:background_color]
@@ -163,9 +159,9 @@ module ProMotion::MotionTable
       end
 
       if data_cell[:cell_class_attributes]
-        set_cell_attributes table_cell, data_cell[:cell_class_attributes]
+        set_attributes table_cell, data_cell[:cell_class_attributes]
       end
-      
+
       if data_cell[:accessory_view]
         table_cell.accessoryView = data_cell[:accessory_view]
         table_cell.accessoryView.autoresizingMask = UIViewAutoresizingFlexibleWidth
@@ -177,7 +173,7 @@ module ProMotion::MotionTable
 
       if data_cell[:accessory] && data_cell[:accessory] == :switch
         switch_view = UISwitch.alloc.initWithFrame(CGRectZero)
-        switch_view.addTarget(self, action: "accessory_toggled_switch:", forControlEvents:UIControlEventValueChanged);
+        switch_view.addTarget(self, action: "accessory_toggled_switch:", forControlEvents:UIControlEventValueChanged)
         switch_view.on = true if data_cell[:accessory_checked]
         table_cell.accessoryView = switch_view
       end
@@ -199,9 +195,9 @@ module ProMotion::MotionTable
           table_cell.image_size = data_cell[:remote_image][:size] if data_cell[:remote_image][:size] && table_cell.respond_to?("image_size=")
           table_cell.imageView.setImageWithURL(url, placeholderImage: placeholder)
           table_cell.imageView.layer.masksToBounds = true
-          table_cell.imageView.layer.cornerRadius = data_cell[:remote_image][:radius]
+          table_cell.imageView.layer.cornerRadius = data_cell[:remote_image][:radius] if data_cell[:remote_image].has_key?(:radius)
         else
-          ProMotion::Console.log("ProMotion Warning: to use remote_image with TableScreen you need to include the CocoaPod 'SDWebImage'.", with_color: ProMotion::Console::RED_COLOR)
+          PM.logger.error "ProMotion Warning: to use remote_image with TableScreen you need to include the CocoaPod 'SDWebImage'."
         end
       elsif data_cell[:image]
         table_cell.imageView.layer.masksToBounds = true
@@ -240,7 +236,7 @@ module ProMotion::MotionTable
 
         unless ui_label == true
           label ||= UILabel.alloc.initWithFrame(CGRectZero)
-          set_cell_attributes label, data_cell[:styles][:label]
+          set_attributes label, data_cell[:styles][:label]
           table_cell.contentView.addSubview label
         end
         # hackery
@@ -254,9 +250,18 @@ module ProMotion::MotionTable
       return table_cell
     end
 
-    def tableView(table_view, didSelectRowAtIndexPath:indexPath)
-      cell = cell_at_section_and_index(indexPath.section, indexPath.row)
-      table_view.deselectRowAtIndexPath(indexPath, animated: true);
+    def tableView(tableView, heightForRowAtIndexPath:index_path)
+      cell = cell_at_section_and_index(index_path.section, index_path.row)
+      if cell[:height]
+        cell[:height].to_f
+      else
+        tableView.rowHeight
+      end
+    end
+
+    def tableView(table_view, didSelectRowAtIndexPath:index_path)
+      cell = cell_at_section_and_index(index_path.section, index_path.row)
+      table_view.deselectRowAtIndexPath(index_path, animated: true)
       cell[:arguments] ||= {}
       cell[:arguments][:cell] = cell if cell[:arguments].is_a?(Hash)
       trigger_action(cell[:action], cell[:arguments]) if cell[:action]

data/lib/ProMotion/screen_helpers/_tables/grouped_table.rb

@@ -1,7 +1,8 @@
 module ProMotion::MotionTable
   module GroupedTable
     include SectionedTable
-    
+    include RefreshableTable
+
     def table_view
       @table_view ||= UITableView.alloc.initWithFrame(self.view.frame, style:UITableViewStyleGrouped)
       @table_view.dataSource = self;

data/lib/ProMotion/screen_helpers/_tables/plain_table.rb

@@ -2,6 +2,7 @@ module ProMotion::MotionTable
   module PlainTable
     include SectionedTable
     include SearchableTable
+    include RefreshableTable
 
     def table_view
       @table_view ||= UITableView.alloc.initWithFrame(self.view.frame, style:UITableViewStylePlain)

data/lib/ProMotion/screen_helpers/screen_elements.rb

@@ -1,28 +1,33 @@
 module ProMotion
   module ScreenElements
     include ProMotion::ViewHelper
-    
-    def add(v, attrs = {})
-      if attrs && attrs.length > 0
-        set_attributes(v, attrs)
-      end
-      self.view.addSubview(v)
-      v
+
+    def add(element, attrs = {})
+      add_to self.view, element, attrs
     end
     alias :add_element :add
     alias :add_view :add
 
-    def remove(v)
-      v.removeFromSuperview
-      v = nil
+    def remove(element)
+      element.removeFromSuperview
+      element = nil
     end
     alias :remove_element :remove
     alias :remove_view :remove
+    
+    def add_to(parent_element, element, attrs = {})
+      if attrs && attrs.length > 0
+        set_attributes(element, attrs)
+        set_easy_attributes(parent_element, element, attrs)
+      end
+      parent_element.addSubview element
+      element
+    end
 
     def bounds
       return self.view.bounds
     end
-    
+
     def frame
       return self.view.frame
     end

data/lib/ProMotion/screen_helpers/screen_navigation.rb

@@ -2,14 +2,17 @@ module ProMotion
   module ScreenNavigation
 
     def open_screen(screen, args = {})
-      
+
       # Apply properties to instance
       screen = setup_screen_for_open(screen, args)
       ensure_wrapper_controller_in_place(screen, args)
 
-      screen.send(:on_load) if screen.respond_to?(:on_load)      
+      screen.send(:on_load) if screen.respond_to?(:on_load)
       animated = args[:animated] || true
 
+      return self.split_screen.detail_screen = screen if args[:in_detail] && self.split_screen
+      return self.split_screen.master_screen = screen if args[:in_master] && self.split_screen
+
       if args[:close_all]
         open_root_screen screen
 
@@ -36,18 +39,15 @@ module ProMotion
     def open_root_screen(screen)
       app_delegate.open_root_screen(screen)
     end
-    alias :fresh_start :open_root_screen
 
     def app_delegate
       UIApplication.sharedApplication.delegate
     end
-    
-    # TODO: De-uglify this method.
+
     def close_screen(args = {})
       args ||= {}
       args[:animated] ||= true
-      
-      # Pop current view, maybe with arguments, if in navigation controller
+
       if self.is_modal?
         close_modal_screen args
 
@@ -56,8 +56,8 @@ module ProMotion
         send_on_return(args) # TODO: this would be better implemented in a callback or view_did_disappear.
 
       else
-        Console.log("Tried to close #{self.to_s}; however, this screen isn't modal or in a nav bar.", withColor: Console::PURPLE_COLOR)
-        
+        PM.logger.warn "Tried to close #{self.to_s}; however, this screen isn't modal or in a nav bar."
+
       end
     end
     alias :close :close_screen
@@ -69,7 +69,6 @@ module ProMotion
         else
           self.parent_screen.send(:on_return)
         end
-        ProMotion::Screen.current_screen = self.parent_screen
       end
     end
 
@@ -78,14 +77,14 @@ module ProMotion
     end
 
     def push_view_controller(vc, nav_controller=nil)
-      Console.log(" You need a nav_bar if you are going to push #{vc.to_s} onto it.", withColor: Console::RED_COLOR) unless self.navigation_controller
+      unless self.navigation_controller
+        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
+      vc.first_screen = false if vc.respond_to?(:first_screen=)
       nav_controller.pushViewController(vc, animated: true)
     end
 
-
-
-
     protected
 
     def setup_screen_for_open(screen, args={})
@@ -97,7 +96,7 @@ module ProMotion
       screen.parent_screen = self if screen.respond_to?("parent_screen=")
       screen.title = args[:title] if args[:title] && screen.respond_to?("title=")
       screen.modal = args[:modal] if args[:modal] && screen.respond_to?("modal=")
-      
+
       # Hide bottom bar?
       screen.hidesBottomBarWhenPushed = args[:hide_tab_bar] == true
 
@@ -134,7 +133,7 @@ module ProMotion
         end
 
       else
-        Console.log("No tab bar item '#{tab_name}'", with_color: Console::RED_COLOR)
+        PM.logger.error "No tab bar item '#{tab_name}'"
       end
     end
 

data/lib/ProMotion/screen_helpers/screen_tabs.rb

@@ -9,31 +9,35 @@ module ProMotion
       screens.map! { |s| s.respond_to?(:new) ? s.new : s } # Initialize any classes
 
       screens.each do |s|
-        if s.is_a?(ProMotion::Screen) || s.is_a?(ProMotion::TableScreen) || s.is_a?(ProMotion::ScreenModule)
-          s = s.new if s.respond_to?(:new)
-          s.tabBarItem.tag = tag_index
-          s.parent_screen = self if self.is_a?(UIViewController) && s.respond_to?("parent_screen=")
-          s.tab_bar = tab_bar_controller if s.respond_to?("tab_bar=")
-          view_controllers << s.main_controller
-          tag_index += 1
-        else
-          Console.log("Non-Screen passed into tab_bar_controller: #{s.to_s}", withColor: Console::RED_COLOR)
-        end
-        
+        s = s.new if s.respond_to?(:new)
+
+        s.tabBarItem.tag = tag_index
+
+        s.parent_screen = self if self.is_a?(UIViewController) && s.respond_to?("parent_screen=")
+        s.tab_bar = tab_bar_controller if s.respond_to?("tab_bar=")
+
+        vc = s.respond_to?(:main_controller) ? s.main_controller : s
+        view_controllers << vc
+
+        tag_index += 1
+
         s.on_load if s.respond_to?(:on_load)
       end
 
       tab_bar_controller.viewControllers = view_controllers
       tab_bar_controller
     end
-    
+
     # Open a UITabBarController with the specified screens as the
     # root view controller of the current app.
     # @param [Array] A comma-delimited list of screen classes or instances.
     # @return [UITabBarController]
     def open_tab_bar(*screens)
       tab_bar = tab_bar_controller(*screens)
-      UIApplication.sharedApplication.delegate.load_root_screen(tab_bar)
+
+      a = self.respond_to?(:load_root_screen) ? self : UIApplication.sharedApplication.delegate
+
+      a.load_root_screen(tab_bar)
       tab_bar
     end
 
@@ -62,12 +66,12 @@ module ProMotion
       title = tab[:title] if tab[:title]
       tab[:tag] ||= @current_tag ||= 0
       @current_tag = tab[:tag] + 1
-      
+
       tab_bar_item = create_tab_bar_icon(tab[:system_icon], tab[:tag]) if tab[:system_icon]
       tab_bar_item = create_tab_bar_icon_custom(title, tab[:icon], tab[:tag]) if tab[:icon]
-      
+
       tab_bar_item.badgeValue = tab[:badge_number].to_s unless tab[:badge_number].nil? || tab[:badge_number] <= 0
-      
+
       return tab_bar_item
     end
 

data/lib/ProMotion/screen_helpers/split_screen.rb

@@ -0,0 +1,42 @@
+module ProMotion
+  module SplitScreen
+    def split_screen_controller(master, detail)
+      master_main = master.navigationController ? master.navigationController : master
+      detail_main = detail.navigationController ? detail.navigationController : detail
+
+      split = SplitViewController.alloc.init
+      split.viewControllers = [ master_main, detail_main ]
+      split.delegate = self
+
+      [ master, detail ].map { |s| s.split_screen = split if s.respond_to?(:split_screen=) }
+
+      split
+    end
+
+    def create_split_screen(master, detail, args={})
+      master = master.new if master.respond_to?(:new)
+      detail = detail.new if detail.respond_to?(:new)
+
+      [ master, detail ].map { |s| s.on_load if s.respond_to?(:on_load) }
+
+      split_screen_controller master, detail
+    end
+
+    def open_split_screen(master, detail, args={})
+      split = create_split_screen(master, detail, args)
+      open split, args
+      split
+    end
+
+    # UISplitViewControllerDelegate methods
+
+    def splitViewController(svc, willHideViewController: vc, withBarButtonItem: button, forPopoverController: pc)
+      button.title = vc.title
+      svc.detail_screen.navigationItem.leftBarButtonItem = button;
+    end
+
+    def splitViewController(svc, willShowViewController: vc, invalidatingBarButtonItem: barButtonItem)
+      svc.detail_screen.navigationItem.leftBarButtonItem = nil
+    end
+  end
+end