From 0fc9eedca40582f476c564758061d022f7931a00 Mon Sep 17 00:00:00 2001 From: Bala Sundari Date: Thu, 9 Jul 2020 16:25:23 +0530 Subject: [PATCH] Updated to Swift 5 and DidScroll delegate added Updated to Swift 5 and DidScroll delegate added --- .../Sources/SpreadsheetView+UIScrollViewDelegate.swift | 1 + Framework/Sources/SpreadsheetView+UIViewHierarchy.swift | 8 ++++---- Framework/Sources/SpreadsheetView.swift | 8 ++++---- Framework/Sources/SpreadsheetViewDelegate.swift | 2 ++ Framework/SpreadsheetView.xcodeproj/project.pbxproj | 5 +++-- 5 files changed, 14 insertions(+), 10 deletions(-) mode change 100644 => 100755 Framework/Sources/SpreadsheetView+UIScrollViewDelegate.swift mode change 100644 => 100755 Framework/Sources/SpreadsheetView.swift mode change 100644 => 100755 Framework/Sources/SpreadsheetViewDelegate.swift diff --git a/Framework/Sources/SpreadsheetView+UIScrollViewDelegate.swift b/Framework/Sources/SpreadsheetView+UIScrollViewDelegate.swift old mode 100644 new mode 100755 index b1d19d05..673d17db --- a/Framework/Sources/SpreadsheetView+UIScrollViewDelegate.swift +++ b/Framework/Sources/SpreadsheetView+UIScrollViewDelegate.swift @@ -40,6 +40,7 @@ extension SpreadsheetView: UIScrollViewDelegate { columnHeaderView.contentOffset.y = tableView.contentOffset.y setNeedsLayout() + delegate?.spreadsheetViewDidScroll(self) } public func scrollViewDidEndScrollingAnimation(_ scrollView: UIScrollView) { diff --git a/Framework/Sources/SpreadsheetView+UIViewHierarchy.swift b/Framework/Sources/SpreadsheetView+UIViewHierarchy.swift index 126cd925..77282d1b 100644 --- a/Framework/Sources/SpreadsheetView+UIViewHierarchy.swift +++ b/Framework/Sources/SpreadsheetView+UIViewHierarchy.swift @@ -29,11 +29,11 @@ extension SpreadsheetView { overlayView.insertSubview(view, aboveSubview: siblingSubview) } - public override func bringSubview(toFront view: UIView) { - overlayView.bringSubview(toFront: view) + open override func bringSubviewToFront(_ view: UIView) { + overlayView.bringSubviewToFront(view) } - public override func sendSubview(toBack view: UIView) { - overlayView.sendSubview(toBack: view) + open override func sendSubviewToBack(_ view: UIView) { + overlayView.sendSubviewToBack(view) } } diff --git a/Framework/Sources/SpreadsheetView.swift b/Framework/Sources/SpreadsheetView.swift old mode 100644 new mode 100755 index b072f40d..c3ed73bc --- a/Framework/Sources/SpreadsheetView.swift +++ b/Framework/Sources/SpreadsheetView.swift @@ -8,7 +8,7 @@ import UIKit -public class SpreadsheetView: UIView { +open class SpreadsheetView: UIView { /// The object that provides the data for the collection view. /// /// - Note: The data source must adopt the `SpreadsheetViewDataSource` protocol. @@ -274,7 +274,7 @@ public class SpreadsheetView: UIView { /// The style of the scroll indicators. /// - Note: The default style is `default`. See `UIScrollViewIndicatorStyle` for descriptions of these constants. - public var indicatorStyle: UIScrollViewIndicatorStyle { + public var indicatorStyle: UIScrollView.IndicatorStyle { get { return overlayView.indicatorStyle } @@ -287,10 +287,10 @@ public class SpreadsheetView: UIView { /// - Note: Your application can use the `UIScrollViewDecelerationRateNormal` and UIScrollViewDecelerationRateFast` constants as reference points for reasonable deceleration rates. public var decelerationRate: CGFloat { get { - return tableView.decelerationRate + return tableView.decelerationRate.rawValue } set { - tableView.decelerationRate = newValue + tableView.decelerationRate = UIScrollView.DecelerationRate(rawValue: newValue) } } diff --git a/Framework/Sources/SpreadsheetViewDelegate.swift b/Framework/Sources/SpreadsheetViewDelegate.swift old mode 100644 new mode 100755 index 48514389..9e051fcd --- a/Framework/Sources/SpreadsheetViewDelegate.swift +++ b/Framework/Sources/SpreadsheetViewDelegate.swift @@ -80,6 +80,7 @@ public protocol SpreadsheetViewDelegate: class { /// - spreadsheetView: The spreadsheet view object that is notifying you of the selection change. /// - indexPath: The index path of the cell that was deselected. func spreadsheetView(_ spreadsheetView: SpreadsheetView, didDeselectItemAt indexPath: IndexPath) + func spreadsheetViewDidScroll(_ spreadsheetView: SpreadsheetView) } extension SpreadsheetViewDelegate { @@ -90,4 +91,5 @@ extension SpreadsheetViewDelegate { public func spreadsheetView(_ spreadsheetView: SpreadsheetView, shouldDeselectItemAt indexPath: IndexPath) -> Bool { return true } public func spreadsheetView(_ spreadsheetView: SpreadsheetView, didSelectItemAt indexPath: IndexPath) {} public func spreadsheetView(_ spreadsheetView: SpreadsheetView, didDeselectItemAt indexPath: IndexPath) {} + public func spreadsheetViewDidScroll(_ spreadsheetView: SpreadsheetView) {} } diff --git a/Framework/SpreadsheetView.xcodeproj/project.pbxproj b/Framework/SpreadsheetView.xcodeproj/project.pbxproj index 892f35cb..05a82d33 100644 --- a/Framework/SpreadsheetView.xcodeproj/project.pbxproj +++ b/Framework/SpreadsheetView.xcodeproj/project.pbxproj @@ -382,6 +382,7 @@ developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( + English, en, Base, ); @@ -644,7 +645,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; SWIFT_SWIFT3_OBJC_INFERENCE = On; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; }; name = Debug; }; @@ -665,7 +666,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; SWIFT_SWIFT3_OBJC_INFERENCE = On; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; }; name = Release; };