TouchInstinct
/
TIPullToRefresh
311
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fileprivate на private

This commit is contained in:
Mikhail Konovalov 2018-01-11 12:40:23 +03:00
parent 59de97d267
commit 43b8834736
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Classes/RMRPullToRefresh.swift
View File

@ -10,7 +10,7 @@ import UIKit
open class RMRPullToRefresh: NSObject {
fileprivate var сontroller: RMRPullToRefreshController?
private var сontroller: RMRPullToRefreshController?
open var height : CGFloat = RMRPullToRefreshConstants.DefaultHeight {
didSet {

20
Classes/RMRPullToRefreshController.swift
View File

@ -62,13 +62,13 @@ open class RMRPullToRefreshController: NSObject {
self.subscribeOnScrollViewEvents()
}
fileprivate func configureBackgroundView(_ backgroundView: UIView) {
private func configureBackgroundView(_ backgroundView: UIView) {
backgroundView.translatesAutoresizingMaskIntoConstraints = false
scrollView?.addSubview(backgroundView)
addBackgroundViewConstraints(backgroundView)
}
fileprivate func addBackgroundViewConstraints(_ backgroundView: UIView) {
private func addBackgroundViewConstraints(_ backgroundView: UIView) {
// Constraints
self.backgroundViewHeightConstraint = NSLayoutConstraint(item: backgroundView, attribute: NSLayoutAttribute.height, relatedBy: NSLayoutRelation.equal, toItem: nil, attribute: NSLayoutAttribute.notAnAttribute, multiplier: 1, constant: 0)
backgroundView.addConstraint(self.backgroundViewHeightConstraint!)
@ -84,7 +84,7 @@ open class RMRPullToRefreshController: NSObject {
}
}
fileprivate func configureHeight() {
private func configureHeight() {
if let scrollView = self.scrollView {
self.originalTopInset = scrollView.contentInset.top
@ -208,23 +208,23 @@ open class RMRPullToRefreshController: NSObject {
containerView.startLoadingAnimation(startProgress)
}
@objc fileprivate func stopAllAnimations() {
@objc private func stopAllAnimations() {
if shouldHideWhenStopLoading() {
stopped = true
}
containerView.stopAllAnimations(shouldHideWhenStopLoading())
}
@objc fileprivate func forceStopAllAnimations() {
@objc private func forceStopAllAnimations() {
stopped = true
containerView.stopAllAnimations(true)
}
@objc fileprivate func resetBackgroundViewHeightConstraint() {
@objc private func resetBackgroundViewHeightConstraint() {
backgroundViewHeightConstraint?.constant = 0
}
fileprivate func scrollViewDidChangePanState(_ scrollView: UIScrollView, panState: UIGestureRecognizerState) {
private func scrollViewDidChangePanState(_ scrollView: UIScrollView, panState: UIGestureRecognizerState) {
if panState == .ended || panState == .cancelled || panState == .failed {
if state == .loading || (shouldHideWhenStopLoading() && !stopped) {
@ -255,7 +255,7 @@ open class RMRPullToRefreshController: NSObject {
}
}
fileprivate func scrollViewDidChangeContentSize(_ scrollView: UIScrollView, contentSize: CGSize) {
private func scrollViewDidChangeContentSize(_ scrollView: UIScrollView, contentSize: CGSize) {
updateContainerFrame()
if position == .bottom {
self.backgroundViewTopConstraint?.constant = max(scrollView.contentSize.height, scrollView.bounds.height)
@ -265,7 +265,7 @@ open class RMRPullToRefreshController: NSObject {
}
}
fileprivate func scrollViewDidScroll(_ scrollView: UIScrollView, contentOffset: CGPoint) {
private func scrollViewDidScroll(_ scrollView: UIScrollView, contentOffset: CGPoint) {
if state == .loading {
if scrollView.contentOffset.y >= 0 {
@ -297,7 +297,7 @@ open class RMRPullToRefreshController: NSObject {
}
}
fileprivate func configureBackgroundHeightConstraint(_ contentOffsetY: CGFloat, contentInset: UIEdgeInsets) {
private func configureBackgroundHeightConstraint(_ contentOffsetY: CGFloat, contentInset: UIEdgeInsets) {
var constant = CGFloat(-1.0)
if position == .top {
constant = contentOffsetY + contentInset.top