Running into an issue with the sample app.

This commit is contained in:
Jamon Holmgren
2012-12-17 17:32:59 -08:00
parent 692f7acd27
commit 26667b3975
3 changed files with 12 additions and 23 deletions

View File

@@ -16,6 +16,6 @@ class HomeScreen < ProMotion::Screen
end
def test_it
open_screen TestScreen.new
open_screen TestScreen
end
end

View File

@@ -1,7 +1,7 @@
module ProMotion
module ScreenNavigation
def open_screen(screen, args = {})
# Instantiate screen if given a class instead
# Instantiate screen if given a class
screen = screen.new if screen.respond_to?(:new)
screen.parent_screen = self
@@ -16,9 +16,9 @@ module ProMotion
screen.modal = args[:modal] if args[:modal]
screen.send(:on_load) if screen.respond_to?(:on_load)
screen.hidesBottomBarWhenPushed = args[:hide_tab_bar] if args[:hide_tab_bar]
screen.send(:on_load) if screen.respond_to?(:on_load)
if args[:close_all]
open_root_screen(screen)
@@ -26,7 +26,6 @@ module ProMotion
self.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)
screen.navigation_controller = vc
@@ -45,10 +44,6 @@ module ProMotion
else
open_view_controller screen.main_controller
end
if screen.respond_to?(:on_opened)
screen.send(:on_opened)
end
end
alias :open :open_screen
@@ -143,11 +138,9 @@ module ProMotion
end
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
nav_controller ||= self.navigation_controller
# nav_controller.pushViewController(vc, animated: true)
$nc = nav_controller
nav_controller.pushViewController(vc, animated: true)
end
end
end

View File

@@ -99,13 +99,13 @@ module ProMotion
end
def view_will_appear(animated)
ProMotion::Screen.current_screen = self
# ProMotion::Screen.current_screen = self
self.will_appear
end
def will_appear; end
def view_did_appear(animated)
ProMotion::Screen.current_screen = self
# ProMotion::Screen.current_screen = self
self.on_appear
end
def on_appear; end
@@ -116,7 +116,7 @@ module ProMotion
def will_disappear; end
def view_did_disappear(animated)
ProMotion::Screen.current_screen = self.parent_screen if self.parent_screen
# ProMotion::Screen.current_screen = self.parent_screen if self.parent_screen
self.on_disappear
end
def on_disappear; end
@@ -193,23 +193,23 @@ module ProMotion
def viewWillAppear(animated)
super
self.view_will_appear(animated) if self.respond_to?(:view_will_appear)
self.view_will_appear(animated) if self.respond_to?("view_will_appear:")
end
def viewDidAppear(animated)
super
self.view_did_appear(animated) if self.respond_to?(:view_did_appear)
self.view_did_appear(animated) if self.respond_to?("view_did_appear:")
end
def viewWillDisappear(animated)
if self.respond_to?(:view_will_disappear)
if self.respond_to?("view_will_disappear:")
self.view_will_disappear(animated)
end
super
end
def viewDidDisappear(animated)
if self.respond_to?(:view_did_disappear)
if self.respond_to?("view_did_disappear:")
self.view_did_disappear(animated)
end
super
@@ -231,10 +231,6 @@ module ProMotion
self.on_rotate
end
def dealloc
$stderr.puts "Deallocating #{self.to_s}" if ProMotion::Screen.debug_mode
end
# Class methods
module ClassMethods
def debug_mode