ProMotion 0.1.2 → 0.2.0

data/.c9revisions/lib/ProMotion.rb.c9save

@@ -0,0 +1 @@
+{"ts":1347898586630,"silentsave":true,"restoring":false,"patch":[[{"diffs":[[1,"unless defined?(Motion::Project::Config)\n  raise \"This file must be required within a RubyMotion project Rakefile.\"\nend\n\nrequire \"ProMotion/version\"\n\nMotion::Project::App.setup do |app|\n\n  # Dir.glob(File.join(File.dirname(__FILE__), \"ProMotion/**/*.rb\")).each do |file|\n  #   app.files.unshift(file)\n  # end\n  app.files = Dir.glob(File.join(File.dirname(__FILE__), 'ProMotion/**/*.rb')) | app.files\n  app.files = Dir.glob(File.join(File.dirname(__FILE__), 'ProMotion/helpers/**/*.rb')) | app.files\n  app.files = Dir.glob(File.join(File.dirname(__FILE__), 'ProMotion/modules/**/*.rb')) | app.files\n  app.files = Dir.glob(File.join(File.dirname(__FILE__), 'ProMotion/ext/**/*.rb')) | app.files\n  \nend"]],"start1":0,"start2":0,"length1":0,"length2":699}]],"length":699}

data/.c9revisions/lib/ProMotion/AppDelegate.rb.c9save

@@ -0,0 +1,3 @@
+{"ts":1347924907908,"silentsave":true,"restoring":false,"patch":[[{"diffs":[[1,"module ProMotion\n  class AppDelegateParent\n    attr_accessor :window\n    \n    def application(application, didFinishLaunchingWithOptions:launchOptions)\n      return true if RUBYMOTION_ENV == \"test\"\n\n      Console.log(\" Your AppDelegate (usually in app_delegate.rb) needs an on_load(options) method.\", withColor: Console::RED_COLOR) unless self.respond_to?(:on_load)\n      \n      on_load launchOptions\n\n      open_home_screen if has_home_screen\n\n      get_home_screen.on_opened if has_home_screen && get_home_screen.respond_to?(:on_opened)\n      \n      true\n    end\n\n    def app_delegate\n      UIApplication.sharedApplication.delegate\n    end\n\n    def app_window\n      self.app_delegate.window\n    end\n\n    def load_root_view(new_view)\n      self.window ||= UIWindow.alloc.initWithFrame(UIScreen.mainScreen.bounds)\n      self.window.rootViewController = new_view\n      self.window.makeKeyAndVisible\n    end\n\n    def open_screen(screen)\n      home(screen)\n    end\n\n    def home(screen)\n      screen = screen.new if screen.respond_to? :new\n      @home_screen = screen\n    end\n\n    def fresh_start(new_screen)\n      home(new_screen)\n      open_home_screen\n    end\n\n    def open_home_screen\n      get_home_screen.send(:on_load) if get_home_screen.respond_to?(:on_load)\n      load_root_view get_home_screen.main_controller\n    end\n    \n    def get_home_screen\n      @home_screen\n    end\n\n    def has_home_screen\n      @home_screen.nil? == false\n    end\n  end\nend"]],"start1":0,"start2":0,"length1":0,"length2":1456}]],"length":1456}
+{"contributors":[],"silentsave":false,"ts":1347925005943,"patch":[[{"diffs":[[0,"_to?"],[-1," "],[1,"("],[0,":new"],[1,")s"],[0,"\n   "]],"start1":1027,"start2":1027,"length1":13,"length2":15}]],"length":1458,"saved":false}
+{"ts":1347925017979,"patch":[[{"diffs":[[0,"o?(:new)"],[-1,"s"],[0,"\n      @"]],"start1":1029,"start2":1029,"length1":17,"length2":16}]],"length":1457,"saved":false}

data/.c9revisions/lib/ProMotion/classes/Screen.rb.c9save

