lib/ProMotion/screen/screen_module.rb in ProMotion-2.7.1 vs lib/ProMotion/screen/screen_module.rb in ProMotion-2.8.0
- old
+ new
@@ -7,11 +7,11 @@
include ProMotion::StatusBarModule
include ProMotion::Tabs
include ProMotion::SplitScreen if UIDevice.currentDevice.userInterfaceIdiom == UIUserInterfaceIdiomPad || (UIDevice.currentDevice.systemVersion.to_i >= 8 )
attr_reader :parent_screen
- attr_accessor :first_screen, :modal, :split_screen
+ attr_accessor :screen_options, :first_screen, :modal, :split_screen
def screen_init(args = {})
@screen_options = args
check_ancestry
resolve_title
@@ -39,11 +39,12 @@
def view_did_load
self.send(:on_load) if self.respond_to?(:on_load)
end
def view_will_appear(animated)
- super
+ update_nav_bar_visibility(animated)
+
self.will_appear
self.will_present if isMovingToParentViewController
end
def will_appear; end
@@ -184,10 +185,10 @@
set_nav_bar_button(button_args[:side], button_args)
end
end
def apply_properties(args)
- reserved_args = [ :nav_bar, :hide_nav_bar, :hide_tab_bar, :animated, :close_all, :in_tab, :in_detail, :in_master, :to_screen, :toolbar ]
+ reserved_args = [ :nav_bar, :nav_controller, :hide_nav_bar, :hide_tab_bar, :animated, :close_all, :replace_nav_stack, :in_tab, :in_detail, :in_master, :to_screen, :toolbar ]
set_attributes self, args.dup.delete_if { |k,v| reserved_args.include?(k) }
end
def tab_bar_setup
self.tab_bar_item = self.class.send(:get_tab_bar_item)