From 8e276f7fbc5e5dd8665c535539f6b625b3ed9b0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9ssica=20Mouta?= Date: Wed, 3 Oct 2018 17:40:42 -0300 Subject: [PATCH] Add void argument in refreshCompletion: ((Void) -> Void)? and turn var kvoContext private and static for resolve conflicts with xcode x. --- Source/PullToRefreshView.swift | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Source/PullToRefreshView.swift b/Source/PullToRefreshView.swift index 28658f7..0834327 100755 --- a/Source/PullToRefreshView.swift +++ b/Source/PullToRefreshView.swift @@ -19,7 +19,7 @@ open class PullToRefreshView: UIView { // MARK: Variables let contentOffsetKeyPath = "contentOffset" let contentSizeKeyPath = "contentSize" - var kvoContext = "PullToRefreshKVOContext" + private static var kvoContext = "PullToRefreshKVOContext" fileprivate var options: PullToRefreshOption fileprivate var backgroundView: UIView @@ -120,17 +120,17 @@ open class PullToRefreshView: UIView { guard let scrollView = superView as? UIScrollView else { return } - scrollView.addObserver(self, forKeyPath: contentOffsetKeyPath, options: .initial, context: &kvoContext) + scrollView.addObserver(self, forKeyPath: contentOffsetKeyPath, options: .initial, context: &PullToRefreshView.kvoContext) if !pull { - scrollView.addObserver(self, forKeyPath: contentSizeKeyPath, options: .initial, context: &kvoContext) + scrollView.addObserver(self, forKeyPath: contentSizeKeyPath, options: .initial, context: &PullToRefreshView.kvoContext) } } fileprivate func removeRegister() { if let scrollView = superview as? UIScrollView { - scrollView.removeObserver(self, forKeyPath: contentOffsetKeyPath, context: &kvoContext) + scrollView.removeObserver(self, forKeyPath: contentOffsetKeyPath, context: &PullToRefreshView.kvoContext) if !pull { - scrollView.removeObserver(self, forKeyPath: contentSizeKeyPath, context: &kvoContext) + scrollView.removeObserver(self, forKeyPath: contentSizeKeyPath, context: &PullToRefreshView.kvoContext) } } } @@ -150,7 +150,7 @@ open class PullToRefreshView: UIView { return } - if !(context == &kvoContext && keyPath == contentOffsetKeyPath) { + if !(context == &PullToRefreshView.kvoContext && keyPath == contentOffsetKeyPath) { super.observeValue(forKeyPath: keyPath, of: object, change: change, context: context) return } @@ -237,7 +237,7 @@ open class PullToRefreshView: UIView { self.state = .stop } } - self.refreshCompletion?() + self.refreshCompletion?(()) }) }