@@ -0,0 +1,2 @@
+{"ts":1347898745792,"silentsave":true,"restoring":false,"patch":[[{"diffs":[[1,"module ProMotion\n  # Instance methods\n  class Screen\n    include ProMotion::ScreenNavigation\n    include ProMotion::ScreenElements\n    \n    attr_accessor :view_controller, :navigation_controller, :parent_screen, :first_screen, :tab_bar_item, :tab_bar, :modal\n\n    def initialize(args = {})\n      args.each do |k, v|\n        self.send \"#{k}=\", v if self.respond_to?(\"#{k}=\")\n      end\n      self.load_view_controller\n      self.view_controller.title = self.title\n\n      self.add_nav_bar if args[:nav_bar]\n      self.on_init if self.respond_to?(:on_init)\n      self\n    end\n\n    def is_modal?\n      self.modal == true\n    end\n\n    def has_nav_bar?\n      self.navigation_controller.nil? != true\n    end\n\n    # Note: this is overridden in TableScreen\n    def load_view_controller\n      self.view_controller ||= ViewController\n    end\n\n    def set_tab_bar_item(args = {})\n      self.tab_bar_item = args\n      refresh_tab_bar_item\n    end\n\n    def refresh_tab_bar_item\n      self.main_controller.tabBarItem = ProMotion::TabBar.tab_bar_item(self.tab_bar_item) if self.tab_bar_item\n    end\n    \n    def add_nav_bar\n      self.navigation_controller = NavigationController.alloc.initWithRootViewController(self.view_controller)\n      self.first_screen = true\n    end\n\n    def set_nav_bar_right_button(title, args={})\n      args[:style]  ||= UIBarButtonItemStyleBordered\n      args[:target] ||= self\n      args[:action] ||= nil\n\n      right_button = UIBarButtonItem.alloc.initWithTitle(title, style: args[:style], target: args[:target], action: args[:action])\n      self.view_controller.navigationItem.rightBarButtonItem = right_button\n      right_button\n    end\n\n    def set_nav_bar_left_button(title, args={})\n      args[:style]  ||= UIBarButtonItemStyleBordered\n      args[:target] ||= self\n      args[:action] ||= nil\n\n      left_button = UIBarButtonItem.alloc.initWithTitle(title, style: args[:style], target: args[:target], action: args[:action])\n      self.view_controller.navigationItem.leftBarButtonItem = left_button\n      left_button\n    end\n\n    def view_controller=(vc)\n      vc = vc.alloc.initWithNibName(nil, bundle:nil) if vc.respond_to?(:alloc)\n      if self.navigation_controller && self.first_screen?\n        @view_controller = vc\n        self.navigation_controller = NavigationController.alloc.initWithRootViewController(self.view_controller)\n      else\n        @view_controller = vc\n      end\n      @view_controller.screen = self if @view_controller.respond_to?(\"screen=\")\n\n      refresh_tab_bar_item\n    end\n\n    def first_screen?\n      self.first_screen == true\n    end\n\n    def set_view_controller(vc)\n      self.view_controller = vc\n    end\n\n    def view_will_appear(animated)\n      self.will_appear if self.respond_to?(:will_appear)\n    end\n\n    def view_did_appear(animated)\n      self.on_appear if self.respond_to?(:on_appear)\n    end\n\n    def title\n      self.class.send :get_title\n    end\n\n    def title=(new_title)\n      self.class.title = new_title\n      self.view_controller.title = new_title\n    end\n\n    def main_controller\n      return self.navigation_controller if self.navigation_controller\n      self.view_controller\n    end\n\n  end\n  \n  # Class methods\n  class Screen\n    class << self\n      def title(t)\n        @title = t\n      end\n      def title=(t)\n        @title = t\n      end\n      def get_title\n        @title ||= self.to_s\n      end\n    end\n  end\nend"]],"start1":0,"start2":0,"length1":0,"length2":3387}]],"length":3387}
+{"contributors":[],"silentsave":false,"ts":1347898870641,"patch":[[{"diffs":[[0,"lements\n"],[-1,"    "],[0,"\n    att"]],"start1":123,"start2":123,"length1":20,"length2":16},{"diffs":[[0,"    end\n"],[-1,"    "],[0,"\n    def"]],"start1":1070,"start2":1070,"length1":20,"length2":16},{"diffs":[[0,"\n\n  end\n"],[-1,"  "],[0,"\n  # Cla"]],"start1":3144,"start2":3144,"length1":18,"length2":16}]],"length":3377,"saved":false}

