Merge branch 'feat/did_select_and_deselect_item_delegate'

pavankataria · Feb 24, 2019 · 010f691 · 010f691
2 parents 7057ed0 + 90f3175
commit 010f691
Show file tree

Hide file tree

Showing 15 changed files with 655 additions and 586 deletions.
diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -1,5 +1,5 @@
 PODS:
-  - SwiftDataTables (0.6.22)
+  - SwiftDataTables (0.6.31)
 
 DEPENDENCIES:
   - SwiftDataTables (from `../`)
@@ -9,7 +9,7 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  SwiftDataTables: a0f1aad8fe0a3677e549d8c264699b97d2e4d304
+  SwiftDataTables: bb53425fb44df8ab69f798d9b80648ee8641c36e
 
 PODFILE CHECKSUM: 117ac710a88fe801ecac2a925baa29b1107fef2e
 

diff --git a/Example/Pods/Local Podspecs/SwiftDataTables.podspec.json b/Example/Pods/Local Podspecs/SwiftDataTables.podspec.json
diff --git a/Example/Pods/Manifest.lock b/Example/Pods/Manifest.lock
diff --git a/Example/Pods/Pods.xcodeproj/project.pbxproj b/Example/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/Example/Pods/Target Support Files/SwiftDataTables/Info.plist b/Example/Pods/Target Support Files/SwiftDataTables/Info.plist
diff --git a/Example/SwiftDataTables.xcodeproj/project.pbxproj b/Example/SwiftDataTables.xcodeproj/project.pbxproj
@@ -47,7 +47,7 @@
 		607FACEB1AFB9204008FA782 /* Tests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Tests.swift; sourceTree = "<group>"; };
 		757EF188D22DBACA6CE9D49C /* Pods-SwiftDataTables_Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SwiftDataTables_Tests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-SwiftDataTables_Tests/Pods-SwiftDataTables_Tests.debug.xcconfig"; sourceTree = "<group>"; };
 		776C66EDD196D1AFE38BB82F /* Pods-SwiftDataTables_Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SwiftDataTables_Example.release.xcconfig"; path = "Pods/Target Support Files/Pods-SwiftDataTables_Example/Pods-SwiftDataTables_Example.release.xcconfig"; sourceTree = "<group>"; };
-		7C3CE24995B8413154598310 /* SwiftDataTables.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = SwiftDataTables.podspec; path = ../SwiftDataTables.podspec; sourceTree = "<group>"; };
+		7C3CE24995B8413154598310 /* SwiftDataTables.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = SwiftDataTables.podspec; path = ../SwiftDataTables.podspec; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
 		9F256AB137A0214B765522F8 /* Pods-SwiftDataTables_Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SwiftDataTables_Example.debug.xcconfig"; path = "Pods/Target Support Files/Pods-SwiftDataTables_Example/Pods-SwiftDataTables_Example.debug.xcconfig"; sourceTree = "<group>"; };
 		E1E2C421370D3CFB2097E599 /* Pods-SwiftDataTables_Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SwiftDataTables_Tests.release.xcconfig"; path = "Pods/Target Support Files/Pods-SwiftDataTables_Tests/Pods-SwiftDataTables_Tests.release.xcconfig"; sourceTree = "<group>"; };
 		E773E3A98AF8683E036CC9BC /* Pods_SwiftDataTables_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_SwiftDataTables_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -221,12 +221,12 @@
 					607FACCF1AFB9204008FA782 = {
 						CreatedOnToolsVersion = 6.3.1;
 						DevelopmentTeam = R85C7FUGTC;
-						LastSwiftMigration = 0900;
+						LastSwiftMigration = 1010;
 					};
 					607FACE41AFB9204008FA782 = {
 						CreatedOnToolsVersion = 6.3.1;
 						DevelopmentTeam = R85C7FUGTC;
-						LastSwiftMigration = 0900;
+						LastSwiftMigration = 1010;
 						TestTargetID = 607FACCF1AFB9204008FA782;
 					};
 				};
@@ -421,6 +421,7 @@
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -468,6 +469,7 @@
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 4.2;
 				VALIDATE_PRODUCT = YES;
 			};
 			name = Release;
@@ -488,8 +490,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "SwiftDataTables/SwiftDataTables_Example-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -509,8 +510,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "SwiftDataTables/SwiftDataTables_Example-Bridging-Header.h";
-				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;
@@ -533,8 +533,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -552,8 +551,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};

diff --git a/Example/SwiftDataTables/AppDelegate.swift b/Example/SwiftDataTables/AppDelegate.swift
@@ -14,12 +14,11 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     var window: UIWindow?
     var navigationController: UINavigationController?
 
-    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
         let window = UIWindow(frame: UIScreen.main.bounds)
         let instance = MenuViewController()
-        let navigationController = UINavigationController(rootViewController: instance)
-        self.navigationController = navigationController
-        window.rootViewController = navigationController
+        self.navigationController = UINavigationController(rootViewController: instance)
+        window.rootViewController = self.navigationController
         self.window = window
         window.makeKeyAndVisible()
         return true

diff --git a/Example/SwiftDataTables/DataTableWithDataSetViewController.swift b/Example/SwiftDataTables/DataTableWithDataSetViewController.swift
@@ -37,9 +37,14 @@ class DataTableWithDataSetViewController: UIViewController {
         self.dataTable.autoresizingMask = [.flexibleWidth, .flexibleHeight]
         self.dataTable.frame = self.view.frame
         self.view.addSubview(self.dataTable);
+        self.dataTable.delegate = self
+    }
+}
+extension DataTableWithDataSetViewController: SwiftDataTableDelegate {
+    func didSelectItem(_ dataTable: SwiftDataTable, indexPath: IndexPath) {
+        print("did select item at indexPath: \(indexPath)")
     }
 }
-
 extension DataTableWithDataSetViewController {
     func columnHeaders() -> [String] {
         return [

diff --git a/Example/SwiftDataTables/DataTableWithDataSourceViewController.swift b/Example/SwiftDataTables/DataTableWithDataSourceViewController.swift
@@ -24,6 +24,7 @@ class DataTableWithDataSourceViewController: UIViewController {
         self.view.backgroundColor = UIColor.white
 
         self.dataTable = SwiftDataTable(dataSource: self)
+        self.dataTable.delegate = self
         self.dataTable.autoresizingMask = [.flexibleWidth, .flexibleHeight]
         self.dataTable.frame = self.view.frame
         self.view.addSubview(self.dataTable);
@@ -76,3 +77,9 @@ extension DataTableWithDataSourceViewController: SwiftDataTableDataSource {
         return self.dataSource[index]
     }
 }
+
+extension DataTableWithDataSourceViewController: SwiftDataTableDelegate {
+    func didSelectItem(_ dataTable: SwiftDataTable, indexPath: IndexPath) {
+        print("did select item at indexPath: \(indexPath)")
+    }
+}
diff --git a/Example/SwiftDataTables/MenuTableViewController.swift b/Example/SwiftDataTables/MenuTableViewController.swift
@@ -87,7 +87,8 @@ class GenericDataTableViewController: UIViewController {
         self.dataTable.backgroundColor = UIColor(red: 235/255, green: 235/255, blue: 235/255, alpha: 1)
         self.dataTable.autoresizingMask = [.flexibleWidth, .flexibleHeight]
         self.dataTable.frame = self.view.frame
-        self.view.addSubview(self.dataTable);
+        self.view.addSubview(self.dataTable)
+        self.dataTable.delegate = self
     }
     func columnHeaders() -> [String] {
         return [
@@ -106,6 +107,12 @@ class GenericDataTableViewController: UIViewController {
         }
     }
 }
+
+extension GenericDataTableViewController: SwiftDataTableDelegate {
+    func didSelectItem(_ dataTable: SwiftDataTable, indexPath: IndexPath) {
+        print("did select item at indexPath: \(indexPath)")
+    }
+}
 //MARK: - Data source and delegate methods
 extension MenuViewController {
     override func numberOfSections(in tableView: UITableView) -> Int {

diff --git a/README.md b/README.md
@@ -113,6 +113,13 @@ An optional delegate for further customisation. Default values will be used retr
 ```Swift
 
 @objc public protocol SwiftDataTableDelegate: class {
+    /// This is fired when a row is selected.
+    ///
+    /// - Parameters:
+    ///   - dataTable: SwiftDataTable
+    ///   - indexPath: the index path of the row selected
+    @objc optional func didSelectItem(_ dataTable: SwiftDataTable, indexPath: IndexPath)
+
     /// Specify custom heights for specific rows. A row height of 0 is valid and will be used.
     @objc optional func dataTable(_ dataTable: SwiftDataTable, heightForRowAt index: Int) -> CGFloat
 

diff --git a/SwiftDataTables.podspec b/SwiftDataTables.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'SwiftDataTables'
-  s.version          = '0.6.31'
+  s.version          = '0.7.0'
   s.summary          = 'A Swift Data Table package that allows ordering, searching, and paging with extensible options.'
 
 # This description is used to generate tags and improve search results.
@@ -28,7 +28,7 @@ Pod::Spec.new do |s|
   # s.social_media_url = 'https://twitter.com/pavan_kataria'
 
   s.ios.deployment_target = '8.0'
-  s.pod_target_xcconfig = { 'SWIFT_VERSION' => '4.1' }
+  s.pod_target_xcconfig = { 'SWIFT_VERSION' => '4.2' }
 
   s.source_files = 'SwiftDataTables/**/*'
   # Classes/**/*'