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

Merge branch 'master' into swift-4.2 

# Conflicts:
#	Classes/RMRPullToRefreshController.swift
#	Example/RMRPullToRefresh/Base.lproj/Main.storyboard
#	Example/RMRPullToRefresh/ViewController.swift
#	Example/RMRPullToRefreshExample.xcodeproj/project.pbxproj
#	RMRPullToRefresh.podspec
This commit is contained in:
Evgenii Elchev 2018-10-15 20:06:08 +07:00
parent 99d4e48ed1 e1ab80365e
commit 756991bc98
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Classes/RMRPullToRefreshController.swift
View File

@ -8,7 +8,7 @@
import UIKit
open class RMRPullToRefreshController: NSObject {
open class RMRPullToRefreshController {
// MARK: - Vars
@ -48,8 +48,7 @@ open class RMRPullToRefreshController: NSObject {
// MARK: - Init
init(scrollView: UIScrollView, position:RMRPullToRefreshPosition, actionHandler: @escaping () -> Void) {
super.init()
self.scrollView = scrollView
self.actionHandler = actionHandler
self.position = position
@ -157,9 +156,14 @@ open class RMRPullToRefreshController: NSObject {
}
}
self?.contentSizeWhenStartLoading = nil
self?.perform(#selector(self?.resetBackgroundViewHeightConstraint), with: nil, afterDelay: afterDelay)
DispatchQueue.main.asyncAfter(deadline: DispatchTime.now() + afterDelay) {
self?.resetBackgroundViewHeightConstraint()
}
}
DispatchQueue.main.asyncAfter(deadline: DispatchTime.now() + afterDelay) {
self?.stopAllAnimations()
}
self?.perform(#selector(self?.stopAllAnimations), with: nil, afterDelay: afterDelay)
})
}

2
Example/RMRPullToRefresh/Base.lproj/Main.storyboard
View File

@ -245,7 +245,7 @@
</tableViewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="2e9-Jk-9A8" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="269" y="324"/>
<point key="canvasLocation" x="143" y="323"/>
</scene>
<!--View Controller-->
<scene sceneID="tne-QT-ifu">

4
Example/RMRPullToRefreshExample.xcodeproj/project.pbxproj
View File

@ -372,8 +372,10 @@
baseConfigurationReference = 51A8D36C5CCC1E18D2666CD6 /* Pods-RMRPullToRefreshExample.debug.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
DEVELOPMENT_TEAM = GMD7EK7S94;
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
INFOPLIST_FILE = RMRPullToRefresh/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.redmadrobot.RMRPullToRefresh;
PRODUCT_NAME = RMRPullToRefreshExample;
@ -386,8 +388,10 @@
baseConfigurationReference = 9373B01A0C7A0314295D05D2 /* Pods-RMRPullToRefreshExample.release.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
DEVELOPMENT_TEAM = GMD7EK7S94;
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
INFOPLIST_FILE = RMRPullToRefresh/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.redmadrobot.RMRPullToRefresh;
PRODUCT_NAME = RMRPullToRefreshExample;