ProMotion 2.7.1 → 2.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ff30153aea5024d65f20bfacc4de9b03237997c
-  data.tar.gz: 85cfd76f2fbd7ded2051be9b6ccdc816b26e60ea
+  metadata.gz: 4d0c2893ec28afedac3c71606028a215ba4dbc6e
+  data.tar.gz: 35313a6617437f5c92a3eb0c0448939c4bca13e5
 SHA512:
-  metadata.gz: 9956829eb6dc692feca9a05fb8d913ccf27ef04a46c2b8cd8645e09638aa56f6a6f05dfe5b317a5a66c95bfce55383c2b0a1a9fe4d08df7c1dd03424810f9184
-  data.tar.gz: b6eef1cc874010a91ef179597209b04a58d9c3bd70e43d9ba47be44322d79c5f1a389332e7de6e54f2e755548d9f61f9ecacbb940832c23aa88f686f3f3f79c8
+  metadata.gz: c23d851b8bd4aae82dcf6b72cb80d3e88b7d9d1980f20a6b3a056b52a6211337e5985b4d07dd6af63da6983870d7c06da2a0e0bca1fa326b2356406532ec4f9c
+  data.tar.gz: 90dd32dcc1281d9b49f87ab21e00cb61946e37e6e7a7e68aa471bfbb6a1f2243724a2da3a070a64c7fce804206b5206a7da9aa7424ced972bc274a67c7f39c2b

data/lib/ProMotion/delegate/delegate_module.rb

@@ -51,7 +51,7 @@ module ProMotion
     end
 
     def open(screen, args={})
-      screen = screen.new if screen.respond_to?(:new)
+      screen = set_up_screen_for_open(screen, args)
 
       self.home_screen = screen
 
@@ -65,6 +65,27 @@ module ProMotion
     alias :open_screen :open
     alias :open_root_screen :open_screen
 
+    def set_up_screen_for_open(screen, args={})
+      # Instantiate screen if given a class
+      screen = screen.new(args) if screen.respond_to?(:new)
+
+      # Store screen options
+      screen.screen_options.merge(args) if screen.respond_to?(:screen_options)
+
+      # Set title & modal properties
+      screen.title = args[:title] if args[:title] && screen.respond_to?(:title=)
+      screen.modal = args[:modal] if args[:modal] && screen.respond_to?(:modal=)
+
+      # Hide bottom bar?
+      screen.hidesBottomBarWhenPushed = args[:hide_tab_bar] == true
+
+      # Wrap in a PM::NavigationController?
+      screen.add_nav_bar(args) if screen.respond_to?(:add_nav_bar)
+
+      # Return modified screen instance
+      screen
+    end
+
     # DEPRECATED
     def status_bar?
       mp "The default behavior of `status_bar?` has changed. Calling `status_bar?` on AppDelegate may not return the correct result.", force_color: :yellow

data/lib/ProMotion/screen/nav_bar_module.rb

@@ -48,10 +48,16 @@ module ProMotion
 
     def add_nav_bar(args = {})
       args = self.class.get_nav_bar.merge(args)
-      return unless args[:nav_bar]
+      return unless args[:nav_bar] || args[:nav_controller]
       self.navigationController ||= begin
         self.first_screen = true if self.respond_to?(:first_screen=)
-        nav = (args[:nav_controller] || NavigationController).alloc.initWithRootViewController(self)
+        nav_controller_class = args[:nav_controller] || NavigationController
+        if nav_controller_class.is_a? Class
+          nav = nav_controller_class.alloc.initWithRootViewController(self)
+        else
+          nav = nav_controller_class
+          nav.setViewControllers([self], animated: false)
+        end
         nav.setModalTransitionStyle(args[:transition_style]) if args[:transition_style]
         nav.setModalPresentationStyle(args[:presentation_style]) if args[:presentation_style]
         nav
@@ -59,9 +65,11 @@ module ProMotion
       self.navigationController.toolbarHidden = !args[:toolbar] unless args[:toolbar].nil?
     end
 
