motion-table 0.1.6 → 0.1.7

data/README.md

@@ -45,9 +45,11 @@ class MyController < UITableViewController
       title: "My App Settings",
       cells: [{ 
           title: "Be Awesome", 
-          accessory: :switch, 
-          accessoryDefault: true, 
-          accessoryAction: :save_being_awesome
+          subtitle: "Do so. Please."
+          image: {
+            image: UIImage.imageNamed("image"),
+            radius: 12
+          }
         }, { 
           title: "Mute", 
           accessory: :switch, 
@@ -68,12 +70,6 @@ class MyController < UITableViewController
     # Implement your edit_profile view here
   end
 
-  def save_being_awesome(args)
-    # Depending on whether the switch is on or off,
-    # args => { value: true } or
-    # args => { value: false }
-  end
-
   def save_mute(args)
     # Depending on whether the switch is on or off,
     # args => { value: true } or
@@ -87,7 +83,6 @@ end
 ```ruby
 class MyController < UITableViewController
   include MotionTable::PlainTable
-  inclued MotionTable::SearchableTable # For search capability
 
   def viewDidLoad
     super
@@ -108,7 +103,7 @@ class MyController < UITableViewController
       }
     ]
 
-    self.makeSearchable # Will add search capability if you include MotionTable::SearchableTable, nothing more needed :)
+    self.makeSearchable # Will add search capability, nothing more needed :)
     self.view = self.createTableViewFromData(@plain_table_view_data)
   end
 

data/lib/motion-table/searchable_table.rb

@@ -1,11 +1,21 @@
 module MotionTable
   module SearchableTable
-    def makeSearchable
-      searchBar = UISearchBar.alloc.initWithFrame(CGRectMake(0, 0, 320, 44))
-      @contactsSearchDisplayController = UISearchDisplayController.alloc.initWithSearchBar(searchBar, contentsController: self)
-      @contactsSearchDisplayController.delegate = self
-      @contactsSearchDisplayController.searchResultsDataSource = self
-      @contactsSearchDisplayController.searchResultsDelegate = self
+    def makeSearchable(params={})
+      params[:frame] ||= CGRectMake(0, 0, 320, 44)
+      params[:contentController] ||= self
+      params[:delegate] ||= self
+      params[:searchResultsDataSource] ||= self
+      params[:searchResultsDelegate] ||= self
+
+      searchBar = UISearchBar.alloc.initWithFrame(params[:frame])
+      if params[:searchBar] && params[:searchBar][:placeholder]
+        searchBar.placeholder = params[:searchBar][:placeholder]
+      end
+
+      @contactsSearchDisplayController = UISearchDisplayController.alloc.initWithSearchBar(searchBar, contentsController: params[:contentController])
+      @contactsSearchDisplayController.delegate = params[:delegate]
+      @contactsSearchDisplayController.searchResultsDataSource = params[:searchResultsDataSource]
+      @contactsSearchDisplayController.searchResultsDelegate = params[:searchResultsDelegate]
       
       self.tableView.tableHeaderView = searchBar
     end
@@ -33,6 +43,7 @@ module MotionTable
 
     def searchDisplayControllerWillEndSearch(controller)
       @mt_table_view_groups = @original_data.clone
+      @original_data = nil
     end
 
     def searchDisplayControllerWillBeginSearch(controller)

data/lib/motion-table/sectioned_table.rb

@@ -30,28 +30,47 @@ module MotionTable
     def tableView(tableView, titleForHeaderInSection:section)
       return sectionAtIndex(section)[:title]
     end
+    
+    # Set table_data_index if you want the right hand index column (jumplist)
+    def sectionIndexTitlesForTableView(tableView)
+      self.table_data_index if respond_to? :table_data_index
+    end
+
 
     def tableView(tableView, cellForRowAtIndexPath:indexPath)
       dataCell = cellAtSectionAndIndex(indexPath.section, indexPath.row)
+      dataCell[:cellStyle] ||= UITableViewCellStyleDefault
       
       cellIdentifier = "Cell"
 
       tableCell = tableView.dequeueReusableCellWithIdentifier(cellIdentifier)
       unless tableCell
-        tableCell = UITableViewCell.alloc.initWithFrame(CGRectZero, reuseIdentifier:cellIdentifier)
-        tableCell.accessoryView = dataCell[:accessoryView] if dataCell[:accessoryView]
-        
-        if dataCell[:accessory] && dataCell[:accessory] == :switch
-          switchView = UISwitch.alloc.initWithFrame(CGRectZero)
-          switchView.addTarget(self, action: "accessoryToggledSwitch:", forControlEvents:UIControlEventValueChanged);
-          switchView.on = true if dataCell[:accessoryDefault]
-          tableCell.accessoryView = switchView
-        end
+        tableCell = UITableViewCell.alloc.initWithStyle(dataCell[:cellStyle], reuseIdentifier:cellIdentifier)
+      end
+
+      tableCell.accessoryView = dataCell[:accessoryView] if dataCell[:accessoryView]
+  
+      if dataCell[:accessory] && dataCell[:accessory] == :switch
+        switchView = UISwitch.alloc.initWithFrame(CGRectZero)
+        switchView.addTarget(self, action: "accessoryToggledSwitch:", forControlEvents:UIControlEventValueChanged);
+        switchView.on = true if dataCell[:accessoryDefault]
+        tableCell.accessoryView = switchView
+      end
+
+      if dataCell[:subtitle]
+        tableCell.detailTextLabel.text = dataCell[:subtitle]
+      end
+
+
+      if dataCell[:image]
+        tableCell.imageView.layer.masksToBounds = true
+        tableCell.imageView.image = dataCell[:image][:image]
+        tableCell.imageView.layer.cornerRadius = dataCell[:image][:radius] if dataCell[:image][:radius]
       end
+
       tableCell.text = dataCell[:title]
       return tableCell
     end
-
     def sectionAtIndex(index)
       @mt_table_view_groups.at(index)
     end
@@ -79,12 +98,11 @@ module MotionTable
     end
 
     def triggerAction(action, arguments)
-      $stderr.puts "Action: #{action.to_s} and args #{arguments.to_s}"
       if self.respond_to?(action)
         expectedArguments = self.method(action).arity
         if expectedArguments == 0
           self.send(action)
-        elsif expectedArguments == 1
+        elsif expectedArguments == 1 || expectedArguments == -1
           self.send(action, arguments)
         else
           MotionTable::Console.log("MotionTable warning: #{action} expects #{expectedArguments} arguments. Maximum number of required arguments for an action is 1.", withColor: MotionTable::Console::RED_COLOR)

data/lib/motion-table/version.rb

@@ -1,3 +1,3 @@
 module MotionTable
-  VERSION = "0.1.6" unless defined?(MotionTable::VERSION)
+  VERSION = "0.1.7" unless defined?(MotionTable::VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motion-table
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-31 00:00:00.000000000 Z
+date: 2012-09-18 00:00:00.000000000 Z
 dependencies: []
 description: MotionTable is a RubyMotion gem that makes it easy to handle UITableViews
   from a UITableViewController.  Simply include in the module in your controller.