Merge branch 'feature/minor-changes' into develop

Author: bcylin

.jazzy.yml

@@ -2,7 +2,7 @@ clean: true
 author: bcylin
 author_url: https://github.com/bcylin
 github_url: https://github.com/bcylin/QuickTableViewController
-github_file_prefix: https://github.com/bcylin/QuickTableViewController/blob/develop
+github_file_prefix: https://github.com/bcylin/QuickTableViewController/blob/v1.1.0
 xcodebuild_arguments: [-project, QuickTableViewController.xcodeproj, -scheme, QuickTableViewController-iOS]
 module: QuickTableViewController
 module_version: 1.1.0

.travis.yml

@@ -6,9 +6,9 @@ cache:
 before_install:
   - export LANG=en_US.UTF-8
   - xcrun instruments -s devices
-  - open -a /Applications/Xcode.app/Contents/Developer/Applications/Simulator.app
 install:
   - bundle install --without development --deployment --jobs=3 --retry=3
+  - bundle exec rake launch:simulators
   - bundle exec pod install
 before_script:
   - if [ -n "$DANGER_GITHUB_API_TOKEN" ]; then bundle exec danger; fi

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Change Log
 
+## v1.1.1
+
+#### Fixes
+
+* Fix the animated `OptionRow` deselection
+* Invoke `accessoryButtonAction` asynchronously to match the behaviour of row `action`
+
 ## v1.1.0
 
 #### Enhancements

Example-iOS/ViewControllers/ExampleViewController.swift

@@ -122,8 +122,8 @@ internal final class ExampleViewController: QuickTableViewController {
   private func showDebuggingText(_ text: String) {
     print(text)
     debugging.rows = [NavigationRow(text: text, detailText: .none)]
-    DispatchQueue.main.asyncAfter(deadline: .now() + 0.2) { [weak self] in
-      self?.tableView.reloadData()
+    if let section = tableContents.index(where: { $0 === debugging }) {
+      tableView.reloadSections([section], with: .none)
     }
   }
 

Makefile

@@ -20,8 +20,8 @@ bump:
 ifeq (,$(strip $(version)))
 	# Usage: make bump version=<number>
 else
-	ruby -pi -e "gsub(/\d+\.\d+\.\d+/i, \""$(version)"\")" QuickTableViewController.podspec
-	ruby -pi -e "gsub(/:\s\d+\.\d+\.\d+/i, \": "$(version)"\")" .jazzy.yml
+	ruby -pi -e "gsub(%r{\d+\.\d+\.\d+}, %{"$(version)"})" QuickTableViewController.podspec
+	ruby -pi -e "gsub(%r{\d+\.\d+\.\d+}, %{"$(version)"})" .jazzy.yml
 	xcrun agvtool new-marketing-version $(version)
 endif
 

QuickTableViewController.xcodeproj/project.pbxproj

@@ -1414,7 +1414,6 @@
 		B5334F271B8CC5BD00C64A6D /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -1479,7 +1478,6 @@
 		B5334F281B8CC5BD00C64A6D /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -1536,7 +1534,6 @@
 		B5334F2A1B8CC5BD00C64A6D /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
 				CLANG_ENABLE_MODULES = YES;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = "";
@@ -1556,7 +1553,6 @@
 		B5334F2B1B8CC5BD00C64A6D /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
 				CLANG_ENABLE_MODULES = YES;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = "";

Rakefile

@@ -1,5 +1,11 @@
 require "fileutils"
 
+ios_device = "iPhone X"
+ios_version = "12.1"
+tvos_device = "Apple TV"
+tvos_version = "12.1"
+
+
 def xcodebuild(params)
   return ":" unless params[:scheme]
   [
@@ -14,6 +20,15 @@ def xcodebuild(params)
 end
 
 
+namespace :launch do
+  desc "Launch iOS and tvOS simulators"
+  task :simulators do
+    sh %(xcrun instruments -w "#{ios_device} (#{ios_version}) [" || true)
+    sh %(xcrun instruments -w "#{tvos_device} (#{tvos_version}) [" || true)
+  end
+end
+
+
 namespace :build do
   desc "Build an iOS target with the specified scheme"
   task :ios, [:scheme] do |t, args|
@@ -46,7 +61,7 @@ namespace :test do
 
     sh xcodebuild(args.to_hash.merge({
       action: "-enableCodeCoverage YES clean test",
-      destination: %(-destination "name=iPhone 8,OS=latest"),
+      destination: %(-destination "name=#{ios_device},OS=#{ios_version}"),
       simulator: "iphonesimulator"
     }))
     exit $?.exitstatus if not $?.success?
@@ -58,7 +73,7 @@ namespace :test do
 
     sh xcodebuild(args.to_hash.merge({
       action: "-enableCodeCoverage YES clean test",
-      destination: %(-destination "name=Apple TV,OS=latest"),
+      destination: %(-destination "name=#{tvos_device},OS=#{tvos_version}"),
       simulator: "appletvsimulator"
     }))
     exit $?.exitstatus if not $?.success?

Source/QuickTableViewController.swift

@@ -133,7 +133,7 @@ open class QuickTableViewController: UIViewController, UITableViewDataSource, UI
       if changes.isEmpty {
         tableView.deselectRow(at: indexPath, animated: false)
       } else {
-        tableView.reloadData()
+        tableView.reloadRows(at: changes, with: .automatic)
       }
 
     case let (_, option as OptionRowCompatible):
@@ -169,7 +169,9 @@ open class QuickTableViewController: UIViewController, UITableViewDataSource, UI
   public func tableView(_ tableView: UITableView, accessoryButtonTappedForRowWith indexPath: IndexPath) {
     switch tableContents[indexPath.section].rows[indexPath.row] {
     case let row as NavigationRowCompatible:
-      row.accessoryButtonAction?(row)
+      DispatchQueue.main.async {
+        row.accessoryButtonAction?(row)
+      }
     default:
       break
     }