-    def view_will_appear(animated)
-      if @screen_options && !@screen_options[:hide_nav_bar].nil?
-        self.navigationController.setNavigationBarHidden(@screen_options[:hide_nav_bar], animated: false)
+    def update_nav_bar_visibility(animated)
+      return unless navigationController
+      hidden = @screen_options[:hide_nav_bar]
+      unless hidden.nil?
+        navigationController.setNavigationBarHidden(hidden, animated: animated)
       end
     end
 

data/lib/ProMotion/screen/screen_module.rb

@@ -9,7 +9,7 @@ module ProMotion
     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
@@ -41,7 +41,8 @@ module ProMotion
     end
 
     def view_will_appear(animated)
-      super
+      update_nav_bar_visibility(animated)
+
       self.will_appear
 
       self.will_present if isMovingToParentViewController
@@ -186,7 +187,7 @@ module ProMotion
     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
 

data/lib/ProMotion/screen/screen_navigation.rb

@@ -10,11 +10,12 @@ module ProMotion
       ensure_wrapper_controller_in_place(screen, args)
 
       opened ||= open_in_split_screen(screen, args) if self.split_screen
-      opened ||= open_root_screen(screen) if args[:close_all]
+      opened ||= open_root_screen(screen, args) if args[:close_all]
+      opened ||= replace_nav_stack([screen], args) if args[:replace_nav_stack]
       opened ||= present_modal_view_controller(screen, args) if args[:modal]
       opened ||= open_in_tab(screen, args[:in_tab]) if args[:in_tab]
       opened ||= push_view_controller(screen, self.navigationController, !!args[:animated]) if self.navigationController
-      opened ||= open_root_screen(screen.navigationController || screen)
+      opened ||= open_root_screen(screen.navigationController || screen, args)
       screen
     end
     alias :open :open_screen
@@ -25,8 +26,8 @@ module ProMotion
       args[:in_detail] || args[:in_master]
     end
 
-    def open_root_screen(screen)
-      app_delegate.open_root_screen(screen)
+    def open_root_screen(screen, args = {})
+      app_delegate.open_root_screen(screen, args)
     end
 
     def open_modal(screen, args = {})
@@ -75,15 +76,19 @@ module ProMotion
       nav_controller.pushViewController(vc, animated: animated)
     end
 
+    def replace_nav_stack(screens, args = {})
+      args[:animated] ||= true
+      navigationController.setViewControllers(screens, animated: !!args[:animated])
+    end
+
   protected
 
     def set_up_screen_for_open(screen, args={})
-
       # Instantiate screen if given a class
-      screen = screen.new if screen.respond_to?(:new)
+      screen = screen.new(args) if screen.respond_to?(:new)
 
       # Store screen options
-      screen.instance_variable_set(:@screen_options, args)
+      screen.screen_options.merge(args) if screen.respond_to?(:screen_options)
 
       # Set parent
       screen.parent_screen = self if screen.respond_to?(:parent_screen=)
@@ -96,11 +101,10 @@ module ProMotion
       screen.hidesBottomBarWhenPushed = args[:hide_tab_bar] == true
 
       # Wrap in a PM::NavigationController?
-      screen.add_nav_bar(args) if args[:nav_bar] && screen.respond_to?(:add_nav_bar)
+      screen.add_nav_bar(args) if screen.respond_to?(:add_nav_bar)
 
       # Return modified screen instance
       screen
-
     end
 
     def ensure_wrapper_controller_in_place(screen, args={})

data/lib/ProMotion/table/data/table_data.rb

@@ -79,6 +79,8 @@ module ProMotion
           self.filtered_data << new_section
         end
       end
+
+      self.filtered_data
     end
 
     def clear_filter

data/lib/ProMotion/table/extensions/searchable.rb

@@ -2,11 +2,14 @@ module ProMotion
   module Table
     module Searchable
 
+      def search_controller
+        @search_controller ||= UISearchController.alloc.initWithSearchResultsController(nil)
+      end
+
       def make_searchable(params = nil) # params argument is deprecated. No longer need to use it.
         params = get_searchable_params
 
         self.definesPresentationContext = true