data/README.md

@@ -3,19 +3,19 @@
 ProMotion introduces a new object called "Screens". Screens have a one-to-one relationship 
 with your app's screens and can (usually) take the place of view controllers.
 
-Typical /app file structure:
+Typical app file structure:
 
-    app
-      screens
-        photos
+    app/
+      screens/
+        photos/
           list_photos_screen.rb
           show_photo_screen.rb
           edit_photo_screen.rb
         home_screen.rb
         settings_screen.rb
-      models
-      view_controllers
-      views
+      models/
+      view_controllers/
+      views/
       app_delegate.rb
 
 ## Usage
@@ -120,7 +120,7 @@ end
 
 ```
 
-Close a screen, passing back arguments to the previous screen's "on_return" method:
+Close a screen (modal or in a nav controller), passing back arguments to the previous screen's "on_return" method:
 
 ```ruby
 class ItemScreen
@@ -167,7 +167,9 @@ it to the current view. Screens include this helper by default.
 }
 ```
 
-You can create sectioned table screens easily. TableScreen, SectionedTableScreen, GroupedTableScreen
+You can create sectioned table screens easily. TableScreen, SectionedTableScreen, GroupedTableScreen.
+This is loosely based on [motion-table](https://github.com/clearsightstudio/motion-table) (there are a 
+few minor differences).
 
 ```ruby
 class SettingsScreen < ProMotion::GroupedTableScreen
@@ -209,12 +211,42 @@ class SettingsScreen < ProMotion::GroupedTableScreen
 end
 ```
 
+# Reference
+(not comprehensive yet...working on this)
+
+<table>
+  <tr>
+    <th>Class or Module</th>
+    <th>Method</th>
+    <th>Description</th>
+  </tr>
+  <tr>
+    <td>Screen</td>
+    <td>is_modal?</td>
+    <td>Returns if the screen was opened in a modal window.</td>
+  </tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td>has_nav_bar?</td>
+    <td>Returns if the screen is contained in a navigation controller.</td>
+  </tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td>set_tab_bar_item(args)</td>
+    <td>
+      Creates the tab that is shown in a tab bar item.<br />
+      Arguments: <code>{ icon: "imagename", systemIcon: UISystemIconContacts, title: "tabtitle" }</code>
+    </td>
+  </tr>
+</table>
+
 ### What about MVC?
 
 I'm a big believer in MVC (I'm a Rails developer, too). I found that most of the time working in RubyMotion seems to happen
-in the ViewControllers and views are mainly custom elements. This pattern may be best for simpler, smaller apps.
+in the ViewControllers and views are mainly custom elements. This pattern is probably best for navigation controller and
+tab bar based apps.
 
-Feedback welcome via twitter @jamonholmgren.
+Feedback welcome via twitter @jamonholmgren or email jamon@clearsightstudio.com.
 
 ## Contributing
 

data/Rakefile

@@ -8,7 +8,7 @@ require 'motion-table'
 Motion::Project::App.setup do |app|
   # Use `rake config' to see complete project settings.
   app.name = 'ProMotionTest'
-  app.version = "0.1.0"
+  app.version = "0.2.0"
 
 
   # Devices

data/lib/ProMotion/AppDelegate.rb

@@ -5,7 +5,7 @@ module ProMotion
     def application(application, didFinishLaunchingWithOptions:launchOptions)
       return true if RUBYMOTION_ENV == "test"
 
