lib/ProMotion/_modules/ScreenNavigation.rb in ProMotion-0.1.1 vs lib/ProMotion/_modules/ScreenNavigation.rb in ProMotion-0.1.2

@@ -1,22 +1,30 @@
 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.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
       end
       
@@ -30,18 +38,28 @@
     def app_delegate
       UIApplication.sharedApplication.delegate
     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)
       tab_bar_controller = UITabBarController.alloc.init
 
@@ -59,24 +77,38 @@
       tab_bar_controller
     end
     
     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
 
     def open_view_controller(vc)
       UIApplication.sharedApplication.delegate.load_root_view vc
\ No newline at end of file