ProMotion 2.7.0 → 2.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b3a0f91e4bc6d09696a8ccb696202025c9adeeb
-  data.tar.gz: 68b66d3740172a53ecfc45624212d370035f6626
+  metadata.gz: 0ff30153aea5024d65f20bfacc4de9b03237997c
+  data.tar.gz: 85cfd76f2fbd7ded2051be9b6ccdc816b26e60ea
 SHA512:
-  metadata.gz: 7d827e3214b752ce5ddaecb6ecba7a0b249b4d98911bd29ee528047c4ab5bf8b03726886287623f5995ab745b46e959c3c53baab0d8004e65482294cb13a54df
-  data.tar.gz: 5f534e77735df0403e98862027ba9ce41e8d4ac30aff0d1d55c6821a7dd68606761d7df2e2f35a53b49153ca73b735eda0122882424f8d4a09e94cad6961d205
+  metadata.gz: 9956829eb6dc692feca9a05fb8d913ccf27ef04a46c2b8cd8645e09638aa56f6a6f05dfe5b317a5a66c95bfce55383c2b0a1a9fe4d08df7c1dd03424810f9184
+  data.tar.gz: b6eef1cc874010a91ef179597209b04a58d9c3bd70e43d9ba47be44322d79c5f1a389332e7de6e54f2e755548d9f61f9ecacbb940832c23aa88f686f3f3f79c8

data/README.md

