Skip to content
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.

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

Supported left & right directions for DismissSwipeDirection #182

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions Presentr/Presentr.swift
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ public enum DismissSwipeDirection {
case `default`
case bottom
case top
case left
case right
}

/// The action that should happen when the background is tapped.
Expand Down
53 changes: 36 additions & 17 deletions Presentr/PresentrController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -418,9 +418,13 @@ extension PresentrController {
presentedViewFrame = presentedViewController.view.frame
presentedViewCenter = presentedViewController.view.center

let directionDown = gesture.translation(in: presentedViewController.view).y > 0
if (shouldSwipeBottom && directionDown) || (shouldSwipeTop && !directionDown) {
if dismissOnSwipeDirection == .left || dismissOnSwipeDirection == .right {
latestShouldDismiss = conformingPresentedController?.presentrShouldDismiss?(keyboardShowing: keyboardIsShowing) ?? true
} else {
let directionDown = gesture.translation(in: presentedViewController.view).y > 0
if (shouldSwipeBottom && directionDown) || (shouldSwipeTop && !directionDown) {
latestShouldDismiss = conformingPresentedController?.presentrShouldDismiss?(keyboardShowing: keyboardIsShowing) ?? true
}
}
} else if gesture.state == .changed {
swipeGestureChanged(gesture: gesture)
Expand All @@ -433,24 +437,39 @@ extension PresentrController {

func swipeGestureChanged(gesture: UIPanGestureRecognizer) {
let amount = gesture.translation(in: presentedViewController.view)

if dismissOnSwipeDirection == .left || dismissOnSwipeDirection == .right {
if dismissOnSwipeDirection == .left && amount.x > 0 {
return
} else if dismissOnSwipeDirection == .right && amount.x < 0 {
return
}
let swipeLimit: CGFloat = dismissOnSwipeDirection == .left ? -50 : 50
presentedViewController.view.center = CGPoint(x: presentedViewCenter.x + amount.x, y: presentedViewCenter.y)
let dismiss = dismissOnSwipeDirection == .left ? (amount.x < swipeLimit) : (amount.x > swipeLimit)
if dismiss && latestShouldDismiss {
presentedViewIsBeingDissmissed = true
presentedViewController.dismiss(animated: dismissAnimated, completion: nil)
}
} else {
if shouldSwipeTop && amount.y > 0 {
return
} else if shouldSwipeBottom && amount.y < 0 {
return
}

if shouldSwipeTop && amount.y > 0 {
return
} else if shouldSwipeBottom && amount.y < 0 {
return
}

var swipeLimit: CGFloat = 100
if shouldSwipeTop {
swipeLimit = -swipeLimit
}
var swipeLimit: CGFloat = 100
if shouldSwipeTop {
swipeLimit = -swipeLimit
}

presentedViewController.view.center = CGPoint(x: presentedViewCenter.x, y: presentedViewCenter.y + amount.y)
presentedViewController.view.center = CGPoint(x: presentedViewCenter.x, y: presentedViewCenter.y + amount.y)

let dismiss = shouldSwipeTop ? (amount.y < swipeLimit) : ( amount.y > swipeLimit)
if dismiss && latestShouldDismiss {
presentedViewIsBeingDissmissed = true
presentedViewController.dismiss(animated: dismissAnimated, completion: nil)
let dismiss = shouldSwipeTop ? (amount.y < swipeLimit) : ( amount.y > swipeLimit)
if dismiss && latestShouldDismiss {
presentedViewIsBeingDissmissed = true
presentedViewController.dismiss(animated: dismissAnimated, completion: nil)
}
}
}

Expand Down