Merge branch 'release/1.1.0'

.swiftlint.yml

@@ -0,0 +1,25 @@
+excluded: # paths to ignore during linting. Takes precedence over `included`.
+  - External
+  - Examples
+opt_in_rules:
+  - empty_count
+  - explicit_init
+  - closure_spacing
+  - overridden_super_call
+  - redundant_nil_coalescing
+  - private_outlet
+  - nimble_operator
+  - attributes
+  - operator_usage_whitespace
+  - closure_end_indentation
+  - first_where
+  - number_separator
+  - prohibited_super_call
+  - fatal_error_message
+identifier_name:
+  excluded:
+    - x
+    - y
+    - id
+    - from
+    - to

.travis.yml

@@ -1,5 +1,7 @@
 language: objective-c
-osx_image: xcode8.1
-script: travis_retry sh build.sh
+osx_image: xcode8.3
+script:
+  - swiftlint
+  - travis_retry sh build.sh
 after_success:
   - bash <(curl -s https://codecov.io/bash)

CHANGELOG.md

@@ -0,0 +1,20 @@
+# Change Log
+All notable changes to this project will be documented in this file.
+
+---
+
+## [Unreleased]
+### Added
+- Support `TableViewManager` as `manager` property of `Item` and `Section`
+- Support `UIScrollViewDelegate` from `TableViewManager` via `scrollDelegate`
+
+### Changed
+- Move `UITableViewDataSource` and `UITableViewDelegate` implementations from `TableViewManager` to `TableViewKitDataSource` and `TableViewKitDelegate` which are now the properties: `dataSource` and `delegate`, respectively.
+- Method `Item.section(in:)` has been renamed to `Item.section`
+- Method `Item.indexPath(in:)` has been renamed to `Item.indexPath`
+- Method `Item.reload(in:with:)` has been renamed to `Item.reload(with:)`
+- Method `Item.select(in:animated:scrollPosition:)` has been renamed to `Item.select(animated:scrollPosition:)`
+- Method `Item.select(in:animated:scrollPosition:)` has been renamed to `Item.select(animated:scrollPosition:)`
+- Method `Item.deselect(in:animated:)` has been renamed to `Item.deselect(animated:)`
+- Method `Section.index(in:)` has been renamed to `Section.index`
+

Examples/SampleApp/SampleApp/ActionBar/ActionBar.swift

@@ -34,8 +34,8 @@ open class ActionBar: UIToolbar {
 
     fileprivate func setup() {
 
-        let previousButtonItem = UIBarButtonItem(barButtonSystemItem: UIBarButtonSystemItem.init(rawValue: 105)!, target: self, action: #selector(previousHandler))
-        let nextButtonItem = UIBarButtonItem(barButtonSystemItem: UIBarButtonSystemItem.init(rawValue: 106)!, target: self, action: #selector(nextHandler))
+        let previousButtonItem = UIBarButtonItem(barButtonSystemItem: UIBarButtonSystemItem(rawValue: 105)!, target: self, action: #selector(previousHandler))
+        let nextButtonItem = UIBarButtonItem(barButtonSystemItem: UIBarButtonSystemItem(rawValue: 106)!, target: self, action: #selector(nextHandler))
         let doneButton = UIBarButtonItem(barButtonSystemItem: .done, target: self, action: #selector(handleActionBarDone))
 
         let spacer = UIBarButtonItem(barButtonSystemItem: .fixedSpace, target: nil, action: nil)

Examples/SampleApp/SampleApp/ActionBar/ActionBarManager.swift

@@ -22,7 +22,7 @@ class ActionBarManager: ActionBarDelegate {
 
         func isFirstResponder(item: Item) -> Bool {
             if isResponder(item: item),
-                let indexPath = item.indexPath(in: manager),
+                let indexPath = item.indexPath,
                 manager.tableView.cellForRow(at: indexPath)?.isFirstResponder == true {
                 return true
             }
@@ -47,7 +47,7 @@ class ActionBarManager: ActionBarDelegate {
             item = array.prefix(upTo: index).reversed().first(where: isResponder)
         }
 
-        return item?.indexPath(in: manager)
+        return item?.indexPath
 
     }
 }

Examples/SampleApp/SampleApp/Example1.swift

@@ -42,17 +42,17 @@ class Example1: UIViewController, TableViewManagerCompatible {
             textFieldItem2.validation.add(rule: ExistRule())
 
             item.onSelection = { item in
-                item.deselect(in: self.vc.tableViewManager, animated: true)
+                item.deselect(animated: true)
                 self.vc.showPickerControl()
             }
             dateItem.accessoryType = .disclosureIndicator
             dateItem.onSelection = { item in
-                item.deselect(in: self.vc.tableViewManager, animated: true)
+                item.deselect(animated: true)
                 self.vc.showDatePickerControl()
             }
             selectionItem.accessoryType = .disclosureIndicator
             selectionItem.onSelection = { item in
-                item.deselect(in: self.vc.tableViewManager, animated: true)
+                item.deselect(animated: true)
                 self.vc.showPickerControl()
             }
             states[State.preParty] = [item, dateItem, selectionItem, textFieldItem, textFieldItem2]
@@ -82,7 +82,7 @@ class Example1: UIViewController, TableViewManagerCompatible {
                 } else {
                     let item = CustomItem(title: "Label  \(index)")
                     item.onSelection = { item in
-                        item.deselect(in: self.vc.tableViewManager, animated: true)
+                        item.deselect(animated: true)
                     }
                     return item
                 }
@@ -117,7 +117,7 @@ class Example1: UIViewController, TableViewManagerCompatible {
                     default:
                         self.transition(to: .all)
                     }
-                    item.deselect(in: self.vc.tableViewManager, animated: true)
+                    item.deselect(animated: true)
                 }
                 return item
             }

Examples/SampleApp/SampleApp/PickerControl.swift

@@ -145,9 +145,9 @@ open class PickerControl: NSObject {
                     }
                 }
 
-                if components.count != 0 {
+                if components.isEmpty {
                     self.components.append(components)
-                    self.selections = Array.init(repeating: nil, count: self.components.count)
+                    self.selections = Array(repeating: nil, count: self.components.count)
                 }
             } else {
                 let item = PickerItem(title: String(describing: value), value: value)
@@ -323,7 +323,7 @@ open class PickerControl: NSObject {
 
         if type == .single {
 
-            if items.count == 0 {
+            if items.isEmpty {
                 return
             }
 
@@ -332,7 +332,7 @@ open class PickerControl: NSObject {
             selection = item
         } else if type == .multiColumn {
 
-            if components.count == 0 {
+            if components.isEmpty {
                 return
             }
 

Examples/SampleApp/SampleApp/SelectionViewController.swift

@@ -125,13 +125,13 @@ public class SelectionViewController: UITableViewController {
             if let checkedItem = itemSelected() {
                 checkedItem.selected = false
                 checkedItem.accessoryType = .none
-                checkedItem.reload(in: tableViewManager, with: .fade)
+                checkedItem.reload(with: .fade)
             }
         }
 
         item.selected = !item.selected
         item.accessoryType = item.accessoryType == .checkmark ? .none : .checkmark
-        item.reload(in: tableViewManager, with: .fade)
+        item.reload(with: .fade)
 
         fillSelected()
     }

Examples/SampleApp/SampleApp/Validator/Validation.swift

@@ -44,10 +44,10 @@ open class Validation<Input> {
     public init<R: Validatable>(forInput: @escaping () -> Input, withIdentifier identifier: Any? = nil, rule: R) where R.Input == Input {
         self.forInput = forInput
         self.identifier = identifier
-        self.rules.append(AnyValidatable.init(base: rule))
+        self.rules.append(AnyValidatable(base: rule))
     }
 
     open func add<R: Validatable>(rule: R) where R.Input == Input {
-        self.rules.append(AnyValidatable.init(base: rule))
+        self.rules.append(AnyValidatable(base: rule))
     }
 }

Examples/SampleApp/SampleApp/Validator/Validator.swift

@@ -36,7 +36,7 @@ public struct ValidatorManager<Input> {
     internal var validations: [Validation<Input>] = []
 
     public mutating func add<R: Validatable>(_ getInput: @escaping () -> Input, withRule rule: R) where R.Input == Input {
-        validations.append(Validation.init(forInput: getInput, rule: rule))
+        validations.append(Validation(forInput: getInput, rule: rule))
     }
 
     public mutating func add(validation: Validation<Input>) {

Examples/SampleApp/SampleApp/ValidatorTests.swift

@@ -40,7 +40,7 @@ class ValidatorTests: XCTestCase {
         var validator = ValidatorManager<String?>()
         validator.add(validation: validation)
 
-        expect(validator.errors.count).to(equal(0))
+        expect(validator.errors.count) == 0
     }
 
     func testCharactersLengthRule() {
@@ -53,7 +53,7 @@ class ValidatorTests: XCTestCase {
         var validator = ValidatorManager<String?>()
         validator.add(validation: validation)
 
-        expect(validator.errors.count).to(equal(0))
+        expect(validator.errors.count) == 0
     }
 
     func testNumberBetweenRule() {
@@ -66,6 +66,6 @@ class ValidatorTests: XCTestCase {
         var validator = ValidatorManager<Int>()
         validator.add(validation: validation)
 
-        expect(validator.errors.count).to(equal(0))
+        expect(validator.errors.count) == 0
     }
 }

Examples/SampleApp/SampleApp/ViewController.swift

@@ -16,12 +16,12 @@ class ViewController: UIViewController, TableViewManagerCompatible {
             let mappedItems = array.map({ (className) -> Item in
                 let viewController = className.init(nibName: String(describing: className), bundle: nil)
 
-                let navigationController = UINavigationController.init(rootViewController: viewController)
+                let navigationController = UINavigationController(rootViewController: viewController)
 
                 let item = CustomItem(title: "Example 1")
                 item.onSelection = { _ in
                     self.vc.present(navigationController, animated: true, completion: {
-                        item.deselect(in: self.vc.tableViewManager, animated: false)
+                        item.deselect(animated: false)
                     })
                 }
                 return item

Examples/Viper/TableViewKit+VIPER/AboutModule/MoreAboutItem.swift

@@ -58,8 +58,6 @@ class MoreAboutItem: Item, Selectable, Editable {
             presenter?.showRateApp()
         }
 
-        if let manager = manager {
-            deselect(in: manager, animated: true)
-        }
+        deselect(animated: true)
     }
 }

README.md

@@ -12,7 +12,7 @@
 <a href="https://tldrlegal.com/license/mit-license"><img src="https://img.shields.io/badge/License-MIT-blue.svg?style=flat"></a>
 </p>
 
-Empowering `UITableView` with painless multi-type cell support and build-in automatic state transition animations
+Empowering `UITableView` with painless multi-type cell support and built-in automatic state transition animations
 
 ## Getting Started
 - [Download TableViewKit](https://github.com/odigeoteam/TableViewKit/releases) and play with our [examples](https://github.com/odigeoteam/TableViewKit/tree/develop/Examples)

TableViewKit.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
   s.name                    = "TableViewKit"
-  s.version                 = "1.0.0"
-  s.summary                 = "Empowering UITableView with painless multi-type cell support and build-in automatic state transition animations"
+  s.version                 = "1.1.0"
+  s.summary                 = "Empowering UITableView with painless multi-type cell support and built-in automatic state transition animations"
   s.homepage                = "http://github.com/odigeoteam/TableViewKit/"
   s.license                 = "MIT"
   s.author                  = "TableViewKit Contributors"

TableViewKit.xcodeproj/project.pbxproj

@@ -13,6 +13,8 @@
 		2564E61C1D88450F00A9DC3E /* TestRegisterHeaderFooterView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 2564E61B1D88450F00A9DC3E /* TestRegisterHeaderFooterView.xib */; };
 		25837C781D87F819001EF4B8 /* ItemCompatible.swift in Sources */ = {isa = PBXBuildFile; fileRef = 25837C771D87F819001EF4B8 /* ItemCompatible.swift */; };
 		25B0B7541DC74F6C00591467 /* Editable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 25B0B7531DC74F6C00591467 /* Editable.swift */; };
+		CC09F8891EA79178006FF4EA /* TableViewKitDataSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = CC09F8881EA79178006FF4EA /* TableViewKitDataSource.swift */; };
+		CC09F88B1EA791B7006FF4EA /* TableViewKitDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = CC09F88A1EA791B7006FF4EA /* TableViewKitDelegate.swift */; };
 		CC0DE2C81DE33B9C00E2EDE5 /* AnyEquatable.swift in Sources */ = {isa = PBXBuildFile; fileRef = CC0DE2C71DE33B9C00E2EDE5 /* AnyEquatable.swift */; };
 		CC5CF11C1D839E71004DECB3 /* ArrayDiff.swift in Sources */ = {isa = PBXBuildFile; fileRef = CC5CF11B1D839E71004DECB3 /* ArrayDiff.swift */; };
 		CC97D76D1D741DC4009CDF9D /* Selectable.swift in Sources */ = {isa = PBXBuildFile; fileRef = CC97D76C1D741DC4009CDF9D /* Selectable.swift */; };
@@ -55,6 +57,8 @@
 		25837C771D87F819001EF4B8 /* ItemCompatible.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ItemCompatible.swift; path = Protocols/ItemCompatible.swift; sourceTree = "<group>"; };
 		25B0B7531DC74F6C00591467 /* Editable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Editable.swift; path = Protocols/Editable.swift; sourceTree = "<group>"; };
 		4BCAD51C1D89A704002F3420 /* Nimble.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Nimble.framework; path = "External/Nimble/build/Debug-iphoneos/Nimble.framework"; sourceTree = "<group>"; };
+		CC09F8881EA79178006FF4EA /* TableViewKitDataSource.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TableViewKitDataSource.swift; sourceTree = "<group>"; };
+		CC09F88A1EA791B7006FF4EA /* TableViewKitDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TableViewKitDelegate.swift; sourceTree = "<group>"; };
 		CC0DE2C71DE33B9C00E2EDE5 /* AnyEquatable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = AnyEquatable.swift; path = Protocols/AnyEquatable.swift; sourceTree = "<group>"; };
 		CC5CF11B1D839E71004DECB3 /* ArrayDiff.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ArrayDiff.swift; sourceTree = "<group>"; };
 		CC97D76C1D741DC4009CDF9D /* Selectable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Selectable.swift; path = Protocols/Selectable.swift; sourceTree = "<group>"; };
@@ -155,6 +159,8 @@
 				CCCAC1271D7DA2CF0001FC1D /* Height.swift */,
 				CCEF387D1D8D59C000F5893F /* NibClassType.swift */,
 				CCBE458E1D72F79C00414A64 /* TableViewManager.swift */,
+				CC09F88A1EA791B7006FF4EA /* TableViewKitDelegate.swift */,
+				CC09F8881EA79178006FF4EA /* TableViewKitDataSource.swift */,
 				CCBE455F1D72F69500414A64 /* TableViewKit.h */,
 				CCBE45611D72F69500414A64 /* Info.plist */,
 				CC5CF11B1D839E71004DECB3 /* ArrayDiff.swift */,
@@ -205,6 +211,7 @@
 			buildConfigurationList = CCBE45701D72F69500414A64 /* Build configuration list for PBXNativeTarget "TableViewKit" */;
 			buildPhases = (
 				CCBE45571D72F69400414A64 /* Sources */,
+				CCC87B4A1ED9E7160008968D /* SwiftLint */,
 				CCBE45581D72F69400414A64 /* Frameworks */,
 				CCBE45591D72F69400414A64 /* Headers */,
 				CCBE455A1D72F69400414A64 /* Resources */,
@@ -293,12 +300,30 @@
 		};
 /* End PBXResourcesBuildPhase section */
 
+/* Begin PBXShellScriptBuildPhase section */
+		CCC87B4A1ED9E7160008968D /* SwiftLint */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = SwiftLint;
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "if which swiftlint >/dev/null; then\nswiftlint\nelse\necho \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi";
+		};
+/* End PBXShellScriptBuildPhase section */
+
 /* Begin PBXSourcesBuildPhase section */
 		CCBE45571D72F69400414A64 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 				CCBE45A01D72F79C00414A64 /* Section.swift in Sources */,
+				CC09F88B1EA791B7006FF4EA /* TableViewKitDelegate.swift in Sources */,
 				CC0DE2C81DE33B9C00E2EDE5 /* AnyEquatable.swift in Sources */,
 				CCFD05CC1D95BD3C0063A002 /* Stateful.swift in Sources */,
 				2519E1C91E013DF00021E06E /* UITableView+Moves.swift in Sources */,
@@ -313,6 +338,7 @@
 				CCDB8FAB1D83649B00E44A99 /* ObservableArray.swift in Sources */,
 				CCCAC1261D7D9EE00001FC1D /* HeaderFooter.swift in Sources */,
 				CCBE45A11D72F79C00414A64 /* TableViewManager.swift in Sources */,
+				CC09F8891EA79178006FF4EA /* TableViewKitDataSource.swift in Sources */,
 				CCBE45931D72F79C00414A64 /* UITableView+Register.swift in Sources */,
 				CCBE459D1D72F79C00414A64 /* CellDrawer.swift in Sources */,
 				CCBE459F1D72F79C00414A64 /* Item.swift in Sources */,