-        search_controller = UISearchController.alloc.initWithSearchResultsController(nil)
         search_controller.delegate = params[:delegate]
         search_controller.searchResultsUpdater = params[:search_results_updater]
         search_controller.hidesNavigationBarDuringPresentation = params[:hides_nav_bar]

data/lib/ProMotion/version.rb

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

data/spec/functional/func_split_screen_spec.rb

@@ -19,43 +19,37 @@ describe "Split screen functionality" do
     rotate_device to: :portrait, button: :bottom
   end
 
+if TestHelper.lt_ios11 # FIXME: these tests no longer work since iOS 11 removed the private class UINavigationItemView
   it "should allow opening a detail view from the master view" do
-
     @master.open BasicScreen.new(nav_bar: true), in_detail: true, animated: false
 
     view("Master").should.be.kind_of UINavigationItemView
     view("Basic").should.be.kind_of UINavigationItemView
     views(UINavigationItemView).each { |v| v.title.should.not == "Detail" }
-
   end
 
   it "should allow opening another view from the master view" do
-
     @master.open BasicScreen.new(nav_bar: true), animated: false
 
     view("Basic").should.be.kind_of UINavigationItemView
     view("Detail").should.be.kind_of UINavigationItemView
-
   end
 
   it "should allow opening a master view from the detail view" do
-
     @detail.open BasicScreen.new(nav_bar: true), in_master: true, animated: false
 
     view("Basic").should.be.kind_of UINavigationItemView
     view("Detail").should.be.kind_of UINavigationItemView
     views(UINavigationItemView).each { |v| v.title.should.not == "Master" }
-
   end
 
   it "should allow opening another view from the detail view" do
-
     @detail.open BasicScreen.new(nav_bar: true), animated: false
 
     view("Basic").should.be.kind_of UINavigationItemView
     view("Master").should.be.kind_of UINavigationItemView
-
   end
+end
 
   unless ENV['TRAVIS'] # TODO: Why won't Travis pass these tests??
     it "should override the title on the button" do

data/spec/helpers/test_helper.rb

@@ -1,21 +1,30 @@
 class TestHelper
+  def self.ios_version
+    UIDevice.currentDevice.systemVersion.to_f
+  end
+
   def self.ios6
-    UIDevice.currentDevice.systemVersion.to_f >= 6.0 &&
-    UIDevice.currentDevice.systemVersion.to_f < 7.0
+    ios_version >= 6.0 && ios_version < 7.0
   end
 
   def self.ios7
-    UIDevice.currentDevice.systemVersion.to_f >= 7.0 &&
-    UIDevice.currentDevice.systemVersion.to_f < 8.0
+    ios_version >= 7.0 && ios_version < 8.0
   end
 
   def self.ios8
-    UIDevice.currentDevice.systemVersion.to_f >= 8.0 &&
-    UIDevice.currentDevice.systemVersion.to_f < 9.0
+    ios_version >= 8.0 && ios_version < 9.0
   end
 
   def self.gte_ios8
-    UIDevice.currentDevice.systemVersion.to_f >= 8.0
+    ios_version >= 8.0
+  end
+
+  def self.lt_ios11
+    ios_version < 11.0
+  end
+
+  def self.gte_ios11
+    ios_version >= 11.0
   end
 end
 

data/spec/unit/screen_helpers_spec.rb

@@ -155,7 +155,7 @@ describe "screen helpers" do
       end
 
       it "should open a root screen if :close_all is provided" do
-        @screen.mock!(:open_root_screen) { |screen| screen.should.be.instance_of BasicScreen }
+        @screen.mock!(:open_root_screen) { |screen, args| screen.should.be.instance_of BasicScreen }
         screen = @screen.open BasicScreen, close_all: true
         screen.should.be.kind_of BasicScreen
       end
@@ -218,7 +218,7 @@ describe "screen helpers" do
       it "should open the provided view controller as root view if no other conditions are met" do
         parent_screen = HomeScreen.new
         new_screen = BasicScreen.new
