ProMotion 2.6.1 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 285951be59aa38255b60d3acdc23efa0f83ca46e
-  data.tar.gz: 418446c809113d6c205700c16027b76ce3693e7b
+  metadata.gz: 3b3a0f91e4bc6d09696a8ccb696202025c9adeeb
+  data.tar.gz: 68b66d3740172a53ecfc45624212d370035f6626
 SHA512:
-  metadata.gz: c38eb0c246499f5a5da54b9a08595b93b3d41feff71b8b9530d0e5e5d6def216354a471513b47adf6e948878133f9fc6dfcf6e65562c130166ac31922630029b
-  data.tar.gz: 26b3153d167a39716c6c24253ba5bc47cf055e6457f6add54d8b2d7804d5baf8293112330cbce41db261eab0d69776ebc2f3f781cd867b2ff3321e6406ee61e4
+  metadata.gz: 7d827e3214b752ce5ddaecb6ecba7a0b249b4d98911bd29ee528047c4ab5bf8b03726886287623f5995ab745b46e959c3c53baab0d8004e65482294cb13a54df
+  data.tar.gz: 5f534e77735df0403e98862027ba9ce41e8d4ac30aff0d1d55c6821a7dd68606761d7df2e2f35a53b49153ca73b735eda0122882424f8d4a09e94cad6961d205

data/README.md