-      Console.log(" Your AppDelegate (usually in app_delegate.rb) needs an on_load(options) method.", withColor: Console::RED_COLOR) unless self.respond_to? :on_load
+      Console.log(" Your AppDelegate (usually in app_delegate.rb) needs an on_load(options) method.", withColor: Console::RED_COLOR) unless self.respond_to?(:on_load)
       
       on_load launchOptions
 
@@ -35,7 +35,7 @@ module ProMotion
     end
 
     def home(screen)
-      screen = screen.new if screen.respond_to? :new
+      screen = screen.new if screen.respond_to?(:new)
       @home_screen = screen
     end
 

data/lib/ProMotion/_modules/ScreenNavigation.rb

@@ -2,33 +2,49 @@ module ProMotion
   module ScreenNavigation
     def open_screen(screen, args = {})
       # Instantiate screen if given a class instead
-      screen = screen.new if screen.respond_to? :new
+      screen = screen.new if screen.respond_to?(:new)
 
       screen.parent_screen = self
       screen.view_controller.title = args[:title] if args[:title]
 
       screen.add_nav_bar if args[:nav_bar]
+      
       unless args[:close_all] || args[:modal]
         screen.navigation_controller ||= self.navigation_controller
+        screen.tab_bar ||= self.tab_bar
       end
-      
-      screen.main_controller.hidesBottomBarWhenPushed = args[:hide_tab_bar] if args[:hide_tab_bar]
 
       screen.modal = args[:modal] if args[:modal]
-      
       screen.send(:on_load) if screen.respond_to?(:on_load)
+      screen.view_controller.hidesBottomBarWhenPushed = args[:hide_tab_bar] if args[:hide_tab_bar]
 
       if args[:close_all]
         fresh_start(screen)
       elsif args[:modal]
         self.view_controller.presentModalViewController(screen.main_controller, animated:true)
+      elsif args[:in_tab] && self.tab_bar
+        vc = open_tab(args[:in_tab])
+        $stderr.puts "Found a #{vc.to_s}"
+        if vc
+          if vc.is_a? UINavigationController
+            push_view_controller(screen.view_controller, vc)
+          else
+            self.tab_bar.selectedIndex = vc.tabBarItem.tag
+            $stderr.puts "#{self.tab_bar.selectedIndex} is selected and should be #{vc.tabBarItem.tag}"
+            # PM::TabBar.replace_current_item(self.tab_bar, view_controller: screen.view_controller)
+          end
+        else
+          $stderr.puts "No tab bar item '#{args[:in_tab]}'"
+        end
       elsif self.navigation_controller
         push_view_controller screen.view_controller
       else
         open_view_controller screen.main_controller
       end
       
-      screen.send(:on_opened) if screen.respond_to?(:on_opened)
+      if screen.respond_to?(:on_opened)
+        screen.send(:on_opened)
+      end
     end
 
     def fresh_start(screen)
@@ -64,10 +80,13 @@ module ProMotion
       tab_bar_controller = UITabBarController.alloc.init
 
       view_controllers = []
+      tag_index = 0
       screens.each do |s|
         if s.is_a? Screen
-          s = s.new if s.respond_to? :new
+          s = s.new if s.respond_to?(:new)
+          s.view_controller.tabBarItem.tag = tag_index
           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
