motion-table 0.1.5 → 0.1.6

data/README.md

@@ -1,6 +1,8 @@
 # MotionTable
 
-MotionTable is a RubyMotion gem for easily building table views in iOS.
+MotionTable is a RubyMotion gem for easily building table views in iOS. 
+
+Feedback welcome: jamon@clearsightstudio.com(@jamonholmgren) or silas@clearsightstudio.com(@silasjmatson)
 
 
 ## Installation
@@ -33,22 +35,27 @@ class MyController < UITableViewController
     super
     self.title = "Settings"
 
-    @grouped_table_view_data ||= [
-      {
-        title: "Your Account",
-        cells: [
-          { title: "Edit Profile", action: :edit_profile},
-          { title: "Log Out", action: :log_out },
-        ]
-      },
-      {
-        title: "My App",
-        cells: [
-          { title: "About", action: :something_here },
-          { title: "Feedback", action: :something_here }
-        ]
-      }
-    ]
+    @grouped_table_view_data ||= [{
+      title: "Your Account",
+      cells: [
+        { title: "Edit Profile", action: :edit_profile},
+        { title: "Log Out", action: :log_out },
+      ]
+    }, {
+      title: "My App Settings",
+      cells: [{ 
+          title: "Be Awesome", 
+          accessory: :switch, 
+          accessoryDefault: true, 
+          accessoryAction: :save_being_awesome
+        }, { 
+          title: "Mute", 
+          accessory: :switch, 
+          accessoryDefault: false, 
+          accessoryAction: :save_mute
+        },
+      ]
+    }]
 
     self.view = self.createTableViewFromData(@grouped_table_view_data)
   end
@@ -60,6 +67,18 @@ class MyController < UITableViewController
   def edit_profile
     # 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
+    # args => { value: false }
+  end
 end
 ```
 
@@ -68,6 +87,7 @@ end
 ```ruby
 class MyController < UITableViewController
   include MotionTable::PlainTable
+  inclued MotionTable::SearchableTable # For search capability
 
   def viewDidLoad
     super
@@ -88,6 +108,7 @@ class MyController < UITableViewController
       }
     ]
 
+    self.makeSearchable # Will add search capability if you include MotionTable::SearchableTable, nothing more needed :)
     self.view = self.createTableViewFromData(@plain_table_view_data)
   end
 
@@ -95,11 +116,11 @@ class MyController < UITableViewController
     # load this friend based on id
   end
 
-  def something_here(args)
+  def something_here(args={})
     # You can pass any data structure into :arguments, it is just passed as an argument to your implementation
     # You have to handle it. Like so:
     args.each do |k, v|
-      puts "Argument passed: #{v}""
+      puts "Argument passed: #{v}"
     end
   end
 end

data/lib/motion-table/plain_table.rb

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

data/lib/motion-table/searchable_table.rb

@@ -0,0 +1,42 @@
+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
+      
+      self.tableView.tableHeaderView = searchBar
+    end
+
+    def searchDisplayController(controller, shouldReloadTableForSearchString:searchString)
+      @mt_table_view_groups = []
+
+      @original_data.each do |section|
+        newSection = {}
+        newSection[:cells] = []
+
+        section[:cells].each do |cell|
+          if cell[:title].to_s.downcase.strip.include?(searchString.downcase.strip)
+            newSection[:cells] << cell
+          end
+        end
+
+        if newSection.count > 0
+          newSection[:title] = section[:title]
+          @mt_table_view_groups << newSection
+        end
+      end
+      true
+    end
+
+    def searchDisplayControllerWillEndSearch(controller)
+      @mt_table_view_groups = @original_data.clone
+    end
+
+    def searchDisplayControllerWillBeginSearch(controller)
+      @original_data = @mt_table_view_groups.clone
+    end
+  end
+end

data/lib/motion-table/sectioned_table.rb

@@ -1,13 +1,22 @@
 module MotionTable
   module SectionedTable
-    # Likely the only method you need call from the controller
+
     # @param [Array] Array of table data
     # @returns [UITableView] delegated to self
     def createTableViewFromData(data)
-      @mt_table_view_groups = data
+      setTableViewData data
       return tableView
     end
 
+    def updateTableViewData(data)
+      setTableViewData data
+      @tableView.reloadData
+    end
+
+    def setTableViewData(data)
+      @mt_table_view_groups = data
+    end
+
     def numberOfSectionsInTableView(tableView)
       return @mt_table_view_groups.length if @mt_table_view_groups
       0
@@ -23,14 +32,24 @@ module MotionTable
     end
 
     def tableView(tableView, cellForRowAtIndexPath:indexPath)
+      dataCell = cellAtSectionAndIndex(indexPath.section, indexPath.row)
+      
       cellIdentifier = "Cell"
 
-      cell = tableView.dequeueReusableCellWithIdentifier(cellIdentifier)
-      cell ||= UITableViewCell.alloc.initWithFrame(CGRectZero, reuseIdentifier:cellIdentifier)
-
-      row = cellAtSectionAndIndex(indexPath.section, indexPath.row)
-      cell.text = row[:title]
-      return 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
+      end
+      tableCell.text = dataCell[:title]
+      return tableCell
     end
 
     def sectionAtIndex(index)
@@ -44,18 +63,36 @@ module MotionTable
     def tableView(tableView, didSelectRowAtIndexPath:indexPath)
       cell = cellAtSectionAndIndex(indexPath.section, indexPath.row)
       tableView.deselectRowAtIndexPath(indexPath, animated: true);
-      if self.respond_to?(cell[:action])
-        expectedArguments = self.method(cell[:action]).arity
+      triggerAction(cell[:action], cell[:arguments]) if cell[:action]
+    end
+
+    def accessoryToggledSwitch(switch)
+      tableCell = switch.superview
+      indexPath = tableCell.superview.indexPathForCell(tableCell)
+
+      dataCell = cellAtSectionAndIndex(indexPath.section, indexPath.row)
+      dataCell[:arguments] = {} unless dataCell[:arguments]
+      dataCell[:arguments][:value] = switch.isOn
+      
+      triggerAction(dataCell[:accessoryAction], dataCell[:arguments]) if dataCell[:accessoryAction]
+
+    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(cell[:action])
+          self.send(action)
         elsif expectedArguments == 1
-          self.send(cell[:action], cell[:arguments])
+          self.send(action, arguments)
         else
-          MotionTable::Console.log("MotionTable warning: #{cell[:action]} expects #{expectedArguments} arguments. Maximum number of required arguments for an action is 1.", withColor: MotionTable::Console::RED_COLOR)
+          MotionTable::Console.log("MotionTable warning: #{action} expects #{expectedArguments} arguments. Maximum number of required arguments for an action is 1.", withColor: MotionTable::Console::RED_COLOR)
         end
       else
-        MotionTable::Console.log(self, actionNotImplemented: cell[:action])
+        MotionTable::Console.log(self, actionNotImplemented: action)
       end
     end
+
   end
 end

data/lib/motion-table/version.rb

@@ -1,3 +1,3 @@
 module MotionTable
-  VERSION = "0.1.5" unless defined?(MotionTable::VERSION)
+  VERSION = "0.1.6" 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.5
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-29 00:00:00.000000000 Z
+date: 2012-08-31 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.
@@ -29,6 +29,7 @@ files:
 - lib/motion-table/console.rb
 - lib/motion-table/grouped_table.rb
 - lib/motion-table/plain_table.rb
+- lib/motion-table/searchable_table.rb
 - lib/motion-table/sectioned_table.rb
 - lib/motion-table/version.rb
 - motion-table.gemspec