@@ -4,7 +4,11 @@
 [![Build Status](https://img.shields.io/travis/infinitered/ProMotion.svg?style=flat)](https://travis-ci.org/infinitered/ProMotion)
 [![Code Climate](https://img.shields.io/codeclimate/github/infinitered/ProMotion.svg?style=flat)](https://codeclimate.com/github/infinitered/ProMotion)
 
-ProMotion is maintained by [Infinite Red](http://infinite.red), a web and mobile development company based in Portland, OR and San Francisco, CA.
+ProMotion was created by [Infinite Red](http://infinite.red), a web and mobile development company based in Portland, OR and San Francisco, CA. While you're welcome to use ProMotion, please note that we rely on the community to maintain it. We are happy to merge pull requests and release new versions but are no longer driving primary development.
+
+<img alt="apple presentation" src="https://cloud.githubusercontent.com/assets/1479215/26798290/c156fdb4-49e4-11e7-92b7-be24647a3474.png" width="350px" />
+
+_Apple presenting on ProMotion, WWDC 2017_
 
 ## iPhone Apps, Ruby-style
 
@@ -144,6 +148,11 @@ welcoming to new RubyMotion developers. We don't mind newbie questions.
 
 The quickest way to get help is to join the [Motioneers Slack Group](http://motioneers.herokuapp.com). If you still need help, feel free to open an issue on GitHub. If we don't respond within a day, tweet us a link to the issue -- sometimes we get busy.
 
+## Premium Support
+
+[ProMotion](https://github.com/infinitered/ProMotion), as an open source project, is free to use and always will be. [Infinite Red](https://infinite.red/) offers premium ProMotion support and general mobile app design/development services. Email us at [hello@infinite.red](mailto:hello@infinite.red) to get in touch with us for more details.
+
+
 # Contributing
 
 See [CONTRIBUTING.md](https://github.com/infinitered/ProMotion/blob/master/CONTRIBUTING.md).
@@ -151,9 +160,10 @@ See [CONTRIBUTING.md](https://github.com/infinitered/ProMotion/blob/master/CONTR
 ## Core Team
 
 * Jamon Holmgren: [@jamonholmgren](https://twitter.com/jamonholmgren)
-* Silas Matson: [@silasjmatson](https://twitter.com/silasjmatson)
+* Andrew Havens: [@misbehavens](https://twitter.com/misbehavens)
 * Mark Rickert: [@markrickert](https://twitter.com/markrickert)
 * Ryan Linton: [@ryanlntn](https://twitter.com/ryanlntn)
+* Silas Matson: [@silasjmatson](https://twitter.com/silasjmatson)
 * David Larrabee: [@squidpunch](https://twitter.com/squidpunch)
 
 ## Other Contributors

data/lib/ProMotion.rb

@@ -23,7 +23,10 @@ Motion::Project::App.setup do |app|
     "#{core_lib}/table/cell/table_view_cell_module.rb" => [ "#{core_lib}/styling/styling.rb" ],
     "#{core_lib}/cocoatouch/collection_view_cell.rb" => [ "#{core_lib}/collection/cell/collection_view_cell_module.rb" ],
     "#{core_lib}/collection/collection_screen.rb" => [
+       "#{core_lib}/cocoatouch/collection_view_controller.rb",
        "#{core_lib}/screen/screen_module.rb",
+       "#{core_lib}/collection/collection_builder.rb",
+       "#{core_lib}/collection/collection.rb",
        "#{core_lib}/collection/cell/collection_view_cell_module.rb",
     ],
     "#{core_lib}/collection/cell/collection_view_cell_module.rb" => [ "#{core_lib}/styling/styling.rb" ],
@@ -37,6 +40,7 @@ Motion::Project::App.setup do |app|
     "#{core_lib}/screen/screen.rb" => [ "#{core_lib}/screen/screen_module.rb" ],
     "#{core_lib}/screen/screen_navigation.rb" => [ "#{core_lib}/support/support.rb", ],
     "#{core_lib}/screen/screen_module.rb" => [
+       "#{core_lib}/styling/styling.rb",
        "#{core_lib}/tabs/tabs.rb",
        "#{core_lib}/screen/nav_bar_module.rb",
        "#{core_lib}/screen/screen_navigation.rb",

data/lib/ProMotion/cocoatouch/collection_view_controller.rb

@@ -6,6 +6,12 @@ module ProMotion
       s
     end
 
+    def init
+      super.tap do
+        screen_init if respond_to?(:screen_init)
+      end
+    end
+
     def loadView
       self.respond_to?(:load_view) ? self.load_view : super
     end

data/lib/ProMotion/cocoatouch/table_view_controller.rb

@@ -6,6 +6,12 @@ module ProMotion
       s
     end
 
+    def init
+      super.tap do
+        screen_init if respond_to?(:screen_init)
+      end
+    end
+
     def loadView
       self.respond_to?(:load_view) ? self.load_view : super
     end

data/lib/ProMotion/cocoatouch/view_controller.rb

@@ -6,6 +6,12 @@ module ProMotion
       s
     end
 
+    def init
+      super.tap do
+        screen_init if respond_to?(:screen_init)
+      end
+    end
+
     def loadView
       self.respond_to?(:load_view) ? self.load_view : super
     end

data/lib/ProMotion/delegate/delegate_module.rb

@@ -12,7 +12,6 @@ module ProMotion
     end
 
     def application(application, didFinishLaunchingWithOptions:launch_options)
-      apply_status_bar
       on_load application, launch_options
       # Requires 'ProMotion-push' gem.
       check_for_push_notification(launch_options) if respond_to?(:check_for_push_notification)
@@ -66,37 +65,43 @@ module ProMotion
     alias :open_screen :open
     alias :open_root_screen :open_screen
 
+    # DEPRECATED
     def status_bar?
-      UIApplication.sharedApplication.statusBarHidden
+      mp "The default behavior of `status_bar?` has changed. Calling `status_bar?` on AppDelegate may not return the correct result.", force_color: :yellow
+      self.class.status_bar_style != :hidden
     end
 
-  private
+    def status_bar_style
+      self.class.status_bar_style
+    end
 
-    def apply_status_bar
-      self.class.send(:apply_status_bar)
+    def status_bar_animation
+      self.class.status_bar_animation
     end
 
   public
 
     module ClassMethods
 
-      def status_bar(visible = true, opts={})
-        @status_bar_visible = visible
-        @status_bar_opts = opts
+      def status_bar(visible = true, opts = {})
+        info_plist_setting = NSBundle.mainBundle.objectForInfoDictionaryKey('UIViewControllerBasedStatusBarAppearance')
+        if info_plist_setting == false && visible == false
+          mp "The default behavior of `status_bar` has changed. Calling `status_bar` will have no effect until you remove the 'UIViewControllerBasedStatusBarAppearance' setting from info_plist.", force_color: :yellow
+        end
+        @status_bar_style = case visible
+                            when false then :hidden
+                            when true  then :default
+                            else visible
+                            end
+        @status_bar_animation = opts[:animation] || :default
       end
 
-      def apply_status_bar
-        @status_bar_visible = true if @status_bar_visible.nil?
-        @status_bar_opts ||= { animation: :none }
-        UIApplication.sharedApplication.setStatusBarHidden(!@status_bar_visible, withAnimation:status_bar_animation(@status_bar_opts[:animation]))
+      def status_bar_style
+        @status_bar_style
       end
 
-      def status_bar_animation(opt)
-        {
-          fade:   UIStatusBarAnimationFade,
-          slide:  UIStatusBarAnimationSlide,
-          none:   UIStatusBarAnimationNone
-        }[opt] || UIStatusBarAnimationNone
+      def status_bar_animation
+        @status_bar_animation
       end
 
       def tint_color(c)
@@ -110,12 +115,10 @@ module ProMotion
       def get_tint_color
         @tint_color || nil
       end
-
     end
 
     def self.included(base)
       base.extend(ClassMethods)
     end
-
   end
 end

data/lib/ProMotion/screen/nav_bar_module.rb

@@ -35,12 +35,6 @@ module ProMotion
       self.navigationItem.setRightBarButtonItems(buttons) if side == :right
     end
 
-    # TODO: In PM 2.1+, entirely remove this deprecated method.
-    def set_nav_bar_left_button(title, args={})
-      mp "set_nav_bar_right_button and set_nav_bar_left_button have been removed. Use set_nav_bar_button :right/:left instead.", force_color: :yellow
-    end
-    alias_method :set_nav_bar_right_button, :set_nav_bar_left_button
-
     def set_toolbar_items(buttons = [], animated = true)
       if buttons
         self.toolbarItems = Array(buttons).map{|b| b.is_a?(UIBarButtonItem) ? b : create_toolbar_button(b) }
@@ -81,7 +75,10 @@ module ProMotion
     def bar_button_item(button_type, args)
       return mp("`system_icon:` no longer supported. Use `system_item:` instead.", force_color: :yellow) if args[:system_icon]
       return button_type if button_type.is_a?(UIBarButtonItem)
-      return bar_button_item_system_item(args) if args[:system_item]
+      if args[:system_item]
+        mp("Nav bar button specified both `system_item:` and `title:`. Title will be ignored.", force_color: :yellow) if args[:title]
+        return bar_button_item_system_item(args)
+      end
       return bar_button_item_image(button_type, args) if button_type.is_a?(UIImage)
       return bar_button_item_string(button_type, args) if button_type.is_a?(String)
       return bar_button_item_custom(button_type) if button_type.is_a?(UIView)
@@ -111,6 +108,7 @@ module ProMotion
     end
 
     def map_bar_button_system_item(symbol)
+      mp("Nav bar button stytem item `:page_curl` has been deprecated.", force_color: :yellow) if symbol == :page_curl
       {
         done:         UIBarButtonSystemItemDone,
         cancel:       UIBarButtonSystemItemCancel,
@@ -135,14 +133,15 @@ module ProMotion
         fast_forward: UIBarButtonSystemItemFastForward,
         undo:         UIBarButtonSystemItemUndo,
         redo:         UIBarButtonSystemItemRedo,
-        page_curl:    UIBarButtonSystemItemPageCurl
+        page_curl:    UIBarButtonSystemItemPageCurl # DEPRECATED
       }[symbol] ||    UIBarButtonSystemItemDone
     end
 
     def map_bar_button_item_style(symbol)
+      mp("Nav bar button style `:bordered` has been deprecated.", force_color: :yellow) if symbol == :bordered
       {
         plain:     UIBarButtonItemStylePlain,
-        bordered:  UIBarButtonItemStyleBordered,
+        bordered:  UIBarButtonItemStyleBordered, # DEPRECATED
         done:      UIBarButtonItemStyleDone
       }[symbol] || UIBarButtonItemStyleDone
     end

data/lib/ProMotion/screen/screen_module.rb

@@ -4,6 +4,7 @@ module ProMotion
     include ProMotion::ScreenNavigation
     include ProMotion::Styling
     include ProMotion::NavBarModule
+    include ProMotion::StatusBarModule
     include ProMotion::Tabs
     include ProMotion::SplitScreen if UIDevice.currentDevice.userInterfaceIdiom == UIUserInterfaceIdiomPad || (UIDevice.currentDevice.systemVersion.to_i >= 8 )
 
@@ -41,7 +42,6 @@ module ProMotion
 
     def view_will_appear(animated)
       super
-      resolve_status_bar
       self.will_appear
 
       self.will_present if isMovingToParentViewController
@@ -179,38 +179,12 @@ module ProMotion
       end
     end
 
-    def resolve_status_bar
-      case self.class.status_bar_type
-      when :none
-        status_bar_hidden true
-      when :light
-        status_bar_hidden false
-        status_bar_style UIStatusBarStyleLightContent
-      when :dark
-        status_bar_hidden false
-        status_bar_style UIStatusBarStyleDefault
-      else
-        return status_bar_hidden true if UIApplication.sharedApplication.isStatusBarHidden
-        status_bar_hidden false
-        global_style = NSBundle.mainBundle.objectForInfoDictionaryKey("UIStatusBarStyle")
-        status_bar_style global_style ? Object.const_get(global_style) : UIStatusBarStyleDefault
-      end
-    end
-
     def add_nav_bar_buttons
       self.class.get_nav_bar_button.each do |button_args|
         set_nav_bar_button(button_args[:side], button_args)
       end
     end
 
-    def status_bar_hidden(hidden)
-      UIApplication.sharedApplication.setStatusBarHidden(hidden, withAnimation:self.class.status_bar_animation)
-    end
-
-    def status_bar_style(style)
-      UIApplication.sharedApplication.setStatusBarStyle(style)
-    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 ]
       set_attributes self, args.dup.delete_if { |k,v| reserved_args.include?(k) }
@@ -227,7 +201,6 @@ module ProMotion
       end
     end
 
-    # Class methods
     module ClassMethods
       def title(t=nil)
         if t && t.is_a?(String) == false
@@ -253,22 +226,6 @@ module ProMotion
         @title_type = :view
       end
 
-      def status_bar(style=nil, args={})
-        if NSBundle.mainBundle.objectForInfoDictionaryKey('UIViewControllerBasedStatusBarAppearance').nil?
-          mp "status_bar will have no effect unless you set 'UIViewControllerBasedStatusBarAppearance' to false in your info.plist", force_color: :yellow
-        end
-        @status_bar_style = style
-        @status_bar_animation = args[:animation] if args[:animation]
-      end
-
-      def status_bar_type
-        @status_bar_style || :default
-      end
-
-      def status_bar_animation
-        @status_bar_animation || UIStatusBarAnimationSlide
-      end
-
       def nav_bar(enabled, args={})
         @nav_bar_args = ({ nav_bar: enabled }).merge(args)
       end
@@ -291,7 +248,8 @@ module ProMotion
 
     def self.included(base)
       base.extend(ClassMethods)
-      base.extend(TabClassMethods) # TODO: Is there a better way?
+      base.extend(StatusBarModule::ClassMethods)
+      base.extend(Tabs::ClassMethods)
     end
   end
 end

data/lib/ProMotion/screen/status_bar_module.rb

@@ -0,0 +1,77 @@
+module ProMotion
+  module StatusBarModule
+    def preferredStatusBarStyle
+      styles = {
+        light: UIStatusBarStyleLightContent,
+        dark: UIStatusBarStyleDefault,
+        default: UIStatusBarStyleDefault
+      }
+      styles[self.class.status_bar_style || app.delegate.status_bar_style]  || styles[:default]
+    end
+
+    def preferredStatusBarUpdateAnimation
+      animations = {
+        none: UIStatusBarAnimationNone,
+        fade: UIStatusBarAnimationFade,
+        slide: UIStatusBarAnimationSlide,
+        default: UIStatusBarAnimationFade
+      }
+      animations[self.class.status_bar_animation || app.delegate.status_bar_animation] || animations[:default]
+    end
+
+    def prefersStatusBarHidden
+      style = self.class.status_bar_style || app.delegate.status_bar_style
+      [:none, :hidden].include?(style)
+    end
+
+    def hide_status_bar(opts = {})
+      @previous_status_bar_style = self.class.status_bar_style
+      self.class.status_bar_style(:hidden)
+      update_status_bar_appearance(opts)
+    end
+
+    def show_status_bar(opts = {})
+      new_style = case @previous_status_bar_style
+                  when nil, :hidden, :none
+                    opts[:style] || app.delegate.status_bar_style || :default
+                  else
+                    @previous_status_bar_style
+                  end
+      self.class.status_bar_style(new_style)
+      update_status_bar_appearance(opts)
+    end
+
+    def update_status_bar_appearance(opts = {})
+      if opts[:animated] == true
+        UIView.animateWithDuration(0.3, animations: -> { setNeedsStatusBarAppearanceUpdate })
+      else
+        setNeedsStatusBarAppearanceUpdate
+      end
+    end
+
+    module ClassMethods
+      def status_bar(style = nil, args = {})
+        info_plist_setting = NSBundle.mainBundle.objectForInfoDictionaryKey('UIViewControllerBasedStatusBarAppearance')
+        if info_plist_setting == false
+          mp "The default behavior of `status_bar` has changed. Calling `status_bar` will have no effect until you remove the 'UIViewControllerBasedStatusBarAppearance' setting from info_plist.", force_color: :yellow
+        end
+        @status_bar_style = style
+        @status_bar_animation = args[:animation] if args[:animation]
+      end
+
+      def status_bar_style(val = nil)
+        @status_bar_style = val if val
+        @status_bar_style
+      end
+
+      def status_bar_animation(val = nil)
+        @status_bar_animation = val if val
+        @status_bar_animation
+      end
+    end
+
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
+  end
+end

data/lib/ProMotion/table/cell/table_view_cell_module.rb

@@ -21,6 +21,7 @@ module ProMotion
 
     def layoutSubviews
       super
+      return unless data_cell
 
       # Support changing sizes of the image view
       if (data_cell[:image] && data_cell[:image].is_a?(Hash) && data_cell[:image][:size])
@@ -62,13 +63,25 @@ module ProMotion
       self.imageView.image = remote_placeholder
 
       if sd_web_image?
-        @remote_image_operation = SDWebImageManager.sharedManager.downloadWithURL(data_cell[:remote_image][:url].to_url,
-          options:SDWebImageRefreshCached,
-          progress:nil,
-          completed: -> image, error, cacheType, finished {
-            self.imageView.image = image unless image.nil?
-            self.setNeedsLayout
-        })
+        if SDWebImageManager.sharedManager.respond_to?('downloadWithURL:options:progress:completed:')
+          # SDWebImage 3.x
+          @remote_image_operation = SDWebImageManager.sharedManager.downloadWithURL(data_cell[:remote_image][:url].to_url,
+            options:SDWebImageRefreshCached,
+            progress:nil,
+            completed: -> image, error, cacheType, finished {
+              self.imageView.image = image unless image.nil?
+              self.setNeedsLayout
+          })
+        else
+          # SDWebImage 4.x
+          @remote_image_operation = SDWebImageManager.sharedManager.loadImageWithURL(data_cell[:remote_image][:url].to_url,
+            options:SDWebImageRefreshCached | SDWebImageScaleDownLargeImages,
+            progress:nil,
+            completed: -> image, imageData, error, cacheType, finished, imageURL {
+              self.imageView.image = image unless image.nil?
+              self.setNeedsLayout
+          })
+        end
       elsif jm_image_cache?
         mp "'JMImageCache' is known to have issues with ProMotion. Please consider switching to 'SDWebImage'. 'JMImageCache' support will be deprecated in the next major version.", force_color: :yellow
         JMImageCache.sharedCache.imageForURL(data_cell[:remote_image][:url].to_url, completionBlock:proc { |downloaded_image|

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

@@ -56,7 +56,7 @@ module ProMotion
     end
 
     def search(search_string)
-      start_searching(search_string)
+      start_searching(search_string) # update the search string
 
       self.data.compact.each do |section|
         new_section = {}
@@ -78,20 +78,18 @@ module ProMotion
       self.filtered_data
     end
 
+    def start_searching(search_string = '')
+      self.filtered_data = []
+      self.filtered = true
+      self.search_string = search_string.downcase.strip
+      self.original_search_string = search_string
+    end
+
     def stop_searching
       self.filtered_data = []
       self.filtered = false
       self.search_string = false
       self.original_search_string = false
     end
-
-  private
-
-    def start_searching(search_string)
-      self.filtered_data = []
-      self.filtered = true
-      self.search_string = search_string.downcase.strip
-      self.original_search_string = search_string
-    end
   end
 end

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

@@ -2,75 +2,77 @@ module ProMotion
   module Table
     module Searchable
 
-      def make_searchable(params={})
+      def search_controller
+        @search_controller ||= UISearchController.alloc.initWithSearchResultsController(nil)
+      end
+
+      def make_searchable(params = {})
         params = set_searchable_param_defaults(params)
 
-        search_bar = create_search_bar(params)
+        self.definesPresentationContext = true
+        search_controller.delegate = params[:delegate]
+        search_controller.searchResultsUpdater = params[:search_results_updater]
+        search_controller.hidesNavigationBarDuringPresentation = params[:hidesNavigationBarDuringPresentation]
+        search_controller.dimsBackgroundDuringPresentation = params[:obscuresBackgroundDuringPresentation] # iOS 8+ (not deprecated yet)
+        # search_controller.obscuresBackgroundDuringPresentation = params[:obscuresBackgroundDuringPresentation] # iOS 9.1+ recommends using this instead of dimsBackgroundDuringPresentation
 
-        if params[:search_bar] && params[:search_bar][:placeholder]
-          search_bar.placeholder = params[:search_bar][:placeholder]
+        search_bar = search_controller.searchBar
+        search_bar.delegate = params[:search_bar_delegate]
+        search_bar.autoresizingMask = UIViewAutoresizingFlexibleWidth
+        search_bar.placeholder = NSLocalizedString(params[:placeholder], nil) if params[:placeholder]
+        if params[:scopes]
+          @scopes = params[:scopes]
+          search_bar.scopeButtonTitles = @scopes
         end
+        tableView.tableHeaderView = search_bar
+        search_bar.sizeToFit
 
-        @no_results_text = params[:search_bar][:no_results] if params[:search_bar][:no_results]
-
-        @table_search_display_controller = UISearchDisplayController.alloc.initWithSearchBar(search_bar, contentsController: params[:content_controller])
-        @table_search_display_controller.delegate = params[:delegate]
-        @table_search_display_controller.searchResultsDataSource = params[:data_source]
-        @table_search_display_controller.searchResultsDelegate = params[:search_results_delegate]
-
-        self.tableView.tableHeaderView = search_bar
+        if params[:hide_initially]
+          tableView.contentOffset = CGPointMake(0, search_bar.frame.size.height)
+        end
       end
-      alias :makeSearchable :make_searchable
 
       def set_searchable_param_defaults(params)
-        params[:content_controller] ||= params[:contentController]
-        params[:data_source] ||= params[:searchResultsDataSource]
-        params[:search_results_delegate] ||= params[:searchResultsDelegate]
+        # support camelCase params
+        params[:search_results_updater] ||= params[:searchResultsUpdater]
 
-        params[:frame] ||= CGRectMake(0, 0, 320, 44) # TODO: Don't hardcode this...
-        params[:content_controller] ||= self
         params[:delegate] ||= self
-        params[:data_source] ||= self
-        params[:search_results_delegate] ||= self
-        params
-      end
+        params[:search_results_updater] ||= self
+        params[:search_bar_delegate] ||= self
 
-      def create_search_bar(params)
-        search_bar = UISearchBar.alloc.initWithFrame(params[:frame])
-        search_bar.autoresizingMask = UIViewAutoresizingFlexibleWidth
-        search_bar
-      end
+        if params[:hidesNavigationBarDuringPresentation].nil?
+          params[:hidesNavigationBarDuringPresentation] = true
+        end
 
-      def set_no_results_text(controller)
-        Dispatch::Queue.main.async do
-          controller.searchResultsTableView.subviews.each do |v|
-            v.text = @no_results_text if v.is_a?(UILabel)
-          end
-        end if @no_results_text
+        if params[:obscuresBackgroundDuringPresentation].nil?
+          params[:obscuresBackgroundDuringPresentation] = false
+        end
+
+        params
       end
 
-      ######### iOS methods, headless camel case #######
+      ######### UISearchControllerDelegate methods #######
 
-      def searchDisplayController(controller, shouldReloadTableForSearchString:search_string)
-        self.promotion_table_data.search(search_string)
-        set_no_results_text(controller) if @no_results_text
-        true
+      def willPresentSearchController(search_controller)
+        promotion_table_data.start_searching
+        search_controller.delegate.will_begin_search if search_controller.delegate.respond_to? "will_begin_search"
       end
 
-      def searchDisplayControllerWillEndSearch(controller)
-        self.promotion_table_data.stop_searching
-        self.table_view.setScrollEnabled true
-        self.table_view.reloadData
-        @table_search_display_controller.delegate.will_end_search if @table_search_display_controller.delegate.respond_to? "will_end_search"
+      def willDismissSearchController(search_controller)
+        promotion_table_data.stop_searching
+        table_view.reloadData
+        search_controller.delegate.will_end_search if search_controller.delegate.respond_to? "will_end_search"
       end
 
-      def searchDisplayControllerWillBeginSearch(controller)
-        self.table_view.setScrollEnabled false
-        @table_search_display_controller.delegate.will_begin_search if @table_search_display_controller.delegate.respond_to? "will_begin_search"
+      # UISearchResultsUpdating protocol method
+      def updateSearchResultsForSearchController(search_controller)
+        search_string = search_controller.searchBar.text
+        promotion_table_data.search(search_string) if searching?
+        update_table_data
       end
 
-      def searchDisplayController(controller, didLoadSearchResultsTableView: tableView)
-        tableView.rowHeight = self.table_view.rowHeight
+      def searchBar(search_bar, selectedScopeButtonIndexDidChange: selected_scope_index)
+        try :did_change_selected_scope, selected_scope_index
       end
     end
   end

data/lib/ProMotion/table/table.rb

@@ -50,10 +50,7 @@ module ProMotion
 
     def set_up_searchable
       if self.class.respond_to?(:get_searchable) && self.class.get_searchable
-        self.make_searchable(content_controller: self, search_bar: self.class.get_searchable_params)
-        if self.class.get_searchable_params[:hide_initially]
-          self.tableView.contentOffset = CGPointMake(0, self.searchDisplayController.searchBar.frame.size.height)
-        end
+        self.make_searchable(self.class.get_searchable_params)
       end
     end
 
@@ -152,7 +149,6 @@ module ProMotion
       args = { index_paths: args } unless args.is_a?(Hash)
 
       self.update_table_view_data(self.table_data, args)
-      self.promotion_table_data.search(search_string) if searching?
     end
 
     def toggle_edit_mode(animated = true)

data/lib/ProMotion/tabs/tabs.rb

@@ -105,7 +105,7 @@ module ProMotion
       @_tab_symbols[symbol] || symbol
     end
 
-    module TabClassMethods
+    module ClassMethods
       def tab_bar_item(args={})
         @tab_bar_item = args
       end
@@ -116,8 +116,7 @@ module ProMotion
     end
 
     def self.included(base)
-      base.extend(TabClassMethods)
+      base.extend(ClassMethods)
     end
-
   end
 end

data/lib/ProMotion/version.rb

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

data/spec/unit/screen_spec.rb

@@ -34,44 +34,6 @@ describe "screen properties" do
     HomeScreen.title.should != 'instance method'
   end
 
-  it "should set the UIStatusBar style to :none" do
-    @screen.class.status_bar :none
-    @screen.view_will_appear(false)
-    UIApplication.sharedApplication.isStatusBarHidden.should == true
-  end
-
-  it "should set the UIStatusBar style to :light" do
-    @screen.class.status_bar :light
-    @screen.view_will_appear(false)
-    UIApplication.sharedApplication.isStatusBarHidden.should == false
-    UIApplication.sharedApplication.statusBarStyle.should == UIStatusBarStyleLightContent
-  end
-
-  it "should set the UIStatusBar style to :dark" do
-    UIApplication.sharedApplication.statusBarStyle = UIStatusBarStyleLightContent
-    @screen.class.status_bar :dark
-    @screen.view_will_appear(false)
-    UIApplication.sharedApplication.isStatusBarHidden.should == false
-    UIApplication.sharedApplication.statusBarStyle.should == UIStatusBarStyleDefault
-  end
-
-  it "should default to a global UIStatusBar style" do
-    NSBundle.mainBundle.mock!(:objectForInfoDictionaryKey) do |key|
-      "UIStatusBarStyleLightContent"
-    end
-    @screen.class.status_bar :default
-    @screen.view_will_appear(false)
-    UIApplication.sharedApplication.isStatusBarHidden.should == false
-    UIApplication.sharedApplication.statusBarStyle.should == UIStatusBarStyleLightContent
-  end
-
-  it "should default to a hidden UIStatusBar if already hidden" do
-    UIApplication.sharedApplication.setStatusBarHidden(true, withAnimation: UIStatusBarAnimationNone)
-    @screen.class.status_bar :default
-    @screen.view_will_appear(false)
-    UIApplication.sharedApplication.isStatusBarHidden.should == true
-  end
-
   it "should set the tab bar item with a system item" do
     @screen.set_tab_bar_item system_item: :contacts
     comparison = UITabBarItem.alloc.initWithTabBarSystemItem(UITabBarSystemItemContacts, tag: 0)

data/spec/unit/searchable_table_spec.rb

@@ -17,46 +17,53 @@ describe "Searchable table spec" do
   end
 
   it "should allow searching for all the 'New' states" do
-    controller.searchDisplayController(controller, shouldReloadTableForSearchString:"New")
+    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
   end
 
   it "should allow ending searches" do
-    controller.searchDisplayController(controller, shouldReloadTableForSearchString:"North")
+    controller.willPresentSearchController(controller.search_controller)
+    controller.search_controller.searchBar.text = "North"
+    controller.updateSearchResultsForSearchController(controller.search_controller)
     controller.tableView(controller.tableView, numberOfRowsInSection:0).should == 2
-    controller.searchDisplayControllerWillEndSearch(controller)
+
+    controller.willDismissSearchController(controller.search_controller)
+    controller.search_controller.searchBar.text = ""
+    controller.updateSearchResultsForSearchController(controller.search_controller) # iOS calls this again
+    controller.searching?.should == false
     controller.tableView(controller.tableView, numberOfRowsInSection:0).should == 50
   end
 
   it "should expose the search_string variable and clear it properly" do
-    controller.searchDisplayController(controller, shouldReloadTableForSearchString:"North")
+    controller.willPresentSearchController(controller.search_controller)
+    controller.search_controller.searchBar.text = "North"
+    controller.updateSearchResultsForSearchController(controller.search_controller)
 
     controller.search_string.should == "north"
     controller.original_search_string.should == "North"
 
-    controller.searchDisplayControllerWillEndSearch(controller)
+    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
   end
 
-  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
+  # 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.searchDisplayControllerWillBeginSearch(controller)
-    controller.searchDisplayController(controller, shouldReloadTableForSearchString:"North")
-    controller.will_begin_search_called.should == true
+  #   controller.willPresentSearchController(controller.search_controller)
+  #   controller.will_begin_search_called.should == true
 
-    controller.searchDisplayControllerWillEndSearch(controller)
-    controller.will_end_search_called.should == true
-  end
-
-  it "should set the row height of the search display to match the source table row height" do
-    tableView = UITableView.alloc.init
-    tableView.mock!(:rowHeight=)
-    controller.searchDisplayController(controller, didLoadSearchResultsTableView: tableView)
-  end
+  #   controller.willDismissSearchController(controller.search_controller)
+  #   controller.will_end_search_called.should == true
+  # end
 
   describe "custom search" do
     before do
@@ -70,8 +77,11 @@ describe "Searchable table spec" do
     end
 
     it "should allow searching for all the 'New' states using a custom search proc" do
-      @stabby_controller.searchDisplayController(@stabby_controller, shouldReloadTableForSearchString:"New Stabby")
+      @stabby_controller.willPresentSearchController(@stabby_controller.search_controller)
+      @stabby_controller.search_controller.searchBar.text = "New Stabby"
+      @stabby_controller.updateSearchResultsForSearchController(@stabby_controller.search_controller)
       @stabby_controller.tableView(@stabby_controller.tableView, numberOfRowsInSection:0).should == 4
+
       rows = @stabby_controller.promotion_table_data.search("New stabby")
       rows.first[:cells].length.should == 4
       rows.first[:cells].each do |row|
@@ -81,7 +91,9 @@ describe "Searchable table spec" do
     end
 
     it "should allow searching for all the 'New' states using a symbol as a search proc" do
-      @proc_controller.searchDisplayController(@proc_controller, shouldReloadTableForSearchString:"New Symbol")
+      @proc_controller.willPresentSearchController(@proc_controller.search_controller)
+      @proc_controller.search_controller.searchBar.text = "New Symbol"
+      @proc_controller.updateSearchResultsForSearchController(@proc_controller.search_controller)
       cell_count = @proc_controller.tableView(@proc_controller.tableView, numberOfRowsInSection:0)
       cell_count.should == 4
       rows = @proc_controller.promotion_table_data.search("New Symbol")
@@ -93,12 +105,16 @@ describe "Searchable table spec" do
     end
 
     it "custom searches empty with stabby proc if there is no match" do
-      @stabby_controller.searchDisplayController(@stabby_controller, shouldReloadTableForSearchString:"Totally Bogus")
+      @stabby_controller.willPresentSearchController(@stabby_controller.search_controller)
+      @stabby_controller.search_controller.searchBar.text = "Totally Bogus"
+      @stabby_controller.updateSearchResultsForSearchController(@stabby_controller.search_controller)
       @stabby_controller.tableView(@stabby_controller.tableView, numberOfRowsInSection:0).should == 0
     end
 
     it "custom searches empty with symbol for proc if there is no match" do
-      @proc_controller.searchDisplayController(@proc_controller, shouldReloadTableForSearchString:"Totally Bogus")
+      @proc_controller.willPresentSearchController(@proc_controller.search_controller)
+      @proc_controller.search_controller.searchBar.text = "Totally Bogus"
+      @proc_controller.updateSearchResultsForSearchController(@proc_controller.search_controller)
       @proc_controller.tableView(@proc_controller.tableView, numberOfRowsInSection:0).should == 0
     end
 

data/spec/unit/tables/table_searchable_spec.rb

@@ -22,20 +22,6 @@ describe "table screen searchable functionality" do
     end
     screen = HiddenSearchScreen.new
     screen.on_load
-    screen.tableView.contentOffset.should == CGPointMake(0,screen.searchDisplayController.searchBar.frame.size.height)
-  end
-
-  it "should display a custom message when there are no results" do
-    table_screen = TableScreenSymbolSearchableNoResults.new
-    table_screen.on_load
-
-    table_screen.searchDisplayControllerWillBeginSearch(table_screen.searchDisplayController)
-    table_screen.searchDisplayController(table_screen.searchDisplayController, shouldReloadTableForSearchString:"supercalifragilisticexpialidocious")
-    table_screen.update_table_data
-
-    results_label = table_screen.searchDisplayController.searchResultsTableView.subviews.detect{|v| v.is_a?(UILabel)}
-    wait_for_change results_label, 'text' do
-      results_label.text.should == "Nada!"
-    end
+    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.6.1
+  version: 2.7.0
 platform: ruby
 authors:
 - Jamon Holmgren
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-14 00:00:00.000000000 Z
+date: 2018-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: methadone
@@ -74,14 +74,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -138,6 +138,7 @@ files:
 - lib/ProMotion/screen/screen.rb
 - lib/ProMotion/screen/screen_module.rb
 - lib/ProMotion/screen/screen_navigation.rb
+- lib/ProMotion/screen/status_bar_module.rb
 - lib/ProMotion/stubs/dummy_image_view.rb
 - lib/ProMotion/stubs/dummy_view.rb
 - lib/ProMotion/styling/styling.rb
@@ -213,7 +214,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: ProMotion is a fast way to get started building RubyMotion apps. Instead
@@ -222,36 +223,36 @@ summary: ProMotion is a fast way to get started building RubyMotion apps. Instea
   more like Ruby and less like Objective-C. With a memorable, concise API and a friendly,
   helpful community, ProMotion is a great way to get started with iOS development.
 test_files:
-- spec/functional/func_screen_spec.rb
-- spec/functional/func_split_screen_spec.rb
-- spec/functional/func_table_screen_cell_spec.rb
-- spec/functional/func_table_screen_spec.rb
-- spec/functional/func_table_screen_updating_spec.rb
-- spec/functional/func_web_screen_spec.rb
-- spec/helpers/test_helper.rb
-- spec/unit/collection_screen_spec.rb
-- spec/unit/delegate_spec.rb
-- spec/unit/image_title_screen_spec.rb
-- spec/unit/image_view_title_screen_spec.rb
-- spec/unit/load_view_spec.rb
-- spec/unit/main_spec.rb
-- spec/unit/screen_helpers_spec.rb
-- spec/unit/screen_module_spec.rb
-- spec/unit/screen_spec.rb
-- spec/unit/searchable_table_spec.rb
-- spec/unit/split_screen_in_tab_bar_spec.rb
-- spec/unit/split_screen_open_screen_spec.rb
-- spec/unit/split_screen_spec.rb
 - spec/unit/support_spec.rb
-- spec/unit/tab_bar_spec.rb
-- spec/unit/tab_spec.rb
-- spec/unit/tables/table_indexable_spec.rb
+- spec/unit/tables/table_utils_spec.rb
+- spec/unit/tables/table_screen_spec.rb
 - spec/unit/tables/table_module_spec.rb
 - spec/unit/tables/table_refreshable_spec.rb
-- spec/unit/tables/table_screen_spec.rb
 - spec/unit/tables/table_searchable_spec.rb
-- spec/unit/tables/table_utils_spec.rb
+- spec/unit/tables/table_indexable_spec.rb
 - spec/unit/tables/table_view_cell_spec.rb
+- spec/unit/tab_bar_spec.rb
+- spec/unit/searchable_table_spec.rb
+- spec/unit/main_spec.rb
+- spec/unit/image_title_screen_spec.rb
+- spec/unit/screen_module_spec.rb
+- spec/unit/screen_helpers_spec.rb
+- spec/unit/split_screen_in_tab_bar_spec.rb
+- spec/unit/screen_spec.rb
+- spec/unit/image_view_title_screen_spec.rb
+- spec/unit/delegate_spec.rb
+- spec/unit/split_screen_spec.rb
+- spec/unit/tab_spec.rb
+- spec/unit/split_screen_open_screen_spec.rb
+- spec/unit/web_spec.rb
 - spec/unit/view_helper_spec.rb
+- spec/unit/load_view_spec.rb
+- spec/unit/collection_screen_spec.rb
 - spec/unit/view_title_screen_spec.rb
-- spec/unit/web_spec.rb
+- spec/helpers/test_helper.rb
+- spec/functional/func_table_screen_updating_spec.rb
+- spec/functional/func_screen_spec.rb
+- spec/functional/func_table_screen_spec.rb
+- spec/functional/func_split_screen_spec.rb
+- spec/functional/func_table_screen_cell_spec.rb
+- spec/functional/func_web_screen_spec.rb