diff --git a/PullToRefreshSwift.podspec b/PullToRefreshSwift.podspec index 64df143..929580b 100644 --- a/PullToRefreshSwift.podspec +++ b/PullToRefreshSwift.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "PullToRefreshSwift" - s.version = "3.0.3" + s.version = "3.0.4" s.summary = "iOS Simple PullToRefresh Library." s.homepage = "https://github.com/dekatotoro/PullToRefreshSwift" s.license = { :type => "MIT", :file => "LICENSE" } diff --git a/Source/PullToRefreshView.swift b/Source/PullToRefreshView.swift index 28658f7..b825ec3 100755 --- a/Source/PullToRefreshView.swift +++ b/Source/PullToRefreshView.swift @@ -26,7 +26,7 @@ open class PullToRefreshView: UIView { fileprivate var arrow: UIImageView fileprivate var indicator: UIActivityIndicatorView fileprivate var scrollViewInsets: UIEdgeInsets = UIEdgeInsets.zero - fileprivate var refreshCompletion: ((Void) -> Void)? + fileprivate var refreshCompletion: (() -> Void)? fileprivate var pull: Bool = true fileprivate var positionY:CGFloat = 0 { @@ -78,7 +78,7 @@ open class PullToRefreshView: UIView { fatalError("init(coder:) has not been implemented") } - public init(options: PullToRefreshOption, frame: CGRect, refreshCompletion :((Void) -> Void)?, down:Bool=true) { + public init(options: PullToRefreshOption, frame: CGRect, refreshCompletion :(() -> Void)?, down:Bool=true) { self.options = options self.refreshCompletion = refreshCompletion @@ -262,7 +262,7 @@ open class PullToRefreshView: UIView { fileprivate func arrowRotation() { UIView.animate(withDuration: 0.2, delay: 0, options:[], animations: { // -0.0000001 for the rotation direction control - self.arrow.transform = CGAffineTransform(rotationAngle: CGFloat(M_PI-0.0000001)) + self.arrow.transform = CGAffineTransform(rotationAngle: CGFloat(Double.pi-0.0000001)) }, completion:nil) } diff --git a/Source/UIScrollViewExtension.swift b/Source/UIScrollViewExtension.swift index 249fe52..6c1641d 100755 --- a/Source/UIScrollViewExtension.swift +++ b/Source/UIScrollViewExtension.swift @@ -14,14 +14,14 @@ public extension UIScrollView { return pullToRefreshView as? PullToRefreshView } - public func addPullRefresh(options: PullToRefreshOption = PullToRefreshOption(), refreshCompletion :((Void) -> Void)?) { + public func addPullRefresh(options: PullToRefreshOption = PullToRefreshOption(), refreshCompletion :(() -> Void)?) { let refreshViewFrame = CGRect(x: 0, y: -PullToRefreshConst.height, width: self.frame.size.width, height: PullToRefreshConst.height) let refreshView = PullToRefreshView(options: options, frame: refreshViewFrame, refreshCompletion: refreshCompletion) refreshView.tag = PullToRefreshConst.pullTag addSubview(refreshView) } - public func addPushRefresh(options: PullToRefreshOption = PullToRefreshOption(), refreshCompletion :((Void) -> Void)?) { + public func addPushRefresh(options: PullToRefreshOption = PullToRefreshOption(), refreshCompletion :(() -> Void)?) { let refreshViewFrame = CGRect(x: 0, y: contentSize.height, width: self.frame.size.width, height: PullToRefreshConst.height) let refreshView = PullToRefreshView(options: options, frame: refreshViewFrame, refreshCompletion: refreshCompletion,down: false) refreshView.tag = PullToRefreshConst.pushTag