@@ -77,48 +96,47 @@ module ProMotion
       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] (this may change in the future; please
+    #   do not rely on it right now)
     def open_tab_bar(*screens)
       tab_bar = tab_bar_controller(*screens)
 
       screens.each do |s|
-        s.parent_screen = self if s.respond_to? "parent_screen="
-        s.on_load if s.respond_to? :on_load
+        s.parent_screen = self if s.respond_to?("parent_screen=")
+        s.tab_bar = tab_bar
+        s.on_load if s.respond_to?(:on_load)
       end
       
-      open_view_controller tab_bar
+      open_view_controller(tab_bar)
 
       screens.each do |s|
-        s.on_opened if s.respond_to? :on_opened
+        s.on_opened if s.respond_to?(:on_opened)
       end
 
       tab_bar
     end
 
-    def push_tab_bar(*screens)
-      tab_bar = tab_bar_controller(*screens)
-
-      screens.each do |s|
-        s.parent_screen = self if s.respond_to? "parent_screen="
-        s.on_load if s.respond_to? :on_load
-      end
-
-      push_view_controller tab_bar
-
-      screens.each do |s|
-        s.on_opened if s.respond_to? :on_opened
+    def open_tab(tab)
+      if tab.is_a? String
+        $stderr.puts "Opening tab in #{self.tab_bar.to_s} : #{tab}"
+        return PM::TabBar.select(self.tab_bar, title: tab)
+      else
+        $stderr.puts "Unable to open tab #{tab.to_s} because it isn't a string."
       end
-
-      tab_bar
     end
 
     def open_view_controller(vc)
       UIApplication.sharedApplication.delegate.load_root_view vc
     end
 
-    def push_view_controller(vc)
+    def push_view_controller(vc, nav_controller=nil)
       # vc.hidesBottomBarWhenPushed = true if args[:hide_tab_bar]
       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
-      self.navigation_controller.pushViewController(vc, animated: true)
+      nav_controller ||= self.navigation_controller
+      nav_controller.pushViewController(vc, animated: true)
     end
   end
 end

data/lib/ProMotion/classes/Screen.rb

@@ -3,23 +3,22 @@ module ProMotion
   class Screen
     include ProMotion::ScreenNavigation
     include ProMotion::ScreenElements
-    
-    attr_accessor :view_controller, :navigation_controller, :parent_screen, :first_screen, :tab_bar_item, :modal
+
+    attr_accessor :view_controller, :navigation_controller, :parent_screen, :first_screen, :tab_bar_item, :tab_bar, :modal
 
     def initialize(args = {})
       args.each do |k, v|
-        self.send "#{k}=", v if self.respond_to? "#{k}="
+        self.send "#{k}=", v if self.respond_to?("#{k}=")
       end
       self.load_view_controller
       self.view_controller.title = self.title
 
       self.add_nav_bar if args[:nav_bar]
-      self.on_init if self.respond_to? :on_init
+      self.on_init if self.respond_to?(:on_init)
       self
     end
 
     def is_modal?
-      $stderr.puts self.modal
       self.modal == true
     end
 
@@ -40,7 +39,7 @@ module ProMotion
     def refresh_tab_bar_item
       self.main_controller.tabBarItem = ProMotion::TabBar.tab_bar_item(self.tab_bar_item) if self.tab_bar_item
     end
-    
+
     def add_nav_bar
       self.navigation_controller = NavigationController.alloc.initWithRootViewController(self.view_controller)
       self.first_screen = true
@@ -67,14 +66,14 @@ module ProMotion
     end
 
     def view_controller=(vc)
-      vc = vc.alloc.initWithNibName(nil, bundle:nil) if vc.respond_to? :alloc
+      vc = vc.alloc.initWithNibName(nil, bundle:nil) if vc.respond_to?(:alloc)
       if self.navigation_controller && self.first_screen?
         @view_controller = vc
         self.navigation_controller = NavigationController.alloc.initWithRootViewController(self.view_controller)
       else
         @view_controller = vc
       end
-      @view_controller.screen = self if @view_controller.respond_to? "screen="
+      @view_controller.screen = self if @view_controller.respond_to?("screen=")
 
       refresh_tab_bar_item
     end
@@ -88,11 +87,11 @@ module ProMotion
     end
 
     def view_will_appear(animated)
-      self.will_appear if self.respond_to? :will_appear
+      self.will_appear if self.respond_to?(:will_appear)
     end
 
     def view_did_appear(animated)
-      self.on_appear if self.respond_to? :on_appear
+      self.on_appear if self.respond_to?(:on_appear)
     end
 
     def title
@@ -110,7 +109,7 @@ module ProMotion
     end
 
   end
-  
+
   # Class methods
   class Screen
     class << self

data/lib/ProMotion/classes/TableScreen.rb

@@ -5,7 +5,7 @@ module ProMotion
     include MotionTable::SearchableTable
 
     def view
-      return self.view_controller.view
+      self.view_controller.view
     end
 
     def load_view_controller
@@ -19,7 +19,7 @@ module ProMotion
     end
 
     def check_table_data_method
-      Console.log("- table_data method needed in table view screen.", withColor: Console::RED_COLOR) unless self.respond_to? :table_data
+      Console.log("- table_data method needed in table view screen.", withColor: Console::RED_COLOR) unless self.respond_to?(:table_data)
     end
 
     def update_table_data

data/lib/ProMotion/helpers/MeasureHelper.rb

@@ -4,6 +4,8 @@ module ProMotion
       def content_height(view)
         height = 0
         view.subviews.each do |sub_view|
+          $stderr.puts sub_view
+          next if sub_view.isHidden
           y = sub_view.frame.origin.y
           h = sub_view.frame.size.height
           if (y + h) > height

data/lib/ProMotion/helpers/TabBar.rb

@@ -1,20 +1,52 @@
 module ProMotion
   class TabBar
     class << self
-      def tab_bar_item(args = {})
-        title = "Untitled"
-        title = args[:title] if args[:title]
-        args[:tag] ||= 0
+      # def tab_bar_item(args = {})
+      #   title = "Untitled"
+      #   title = args[:title] if args[:title]
+      #   args[:tag] ||= 0
 
-        tb_item = tab_bar_icon(args[:system_icon], args[:tag]) if args[:system_icon]
-        tb_item = tab_bar_icon_custom(title, args[:icon], args[:tag]) if args[:icon]
+      #   tb_item = tab_bar_icon(args[:system_icon], args[:tag]) if args[:system_icon]
+      #   tb_item = tab_bar_icon_custom(title, args[:icon], args[:tag]) if args[:icon]
         
-        if tb_item
-          tb_item.badgeValue = args[:badge_number].to_s unless args[:badge_number].nil? || tab[:badge_number] <= 0
+      #   if tb_item
+      #     tb_item.badgeValue = args[:badge_number].to_s unless args[:badge_number].nil? || tab[:badge_number] <= 0
+
+      #     return tb_item
+      #   end
+      #   nil
+      # end
+
+      # def tab_bar_icon(icon, tag)
+      #   return UITabBarItem.alloc.initWithTabBarSystemItem(icon, tag: tag)
+      # end
+
+      # def tab_bar_icon_custom(title, image_name, tag)
+      #   icon_image = UIImage.imageNamed(image_name)
+      #   return UITabBarItem.alloc.initWithTitle(title, image:icon_image, tag:tag)
+      # end
+
 
-          return tb_item
+
+
+      def create_tab_bar_controller_from_data(data)
+        data = self.setTags(data)
+
+        tabBarController = UITabBarController.alloc.init
+        tabBarController.viewControllers = self.tab_controllers_from_data(data)
+
+        return tabBarController
+      end
+
+      def set_tags(data)
+        tag_number = 0
+        
+        data.each do |d|
+          d[:tag] = tag_number
+          tag_number += 1
         end
-        nil
+
+        return data
       end
 
       def tab_bar_icon(icon, tag)
@@ -25,6 +57,71 @@ module ProMotion
         icon_image = UIImage.imageNamed(image_name)
         return UITabBarItem.alloc.initWithTitle(title, image:icon_image, tag:tag)
       end
+
+      def tab_controllers_from_data(data)
+        mt_tab_controllers = []
+
+        data.each do |tab|
+          mt_tab_controllers << self.controller_from_tab_data(tab)
+        end
+
+        return mt_tab_controllers
+      end
+
+      def controller_from_tab_data(tab)
+        tab[:badgeNumber] = 0 unless tab[:badgeNumber]
+        tab[:tag] = 0 unless tab[:tag]
+        
+        view_controller = tab[:view_controller]
+        view_controller = tab[:view_controller].alloc.init if tab[:view_controller].respond_to?(:alloc)
+        
+        if tab[:navigationController]
+          controller = UINavigationController.alloc.initWithRootViewController(view_controller)
+        else
+          controller = view_controller
+        end
+
+        controller.tabBarItem = self.tabBarItem(tab)
+        controller.tabBarItem.title = controller.title unless tab[:title]
+
+        return controller
+      end
+
+      def tab_bar_item(tab)
+        title = "Untitled"
+        title = tab[:title] if tab[:title]
+        tab[:tag] ||= @current_tag ||= 0
+        @current_tag = tab[:tag] + 1
+        
+        tab_bar_item = tab_bar_icon(tab[:system_icon], tab[:tag]) if tab[:system_icon]
+        tab_bar_item = 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
+
+      def select(tab_bar_controller, title: title)
+        root_controller = nil
+        tab_bar_controller.viewControllers.each do |vc|
+          if vc.tabBarItem.title == title
+            tab_bar_controller.selectedViewController = vc
+            root_controller = vc
+            break
+          end
+        end
+        root_controller
+      end
+
+      def select(tab_bar_controller, tag: tag)
+        tab_bar_controller.selectedIndex = tag
+      end
+
+      def replace_current_item(tab_bar_controller, view_controller: vc)
+        controllers = NSMutableArray.arrayWithArray(tab_bar_controller.viewControllers)
+        controllers.replaceObjectAtIndex(tab_bar_controller.selectedIndex, withObject: vc)
+        tab_bar_controller.viewControllers = controllers
+      end
     end
   end
 end

data/lib/ProMotion/helpers/ViewHelper.rb

@@ -2,7 +2,14 @@ module ProMotion
   module ViewHelper
     def set_attributes(element, args = {})
       args.each do |k, v|
-        element.send("#{k}=", v) if element.respond_to? "#{k}="
+        if v.is_a? Hash
+          v.each do |k2, v2|
+            sub_element = element.send("#{k}")
+            sub_element.send("#{k2}=", v2) if sub_element.respond_to?("#{k2}=")
+          end
+        else
+          element.send("#{k}=", v) if element.respond_to?("#{k}=")
+        end
       end
       element
     end

data/lib/ProMotion/helpers/motion-table/1st/searchable_table.rb

@@ -21,9 +21,10 @@ module ProMotion::MotionTable
     end
 
     def searchDisplayController(controller, shouldReloadTableForSearchString:searchString)
-      @mt_table_view_groups = []
+      @mt_filtered_data = nil
+      @mt_filtered_data = []
 
-      @original_data.each do |section|
+      @mt_table_view_groups.each do |section|
         newSection = {}
         newSection[:cells] = []
 
@@ -33,22 +34,25 @@ module ProMotion::MotionTable
           end
         end
 
-        if newSection.count > 0
+        if newSection[:cells] && newSection[:cells].length > 0
           newSection[:title] = section[:title]
-          @mt_table_view_groups << newSection
+          @mt_filtered_data << newSection
         end
       end
-      
+
       true
     end
 
     def searchDisplayControllerWillEndSearch(controller)
-      @mt_table_view_groups = @original_data.clone
-      @original_data = nil
+      @mt_filtered = false
+      @mt_filtered_data = nil
+      self.tableView.setScrollEnabled true
     end
 
     def searchDisplayControllerWillBeginSearch(controller)
-      @original_data = @mt_table_view_groups.clone
+      @mt_filtered = true
+      @mt_filtered_data = []
+      self.tableView.setScrollEnabled false
     end
   end
 end

data/lib/ProMotion/helpers/motion-table/1st/sectioned_table.rb

@@ -9,7 +9,7 @@ module ProMotion::MotionTable
 
     def updateTableViewData(data)
       setTableViewData data
-      @tableView.reloadData
+      self.tableView.reloadData
     end
 
     def setTableViewData(data)
@@ -17,22 +17,27 @@ module ProMotion::MotionTable
     end
 
     def numberOfSectionsInTableView(tableView)
-      return @mt_table_view_groups.length if @mt_table_view_groups
+      if @mt_filtered
+        return @mt_filtered_data.length if @mt_filtered_data
+      else
+        return @mt_table_view_groups.length if @mt_table_view_groups
+      end
       0
     end
 
     # Number of cells
     def tableView(tableView, numberOfRowsInSection:section)
-      return sectionAtIndex(section)[:cells].length
+      return sectionAtIndex(section)[:cells].length if sectionAtIndex(section)
+      0
     end
 
     def tableView(tableView, titleForHeaderInSection:section)
-      return sectionAtIndex(section)[:title]
+      return sectionAtIndex(section)[:title] if sectionAtIndex(section)
     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
+      self.table_data_index if respond_to?(:table_data_index)
     end
 
     def tableView(tableView, cellForRowAtIndexPath:indexPath)
@@ -59,6 +64,7 @@ module ProMotion::MotionTable
         tableCell.detailTextLabel.text = dataCell[:subtitle]
       end
 
+      tableCell.selectionStyle = UITableViewCellSelectionStyleNone if dataCell[:no_select]
 
       if dataCell[:image]
         tableCell.imageView.layer.masksToBounds = true
@@ -66,16 +72,30 @@ module ProMotion::MotionTable
         tableCell.imageView.layer.cornerRadius = dataCell[:image][:radius] if dataCell[:image][:radius]
       end
 
+      if dataCell[:subViews]
+        dataCell[:subViews].each do |view|
+          tableCell.addSubview view
+        end
+      end
+
+      if dataCell[:details]
+        tableCell.addSubview dataCell[:details][:image]
+      end
+
       tableCell.text = dataCell[:title]
       return tableCell
     end
 
     def sectionAtIndex(index)
-      @mt_table_view_groups.at(index)
+      if @mt_filtered && tableView == self.tableView
+        @mt_filtered_data.at(index)
+      else
+        @mt_table_view_groups.at(index)
+      end
     end
 
     def cellAtSectionAndIndex(section, index)
-      return sectionAtIndex(section)[:cells].at(index)
+      return sectionAtIndex(section)[:cells].at(index) if sectionAtIndex(section) && sectionAtIndex(section)[:cells]
     end
 
     def tableView(tableView, didSelectRowAtIndexPath:indexPath)
@@ -90,7 +110,7 @@ module ProMotion::MotionTable
 
       dataCell = cellAtSectionAndIndex(indexPath.section, indexPath.row)
       dataCell[:arguments] = {} unless dataCell[:arguments]
-      dataCell[:arguments][:value] = switch.isOn
+      dataCell[:arguments][:value] = switch.isOn if dataCell[:arguments].is_a? Hash
       
       triggerAction(dataCell[:accessoryAction], dataCell[:arguments]) if dataCell[:accessoryAction]
 
@@ -101,7 +121,7 @@ module ProMotion::MotionTable
         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/ProMotion/version.rb

@@ -1,3 +1,3 @@
 module ProMotion
-  VERSION = "0.1.2" unless defined?(ProMotion::VERSION)
+  VERSION = "0.2.0" unless defined?(ProMotion::VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ProMotion
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-12 00:00:00.000000000 Z
+date: 2012-09-22 00:00:00.000000000 Z
 dependencies: []
 description: ProMotion is a new way to organize RubyMotion apps.
 email:
@@ -20,6 +20,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .c9revisions/lib/ProMotion.rb.c9save
+- .c9revisions/lib/ProMotion/AppDelegate.rb.c9save
+- .c9revisions/lib/ProMotion/classes/Screen.rb.c9save
 - .gitignore
 - Gemfile
 - LICENSE