@@ -65,7 +65,7 @@ class HelpScreen < PM::TableScreen
 end
 ```
 
-# Features
+## Features
 
 |Screens|Navigation Bars|Tab Bars|
 |---|---|---|
@@ -84,44 +84,18 @@ end
 
 #### ...and much more.
 
-# Getting Started
+## Getting Started
 
 1. Check out the [Getting Started Guide](https://github.com/infinitered/ProMotion/blob/master/docs/Guides/Getting%20Started.md)
 2. Watch the excellent [MotionInMotion screencast about ProMotion](https://motioninmotion.tv/screencasts/8) (very reasonably priced subscription required)
 3. Follow a tutorial: [Building an ESPN app using RubyMotion, ProMotion, and TDD](http://jamonholmgren.com/building-an-espn-app-using-rubymotion-promotion-and-tdd)
 4. Read the [Documentation](https://github.com/infinitered/ProMotion/blob/master/docs)
 
-# Changelog
+## Changelog
 
-## Version 2.6.1
+[See Releases page](https://github.com/infinitered/ProMotion/releases)
 
-This release includes a few new features and bugfixes and is backwards compatible with all 2.x releases.
-
-* PR #777 New Feature: Add ability to register live reload plugins
-* PR #778 Bugfix: Only update search results table data if possible
-* PR #779 Fix bug where remote images are not shown on first load of table screen
-* PR #787 Fix Travis CI build from failing when RubyMotion is up-to-date
-* PR #796 Fix iOS 10 from crashing when determining supportedInterfaceOrientations for UIImagePickerController
-* Other minor bugfixes and documentation updates
-
-## Version 2.6.0
-
-This release includes a few new features and bugfixes and is backwards compatible with all 2.x releases.
-
-* PR #773 Add a `on_continue_user_activity` delegate method
-* PR #766 Fix nav_bar_button class method
-* Other minor bugfixes and documentation updates
-
-## Version 2.5.0
-
-This release includes some new features and bugfixes and is backwards compatible with all 2.x releases.
-
-* PR #763 Adds footer_view to TableScreens
-* PR #705 Adds split-screen support for large iPhones
-* PR #736 Adds the index path when deleting a cell
-* Several other bugfix PRs
-
-# Apps built on ProMotion
+## Apps built on ProMotion
 
 [Apps built on ProMotion](http://promotion.readthedocs.org/en/master/ProMotion%20Apps/)
 
@@ -129,31 +103,31 @@ This release includes some new features and bugfixes and is backwards compatible
 
 Open a pull request! We love adding new ProMotion-built apps.
 
-# API Reference
+## API Reference
 
-We've created a comprehensive and always updated wiki with code examples, usage examples, and API reference.
+We have comprehensive documentation with code examples, usage examples, and API reference.
 
 ### [ProMotion Documentation](https://github.com/infinitered/ProMotion/blob/master/docs)
 
-# Screencasts
+## Screencasts
 
 * Watch Jamon Holmgren give a talk about ProMotion at [RubyMotion #inspect2014](http://confreaks.com/videos/3813-inspect-going-pro-with-promotion-from-prototype-to-production) (video)
 * Watch the [September 2013 Motion Meetup](http://www.youtube.com/watch?v=rf7h-3AiMRQ) where Gant Laborde
 interviews Jamon Holmgren about ProMotion
 
-# Help
+## Help
 
 ProMotion is not only an easy DSL to get started. The community is very helpful and
 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
+### 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
+## Contributing
 
 See [CONTRIBUTING.md](https://github.com/infinitered/ProMotion/blob/master/CONTRIBUTING.md).
 

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

@@ -3,7 +3,7 @@ module ProMotion
     include ProMotion::Table::Utils
     include ProMotion::TableDataBuilder
 
-    attr_accessor :data, :filtered_data, :search_string, :original_search_string, :filtered, :table_view, :search_params
+    attr_accessor :data, :filtered_data, :table_view
 
     def initialize(data, table_view, search_action = nil)
       @search_action ||= search_action
@@ -27,7 +27,7 @@ module ProMotion
     end
 
     def sections
-      self.filtered ? self.filtered_data : self.data
+      filtered? ? self.filtered_data : self.data
     end
 
     def section_length(index)
@@ -55,8 +55,13 @@ module ProMotion
       cell[:searchable] != false && "#{cell[:title]}\n#{cell[:search_text]}".downcase.strip.include?(search_string.downcase.strip)
     end
 
+    def filtered?
+      @filtered == true
+    end
+
     def search(search_string)
-      start_searching(search_string) # update the search string
+      @filtered = true
+      self.filtered_data = []
 
       self.data.compact.each do |section|
         new_section = {}
@@ -74,22 +79,10 @@ module ProMotion
           self.filtered_data << new_section
         end
       end
-
-      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
+    def clear_filter
+      @filtered = false
     end
   end
 end

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

@@ -2,7 +2,7 @@ module ProMotion
   module Table
     module Indexable
       def table_data_index
-        return nil if self.promotion_table_data.filtered || !self.class.get_indexable
+        return nil if self.promotion_table_data.filtered? || !self.class.get_indexable
 
         index = self.promotion_table_data.sections.collect{ |section| (section[:title] || " ")[0] } || []
         index.unshift("{search}") if self.class.get_searchable

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

@@ -26,7 +26,7 @@ module ProMotion
       private
 
       def pressed_table_view
-        searching? ? @table_search_display_controller.searchResultsTableView : table_view
+        table_view
       end
 
     end

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

@@ -2,51 +2,56 @@ module ProMotion
   module Table
     module Searchable
 
-      def search_controller
-        @search_controller ||= UISearchController.alloc.initWithSearchResultsController(nil)
-      end
-
-      def make_searchable(params = {})
-        params = set_searchable_param_defaults(params)
+      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[: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
+        search_controller.hidesNavigationBarDuringPresentation = params[:hides_nav_bar]
+        search_controller.dimsBackgroundDuringPresentation = params[:obscures_background] # iOS 8+ (not deprecated yet)
+        # search_controller.obscuresBackgroundDuringPresentation = params[:obscures_background] # iOS 9.1+ recommends using this instead of dimsBackgroundDuringPresentation
 
         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
 
-        if params[:hide_initially]
-          tableView.contentOffset = CGPointMake(0, search_bar.frame.size.height)
+        if navigationItem && navigationItem.respond_to?(:setSearchController)
+          # For iOS 11 and later, we place the search bar in the navigation bar.
+          navigationItem.searchController = search_controller
+          navigationItem.hidesSearchBarWhenScrolling = params[:hides_search_bar_when_scrolling]
+        else
+          # For iOS 10 and earlier, we place the search bar in the table view's header.
+          search_bar.autoresizingMask = UIViewAutoresizingFlexibleWidth
+          tableView.tableHeaderView = search_bar
+          if params[:hide_initially]
+            tableView.contentOffset = CGPointMake(0, search_bar.frame.size.height)
+          end
         end
+
+        @search_controller = search_controller
       end
 
-      def set_searchable_param_defaults(params)
+      def get_searchable_params
+        params = self.class.get_searchable_params.dup
+
         # support camelCase params
         params[:search_results_updater] ||= params[:searchResultsUpdater]
+        params[:hides_nav_bar] = params[:hidesNavigationBarDuringPresentation] if params[:hides_nav_bar].nil?
+        params[:obscures_background] = params[:obscuresBackgroundDuringPresentation] if params[:obscures_background].nil?
+        params[:hides_search_bar_when_scrolling] = params[:hidesSearchBarWhenScrolling] if params[:hides_search_bar_when_scrolling].nil?
 
         params[:delegate] ||= self
         params[:search_results_updater] ||= self
         params[:search_bar_delegate] ||= self
-
-        if params[:hidesNavigationBarDuringPresentation].nil?
-          params[:hidesNavigationBarDuringPresentation] = true
-        end
-
-        if params[:obscuresBackgroundDuringPresentation].nil?
-          params[:obscuresBackgroundDuringPresentation] = false
-        end
+        params[:hides_nav_bar] = true if params[:hides_nav_bar].nil?
+        params[:obscures_background] = false if params[:obscures_background].nil?
+        params[:hides_search_bar_when_scrolling] = false if params[:hides_search_bar_when_scrolling].nil?
 
         params
       end
@@ -54,21 +59,23 @@ module ProMotion
       ######### UISearchControllerDelegate methods #######
 
       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 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
 
-      # UISearchResultsUpdating protocol method
+      ######### UISearchResultsUpdating protocol methods #########
+
       def updateSearchResultsForSearchController(search_controller)
-        search_string = search_controller.searchBar.text
-        promotion_table_data.search(search_string) if searching?
-        update_table_data
+        search_text = search_controller.searchBar.text
+        if search_text.empty?
+          promotion_table_data.clear_filter
+        else
+          promotion_table_data.search(search_text)
+        end
+        table_view.reloadData
       end
 
       def searchBar(search_bar, selectedScopeButtonIndexDidChange: selected_scope_index)

data/lib/ProMotion/table/table.rb

@@ -92,15 +92,7 @@ module ProMotion
     end
 
     def searching?
-      self.promotion_table_data.filtered
-    end
-
-    def original_search_string
-      self.promotion_table_data.original_search_string
-    end
-
-    def search_string
-      self.promotion_table_data.search_string
+      self.promotion_table_data.filtered?
     end
 
     def update_table_view_data(data, args = {})
@@ -114,10 +106,6 @@ module ProMotion
       else
         table_view.reloadData
       end
-
-      if searching? && @table_search_display_controller.respond_to?(:searchResultsTableView)
-        @table_search_display_controller.searchResultsTableView.reloadData
-      end
     end
 
     def accessory_toggled_switch(switch)
@@ -193,7 +181,7 @@ module ProMotion
 
     # Set table_data_index if you want the right hand index column (jumplist)
     def sectionIndexTitlesForTableView(_)
-      return if self.promotion_table_data.filtered
+      return if searching?
       return self.table_data_index if self.respond_to?(:table_data_index)
       nil
     end

data/lib/ProMotion/version.rb

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

metadata

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