Skip to content

Adjustable dismissible velocity, and spelling corrections. #51

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 5 commits into from
Closed

Adjustable dismissible velocity, and spelling corrections. #51

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
77882c1
Fixing issue with `UIPageViewController` outermost parent.
benguild May 7, 2018
1893ffb
Adding adjustable dismissible velocity threshold.
benguild May 31, 2018
925d702
Fixing spelling mistake.
benguild May 31, 2018
d09352c
Removing velocity upper-limit.
benguild May 31, 2018
aa8d217
Swapping min/max.
benguild May 31, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 19 additions & 7 deletions Sources/PullToDismiss.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ open class PullToDismiss: NSObject {

public struct Defaults {
private init() {}
public static let dismissableHeightPercentage: CGFloat = 0.33
public static let dismissibleHeightPercentage: CGFloat = 0.33
public static let dismissibleVelocityThreshold: CGFloat = 0
}

open var backgroundEffect: BackgroundEffect? = ShadowEffect.default
Expand All @@ -29,9 +30,15 @@ open class PullToDismiss: NSObject {
proxy = ScrollViewDelegateProxy(delegates: delegates)
}
}
public var dismissableHeightPercentage: CGFloat = Defaults.dismissableHeightPercentage {

public var dismissibleHeightPercentage: CGFloat = Defaults.dismissibleHeightPercentage {
didSet {
dismissibleHeightPercentage = min(max(0.0, dismissibleHeightPercentage), 1.0)
}
}
public var dismissibleVelocityThreshold: CGFloat = Defaults.dismissibleVelocityThreshold {
didSet {
dismissableHeightPercentage = min(max(0.0, dismissableHeightPercentage), 1.0)
dismissibleVelocityThreshold = min(0, dismissibleVelocityThreshold)
}
}

Expand Down Expand Up @@ -181,16 +188,16 @@ open class PullToDismiss: NSObject {

let targetViewOriginY: CGFloat = targetViewController?.view.frame.origin.y ?? 0.0
let targetViewHeight: CGFloat = targetViewController?.view.frame.height ?? 0.0
let rate: CGFloat = (1.0 - (targetViewOriginY / (targetViewHeight * dismissableHeightPercentage)))
let rate: CGFloat = (1.0 - (targetViewOriginY / (targetViewHeight * dismissibleHeightPercentage)))

updateBackgroundView(rate: rate)
targetViewController?.view.updateEdgeShadow(edgeShadow, rate: rate)
}

fileprivate func finishDragging(withVelocity velocity: CGPoint) {
let originY = targetViewController?.view.frame.origin.y ?? 0.0
let dismissableHeight = (targetViewController?.view.frame.height ?? 0.0) * dismissableHeightPercentage
if originY > dismissableHeight || originY > 0 && velocity.y < 0 {
let dismissibleHeight = (targetViewController?.view.frame.height ?? 0.0) * dismissibleHeightPercentage
if originY > dismissibleHeight || originY > 0 && velocity.y < dismissibleVelocityThreshold {
deleteBackgroundView()
targetViewController?.view.detachEdgeShadow()
proxy = nil
Expand All @@ -215,9 +222,14 @@ open class PullToDismiss: NSObject {
private static func viewControllerFromScrollView(_ scrollView: UIScrollView) -> UIViewController? {
var responder: UIResponder? = scrollView
while let r = responder {
if let viewController = r as? UIViewController {
if var viewController = r as? UIViewController {
while let parent = viewController.parent {
viewController = parent
}

return viewController
}

responder = r.next
}
return nil
Expand Down