-        parent_screen.mock!(:open_root_screen) { |vc| vc.should.be == new_screen }
+        parent_screen.mock!(:open_root_screen) { |vc, args| vc.should.be == new_screen }
         screen = parent_screen.open_screen new_screen
         screen.should == new_screen
       end

data/spec/unit/searchable_table_spec.rb

@@ -18,7 +18,6 @@ describe "Searchable table spec" do
 
   it "should allow searching for all the 'New' states" do
     controller.willPresentSearchController(controller.search_controller)
-    controller.searching?.should == true
     controller.search_controller.searchBar.text = "New"
     controller.updateSearchResultsForSearchController(controller.search_controller)
     controller.tableView(controller.tableView, numberOfRowsInSection:0).should == 4
@@ -37,34 +36,17 @@ describe "Searchable table spec" do
     controller.tableView(controller.tableView, numberOfRowsInSection:0).should == 50
   end
 
-  it "should expose the search_string variable and clear it properly" do
-    controller.willPresentSearchController(controller.search_controller)
-    controller.search_controller.searchBar.text = "North"
-    controller.updateSearchResultsForSearchController(controller.search_controller)
+  it "should call the start and stop searching callbacks properly" do
+    controller.will_begin_search_called.should == nil
+    controller.will_end_search_called.should == nil
 
-    controller.search_string.should == "north"
-    controller.original_search_string.should == "North"
+    controller.willPresentSearchController(controller.search_controller)
+    controller.will_begin_search_called.should == true
 
     controller.willDismissSearchController(controller.search_controller)
-    controller.search_controller.searchBar.text = ""
-    controller.updateSearchResultsForSearchController(controller.search_controller) # iOS calls this again
-
-    controller.search_string.should == false
-    controller.original_search_string.should == false
+    controller.will_end_search_called.should == true
   end
 
-  # FIXME: Can't figure out why this test passes in isolation, but fails when run after the other tests.
-  # it "should call the start and stop searching callbacks properly" do
-  #   controller.will_begin_search_called.should == nil
-  #   controller.will_end_search_called.should == nil
-
-  #   controller.willPresentSearchController(controller.search_controller)
-  #   controller.will_begin_search_called.should == true
-
-  #   controller.willDismissSearchController(controller.search_controller)
-  #   controller.will_end_search_called.should == true
-  # end
-
   describe "custom search" do
     before do
       @stabby_controller = TableScreenStabbySearchable.new

data/spec/unit/tables/table_searchable_spec.rb

@@ -8,20 +8,23 @@ describe "table screen searchable functionality" do
     @screen.class.get_searchable.should == true
   end
 
-  it "should create a search header" do
-    @screen.tableView.tableHeaderView.should.be.kind_of UISearchBar
-  end
+  # Older than iOS 11 tests
+  if TestHelper.lt_ios11
+    it "should create a search header" do
+      @screen.tableView.tableHeaderView.should.be.kind_of UISearchBar
+    end
 
-  it "should not hide the search bar initally by default" do
-    @screen.tableView.contentOffset.should == CGPointMake(0,0)
-  end
+    it "should not hide the search bar initally by default" do
+      @screen.tableView.contentOffset.should == CGPointMake(0,0)
+    end
 
-  it "should allow hiding the search bar initally" do
-    class HiddenSearchScreen < TableScreenSearchable
-      searchable hide_initially: true
+    it "should allow hiding the search bar initally" do
+      class HiddenSearchScreen < TableScreenSearchable
+        searchable hide_initially: true
+      end
+      screen = HiddenSearchScreen.new
+      screen.on_load
+      screen.tableView.contentOffset.should == CGPointMake(0, screen.tableView.tableHeaderView.frame.size.height)
     end
-    screen = HiddenSearchScreen.new
-    screen.on_load
-    screen.tableView.contentOffset.should == CGPointMake(0, screen.tableView.tableHeaderView.frame.size.height)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ProMotion
 version: !ruby/object:Gem::Version
-  version: 2.7.1
+  version: 2.8.0
 platform: ruby
 authors:
 - Jamon Holmgren
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-17 00:00:00.000000000 Z
+date: 2018-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: methadone