ProMotion 0.1.1 → 0.1.2

data/README.md

@@ -76,8 +76,8 @@ element before it is dropped into the view.
 Add a nav_bar button and a tab_bar icon:
 
 ```ruby
-add_right_nav_button(label: "Save", action: :save)
-set_tab_bar_item(title: "Contacts", system_icon: UITabBarSystemItemContacts)
+set_nav_bar_right_button "Save", action: :save_something, type: UIBarButtonItemStyleDone
+set_tab_bar_item title: "Contacts", system_icon: UITabBarSystemItemContacts
 ```
 
 Open a new screen:
@@ -162,7 +162,7 @@ it to the current view. Screens include this helper by default.
   backgroundColor: UIColor.whiteColor
 }
 
-@element = set_attributes(UIView.alloc.initWithFrame(CGRectMake(0, 0, 20, 20)), {
+@element = set_attributes UIView.alloc.initWithFrame(CGRectMake(0, 0, 20, 20)), {
   backgroundColor: UIColor.whiteColor
 }
 ```

data/lib/ProMotion/AppDelegate.rb

@@ -45,8 +45,8 @@ module ProMotion
     end
 
     def open_home_screen
-      root = get_home_screen.main_controller
-      load_root_view root
+      get_home_screen.send(:on_load) if get_home_screen.respond_to?(:on_load)
+      load_root_view get_home_screen.main_controller
     end
     
     def get_home_screen

data/lib/ProMotion/_modules/ScreenNavigation.rb

@@ -3,18 +3,26 @@ module ProMotion
     def open_screen(screen, args = {})
       # Instantiate screen if given a class instead
       screen = screen.new if screen.respond_to? :new
-      screen.add_nav_bar if args[:nav_bar]
+
       screen.parent_screen = self
+      screen.view_controller.title = args[:title] if args[:title]
 
-      screen.main_controller.hidesBottomBarWhenPushed = true if args[:hide_tab_bar]
+      screen.add_nav_bar if args[:nav_bar]
+      unless args[:close_all] || args[:modal]
+        screen.navigation_controller ||= self.navigation_controller
+      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)
+
       if args[:close_all]
         fresh_start(screen)
       elsif args[:modal]
-        screen.modal = true
         self.view_controller.presentModalViewController(screen.main_controller, animated:true)
       elsif self.navigation_controller
-        screen.navigation_controller = self.navigation_controller
         push_view_controller screen.view_controller
       else
         open_view_controller screen.main_controller
@@ -32,14 +40,24 @@ module ProMotion
     end
 
     def close_screen(args = {})
+      args ||= {}
+      
       # Pop current view, maybe with arguments, if in navigation controller
+      previous_screen = self.parent_screen
       if self.is_modal?
         self.parent_screen.view_controller.dismissModalViewControllerAnimated(true)
       elsif self.navigation_controller
-        self.navigation_controller.popViewControllerAnimated(true)
+        if args[:to_screen]
+          self.navigation_controller.popToViewController(args[:to_screen].view_controller, animated: true)
+          previous_screen = args[:to_screen]
+        else
+          self.navigation_controller.popViewControllerAnimated(true)
+        end
       else
-        # What do we do now? Nothing to "pop". For now, don't do anything.
+        Console.log("Tried to close #{self.to_s}; however, this screen isn't modal or in a nav bar.", withColor: Console::PURPLE_COLOR)
       end
+
+      previous_screen.send(:on_return, args) if previous_screen && previous_screen.respond_to?(:on_return)
     end
 
     def tab_bar_controller(*screens)
@@ -61,21 +79,35 @@ module ProMotion
     
     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
+      end
+      
       open_view_controller tab_bar
+
       screens.each do |s|
         s.on_opened if s.respond_to? :on_opened
-        s.parent_screen = self if s.respond_to? "parent_screen="
       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
-        s.parent_screen = self if s.respond_to? "parent_screen="
       end
+
       tab_bar
     end
 

data/lib/ProMotion/classes/Screen.rb

@@ -6,26 +6,28 @@ module ProMotion
     
     attr_accessor :view_controller, :navigation_controller, :parent_screen, :first_screen, :tab_bar_item, :modal
 
-    def initialize(attrs = {})
-      attrs.each do |k, v|
+    def initialize(args = {})
+      args.each do |k, v|
         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 attrs[:nav_bar]
-
-      self.on_load if self.respond_to? :on_load
 
+      self.add_nav_bar if args[:nav_bar]
+      self.on_init if self.respond_to? :on_init
       self
     end
 
     def is_modal?
-      self.modal
+      $stderr.puts self.modal
+      self.modal == true
+    end
+
+    def has_nav_bar?
+      self.navigation_controller.nil? != true
     end
 
+    # Note: this is overridden in TableScreen
     def load_view_controller
       self.view_controller ||= ViewController
     end
@@ -40,10 +42,8 @@ module ProMotion
     end
     
     def add_nav_bar
-      unless self.navigation_controller
-        self.navigation_controller = NavigationController.alloc.initWithRootViewController(self.view_controller)
-        self.first_screen = true
-      end
+      self.navigation_controller = NavigationController.alloc.initWithRootViewController(self.view_controller)
+      self.first_screen = true
     end
 
     def set_nav_bar_right_button(title, args={})
@@ -53,6 +53,17 @@ module ProMotion
 
       right_button = UIBarButtonItem.alloc.initWithTitle(title, style: args[:style], target: args[:target], action: args[:action])
       self.view_controller.navigationItem.rightBarButtonItem = right_button
+      right_button
+    end
+
+    def set_nav_bar_left_button(title, args={})
+      args[:style]  ||= UIBarButtonItemStyleBordered
+      args[:target] ||= self
+      args[:action] ||= nil
+
+      left_button = UIBarButtonItem.alloc.initWithTitle(title, style: args[:style], target: args[:target], action: args[:action])
+      self.view_controller.navigationItem.leftBarButtonItem = left_button
+      left_button
     end
 
     def view_controller=(vc)

data/lib/ProMotion/classes/TableScreen.rb

@@ -9,7 +9,8 @@ module ProMotion
     end
 
     def load_view_controller
-      Console.log("- table_data method needed in table view screen.", withColor: Console::RED_COLOR) unless self.respond_to? :table_data
+      check_table_data_method
+
       self.view_controller ||= TableViewController
       self.view_controller.view = self.createTableViewFromData(self.table_data)
       if self.class.get_searchable
@@ -17,6 +18,10 @@ module ProMotion
       end
     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
+    end
+
     def update_table_data
       self.updateTableViewData(table_data)
     end

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

@@ -1,8 +1,6 @@
 module ProMotion::MotionTable
   module SearchableTable
     def makeSearchable(params={})
-      $stderr.puts params
-
       params[:frame] ||= CGRectMake(0, 0, 320, 44)
       params[:contentController] ||= self
       params[:delegate] ||= self

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

@@ -97,7 +97,6 @@ module ProMotion::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

data/lib/ProMotion/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ProMotion
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-11 00:00:00.000000000 Z
+date: 2012-09-12 00:00:00.000000000 Z
 dependencies: []
 description: ProMotion is a new way to organize RubyMotion apps.
 email: