Compare commits
No commits in common. "master" and "1.2" have entirely different histories.
|
|
@ -1,7 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Workspace
|
||||
version = "1.0">
|
||||
<FileRef
|
||||
location = "self:">
|
||||
</FileRef>
|
||||
</Workspace>
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
// swift-tools-version:5.1
|
||||
// The swift-tools-version declares the minimum version of Swift required to build this package.
|
||||
|
||||
import PackageDescription
|
||||
|
||||
let package = Package(
|
||||
name: "PanModal",
|
||||
platforms: [.iOS(.v10)],
|
||||
products: [
|
||||
.library(
|
||||
name: "PanModal",
|
||||
targets: ["PanModal"]),
|
||||
],
|
||||
dependencies: [],
|
||||
targets: [
|
||||
.target(
|
||||
name: "PanModal",
|
||||
dependencies: [],
|
||||
path: "PanModal")
|
||||
],
|
||||
swiftLanguageVersions: [.version("5.0")]
|
||||
)
|
||||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
Pod::Spec.new do |s|
|
||||
s.name = 'PanModal'
|
||||
s.version = '1.3.1'
|
||||
s.version = '1.2'
|
||||
s.summary = 'PanModal is an elegant and highly customizable presentation API for constructing bottom sheet modals on iOS.'
|
||||
|
||||
# This description is used to generate tags and improve search results.
|
||||
|
|
@ -18,12 +18,12 @@ Pod::Spec.new do |s|
|
|||
# * Finally, don't worry about the indent, CocoaPods strips it!
|
||||
|
||||
s.description = 'PanModal is an elegant and highly customizable presentation API for constructing bottom sheet modals on iOS.'
|
||||
s.homepage = 'https://git.svc.touchin.ru/TouchInstinct/PanModal'
|
||||
s.homepage = 'https://github.com/slackhq/PanModal'
|
||||
s.license = { :type => 'MIT', :file => 'LICENSE' }
|
||||
s.author = { 'slack' => 'opensource@slack.com' }
|
||||
s.source = { :git => 'https://git.svc.touchin.ru/TouchInstinct/PanModal.git', :tag => s.version.to_s }
|
||||
s.source = { :git => 'https://github.com/slackhq/PanModal.git', :tag => s.version.to_s }
|
||||
s.social_media_url = 'https://twitter.com/slackhq'
|
||||
s.ios.deployment_target = '10.0'
|
||||
s.swift_version = '5.0'
|
||||
s.swift_version = '4.2'
|
||||
s.source_files = 'PanModal/**/*.{swift,h,m}'
|
||||
end
|
||||
|
|
|
|||
|
|
@ -5,7 +5,6 @@
|
|||
// Copyright © 2019 Tiny Speck, Inc. All rights reserved.
|
||||
//
|
||||
|
||||
#if os(iOS)
|
||||
import UIKit
|
||||
|
||||
/**
|
||||
|
|
@ -17,24 +16,19 @@ struct PanModalAnimator {
|
|||
Constant Animation Properties
|
||||
*/
|
||||
struct Constants {
|
||||
static let defaultTransitionDuration: TimeInterval = 0.5
|
||||
static let transitionDuration: TimeInterval = 0.5
|
||||
}
|
||||
|
||||
static func animate(_ animations: @escaping PanModalPresentable.AnimationBlockType,
|
||||
config: PanModalPresentable?,
|
||||
_ completion: PanModalPresentable.AnimationCompletionType? = nil) {
|
||||
|
||||
let transitionDuration = config?.transitionDuration ?? Constants.defaultTransitionDuration
|
||||
let springDamping = config?.springDamping ?? 1.0
|
||||
let animationOptions = config?.transitionAnimationOptions ?? []
|
||||
|
||||
UIView.animate(withDuration: transitionDuration,
|
||||
UIView.animate(withDuration: Constants.transitionDuration,
|
||||
delay: 0,
|
||||
usingSpringWithDamping: springDamping,
|
||||
usingSpringWithDamping: config?.springDamping ?? 1.0,
|
||||
initialSpringVelocity: 0,
|
||||
options: animationOptions,
|
||||
options: [.curveEaseInOut, .allowUserInteraction, .beginFromCurrentState],
|
||||
animations: animations,
|
||||
completion: completion)
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -5,7 +5,6 @@
|
|||
// Copyright © 2019 Tiny Speck, Inc. All rights reserved.
|
||||
//
|
||||
|
||||
#if os(iOS)
|
||||
import UIKit
|
||||
|
||||
/**
|
||||
|
|
@ -64,16 +63,11 @@ public class PanModalPresentationAnimator: NSObject {
|
|||
*/
|
||||
private func animatePresentation(transitionContext: UIViewControllerContextTransitioning) {
|
||||
|
||||
guard
|
||||
let toVC = transitionContext.viewController(forKey: .to),
|
||||
let fromVC = transitionContext.viewController(forKey: .from)
|
||||
guard let toVC = transitionContext.viewController(forKey: .to)
|
||||
else { return }
|
||||
|
||||
let presentable = panModalLayoutType(from: transitionContext)
|
||||
let presentable = toVC as? PanModalPresentable.LayoutType
|
||||
|
||||
// Calls viewWillAppear and viewWillDisappear
|
||||
fromVC.beginAppearanceTransition(false, animated: true)
|
||||
|
||||
// Presents the view in shortForm position, initially
|
||||
let yPos: CGFloat = presentable?.shortFormYPos ?? 0.0
|
||||
|
||||
|
|
@ -92,8 +86,6 @@ public class PanModalPresentationAnimator: NSObject {
|
|||
PanModalAnimator.animate({
|
||||
panView.frame.origin.y = yPos
|
||||
}, config: presentable) { [weak self] didComplete in
|
||||
// Calls viewDidAppear and viewDidDisappear
|
||||
fromVC.endAppearanceTransition()
|
||||
transitionContext.completeTransition(didComplete)
|
||||
self?.feedbackGenerator = nil
|
||||
}
|
||||
|
|
@ -104,39 +96,20 @@ public class PanModalPresentationAnimator: NSObject {
|
|||
*/
|
||||
private func animateDismissal(transitionContext: UIViewControllerContextTransitioning) {
|
||||
|
||||
guard
|
||||
let toVC = transitionContext.viewController(forKey: .to),
|
||||
let fromVC = transitionContext.viewController(forKey: .from)
|
||||
guard let fromVC = transitionContext.viewController(forKey: .from)
|
||||
else { return }
|
||||
|
||||
// Calls viewWillAppear and viewWillDisappear
|
||||
toVC.beginAppearanceTransition(true, animated: true)
|
||||
|
||||
let presentable = panModalLayoutType(from: transitionContext)
|
||||
let presentable = fromVC as? PanModalPresentable.LayoutType
|
||||
let panView: UIView = transitionContext.containerView.panContainerView ?? fromVC.view
|
||||
|
||||
PanModalAnimator.animate({
|
||||
panView.frame.origin.y = transitionContext.containerView.frame.height
|
||||
}, config: presentable) { didComplete in
|
||||
fromVC.view.removeFromSuperview()
|
||||
// Calls viewDidAppear and viewDidDisappear
|
||||
toVC.endAppearanceTransition()
|
||||
transitionContext.completeTransition(didComplete)
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
Extracts the PanModal from the transition context, if it exists
|
||||
*/
|
||||
private func panModalLayoutType(from context: UIViewControllerContextTransitioning) -> PanModalPresentable.LayoutType? {
|
||||
switch transitionStyle {
|
||||
case .presentation:
|
||||
return context.viewController(forKey: .to) as? PanModalPresentable.LayoutType
|
||||
case .dismissal:
|
||||
return context.viewController(forKey: .from) as? PanModalPresentable.LayoutType
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// MARK: - UIViewControllerAnimatedTransitioning Delegate
|
||||
|
|
@ -147,17 +120,11 @@ extension PanModalPresentationAnimator: UIViewControllerAnimatedTransitioning {
|
|||
Returns the transition duration
|
||||
*/
|
||||
public func transitionDuration(using transitionContext: UIViewControllerContextTransitioning?) -> TimeInterval {
|
||||
|
||||
guard
|
||||
let context = transitionContext,
|
||||
let presentable = panModalLayoutType(from: context)
|
||||
else { return PanModalAnimator.Constants.defaultTransitionDuration }
|
||||
|
||||
return presentable.transitionDuration
|
||||
return PanModalAnimator.Constants.transitionDuration
|
||||
}
|
||||
|
||||
/**
|
||||
Performs the appropriate animation based on the transition style
|
||||
Perfroms the appropriate animation based on the transition style
|
||||
*/
|
||||
public func animateTransition(using transitionContext: UIViewControllerContextTransitioning) {
|
||||
switch transitionStyle {
|
||||
|
|
@ -169,4 +136,3 @@ extension PanModalPresentationAnimator: UIViewControllerAnimatedTransitioning {
|
|||
}
|
||||
|
||||
}
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -5,7 +5,6 @@
|
|||
// Copyright © 2019 Tiny Speck, Inc. All rights reserved.
|
||||
//
|
||||
|
||||
#if os(iOS)
|
||||
import UIKit
|
||||
|
||||
/**
|
||||
|
|
@ -23,14 +22,13 @@ import UIKit
|
|||
By conforming to the PanModalPresentable protocol & overriding values
|
||||
the presented view can define its layout configuration & presentation.
|
||||
*/
|
||||
open class PanModalPresentationController: UIPresentationController {
|
||||
public class PanModalPresentationController: UIPresentationController {
|
||||
|
||||
/**
|
||||
Enum representing the possible presentation states
|
||||
*/
|
||||
public enum PresentationState {
|
||||
case shortForm
|
||||
case mediumForm
|
||||
case longForm
|
||||
}
|
||||
|
||||
|
|
@ -80,17 +78,11 @@ open class PanModalPresentationController: UIPresentationController {
|
|||
*/
|
||||
private var shortFormYPosition: CGFloat = 0
|
||||
|
||||
private var mediumFormYPosition: CGFloat = 0
|
||||
|
||||
/**
|
||||
The y value for the long form presentation state
|
||||
*/
|
||||
private var longFormYPosition: CGFloat = 0
|
||||
|
||||
private var allowsDragToDismiss: Bool {
|
||||
presentable?.onDragToDismiss != nil
|
||||
}
|
||||
|
||||
/**
|
||||
Determine anchored Y postion based on the `anchorModalToLongForm` flag
|
||||
*/
|
||||
|
|
@ -112,14 +104,14 @@ open class PanModalPresentationController: UIPresentationController {
|
|||
Background view used as an overlay over the presenting view
|
||||
*/
|
||||
private lazy var backgroundView: DimmedView = {
|
||||
let view: DimmedView = presentable?.dimmedView ?? DimmedView()
|
||||
if let color = presentable?.panModalBackgroundColor {
|
||||
view.backgroundColor = color
|
||||
let view: DimmedView
|
||||
if let alpha = presentable?.backgroundAlpha {
|
||||
view = DimmedView(dimAlpha: alpha)
|
||||
} else {
|
||||
view = DimmedView()
|
||||
}
|
||||
view.didTap = { [weak self] _ in
|
||||
if self?.presentable?.allowsTapToDismiss == true {
|
||||
self?.presentable?.onTapToDismiss?()
|
||||
}
|
||||
self?.dismissPresentedViewController()
|
||||
}
|
||||
return view
|
||||
}()
|
||||
|
|
@ -139,7 +131,7 @@ open class PanModalPresentationController: UIPresentationController {
|
|||
*/
|
||||
private lazy var dragIndicatorView: UIView = {
|
||||
let view = UIView()
|
||||
view.backgroundColor = presentable?.dragIndicatorBackgroundColor
|
||||
view.backgroundColor = .lightGray
|
||||
view.layer.cornerRadius = Constants.dragIndicatorSize.height / 2.0
|
||||
return view
|
||||
}()
|
||||
|
|
@ -192,63 +184,35 @@ open class PanModalPresentationController: UIPresentationController {
|
|||
}
|
||||
|
||||
coordinator.animate(alongsideTransition: { [weak self] _ in
|
||||
if let yPos = self?.shortFormYPosition {
|
||||
self?.adjust(toYPosition: yPos)
|
||||
}
|
||||
self?.backgroundView.dimState = .max
|
||||
self?.presentedViewController.setNeedsStatusBarAppearanceUpdate()
|
||||
})
|
||||
}
|
||||
|
||||
override public func dismissalTransitionWillBegin() {
|
||||
|
||||
guard let coordinator = presentedViewController.transitionCoordinator else {
|
||||
backgroundView.dimState = .off
|
||||
return
|
||||
}
|
||||
|
||||
/**
|
||||
Drag indicator is drawn outside of view bounds
|
||||
so hiding it on view dismiss means avoids visual bugs
|
||||
*/
|
||||
coordinator.animate(alongsideTransition: { [weak self] _ in
|
||||
self?.dragIndicatorView.alpha = 0.0
|
||||
self?.backgroundView.dimState = .off
|
||||
self?.presentingViewController.setNeedsStatusBarAppearanceUpdate()
|
||||
})
|
||||
}
|
||||
|
||||
override public func presentationTransitionDidEnd(_ completed: Bool) {
|
||||
if completed { return }
|
||||
|
||||
backgroundView.removeFromSuperview()
|
||||
}
|
||||
|
||||
override public func dismissalTransitionWillBegin() {
|
||||
presentable?.panModalWillDismiss()
|
||||
|
||||
guard let coordinator = presentedViewController.transitionCoordinator else {
|
||||
backgroundView.dimState = .off
|
||||
return
|
||||
}
|
||||
|
||||
/**
|
||||
Drag indicator is drawn outside of view bounds
|
||||
so hiding it on view dismiss means avoiding visual bugs
|
||||
*/
|
||||
coordinator.animate(alongsideTransition: { [weak self] _ in
|
||||
self?.dragIndicatorView.alpha = 0.0
|
||||
self?.backgroundView.dimState = .off
|
||||
self?.presentingViewController.setNeedsStatusBarAppearanceUpdate()
|
||||
})
|
||||
}
|
||||
|
||||
override public func dismissalTransitionDidEnd(_ completed: Bool) {
|
||||
if !completed { return }
|
||||
|
||||
presentable?.panModalDidDismiss()
|
||||
}
|
||||
|
||||
/**
|
||||
Update presented view size in response to size class changes
|
||||
*/
|
||||
override public func viewWillTransition(to size: CGSize, with coordinator: UIViewControllerTransitionCoordinator) {
|
||||
super.viewWillTransition(to: size, with: coordinator)
|
||||
|
||||
coordinator.animate(alongsideTransition: { [weak self] _ in
|
||||
guard
|
||||
let self = self,
|
||||
let presentable = self.presentable
|
||||
else { return }
|
||||
|
||||
self.adjustPresentedViewFrame()
|
||||
if presentable.shouldRoundTopCorners {
|
||||
self.addRoundedCorners(to: self.presentedView)
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// MARK: - Public Methods
|
||||
|
|
@ -256,10 +220,10 @@ open class PanModalPresentationController: UIPresentationController {
|
|||
public extension PanModalPresentationController {
|
||||
|
||||
/**
|
||||
Transition the PanModalPresentationController
|
||||
Tranisition the PanModalPresentationController
|
||||
to the given presentation state
|
||||
*/
|
||||
func transition(to state: PresentationState) {
|
||||
public func transition(to state: PresentationState) {
|
||||
|
||||
guard presentable?.shouldTransition(to: state) == true
|
||||
else { return }
|
||||
|
|
@ -269,48 +233,52 @@ public extension PanModalPresentationController {
|
|||
switch state {
|
||||
case .shortForm:
|
||||
snap(toYPosition: shortFormYPosition)
|
||||
|
||||
case .mediumForm:
|
||||
snap(toYPosition: mediumFormYPosition)
|
||||
|
||||
case .longForm:
|
||||
snap(toYPosition: longFormYPosition)
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
Operations on the scroll view, such as content height changes,
|
||||
or when inserting/deleting rows can cause the pan modal to jump,
|
||||
caused by the pan modal responding to content offset changes.
|
||||
Set the content offset of the scroll view
|
||||
|
||||
To avoid this, you can call this method to perform scroll view updates,
|
||||
with scroll observation temporarily disabled.
|
||||
Due to content offset observation, its not possible to programmatically
|
||||
set the content offset directly on the scroll view while in the short form.
|
||||
|
||||
This method pauses the content offset KVO, performs the content offset chnage
|
||||
and then resumes content offset observation.
|
||||
*/
|
||||
func performUpdates(_ updates: () -> Void) {
|
||||
public func setContentOffset(offset: CGPoint) {
|
||||
|
||||
guard let scrollView = presentable?.panScrollable
|
||||
else { return }
|
||||
|
||||
// Pause scroll observer
|
||||
/**
|
||||
Invalidate scroll view observer
|
||||
to prevent its overriding the content offset change
|
||||
*/
|
||||
scrollObserver?.invalidate()
|
||||
scrollObserver = nil
|
||||
|
||||
// Perform updates
|
||||
updates()
|
||||
|
||||
// Resume scroll observer
|
||||
/**
|
||||
Set scroll view offset & track scrolling
|
||||
*/
|
||||
scrollView.setContentOffset(offset, animated:false)
|
||||
trackScrolling(scrollView)
|
||||
|
||||
/**
|
||||
Add the scroll view observer
|
||||
*/
|
||||
observe(scrollView: scrollView)
|
||||
}
|
||||
|
||||
/**
|
||||
Updates the PanModalPresentationController layout
|
||||
based on values in the PanModalPresentable
|
||||
based on values in the PanModalPresentabls
|
||||
|
||||
- Note: This should be called whenever any
|
||||
pan modal presentable value changes after the initial presentation
|
||||
*/
|
||||
func setNeedsLayoutUpdate() {
|
||||
public func setNeedsLayoutUpdate() {
|
||||
configureViewLayout()
|
||||
adjustPresentedViewFrame()
|
||||
observe(scrollView: presentable?.panScrollable)
|
||||
|
|
@ -329,7 +297,7 @@ private extension PanModalPresentationController {
|
|||
var isPresentedViewAnchored: Bool {
|
||||
if !isPresentedViewAnimating
|
||||
&& extendsPanScrolling
|
||||
&& presentedView.frame.minY.rounded() <= anchoredYPosition.rounded() {
|
||||
&& presentedView.frame.minY <= anchoredYPosition {
|
||||
return true
|
||||
}
|
||||
|
||||
|
|
@ -374,24 +342,9 @@ private extension PanModalPresentationController {
|
|||
Reduce height of presentedView so that it sits at the bottom of the screen
|
||||
*/
|
||||
func adjustPresentedViewFrame() {
|
||||
|
||||
guard let frame = containerView?.frame
|
||||
else { return }
|
||||
|
||||
let adjustedSize = CGSize(width: frame.size.width, height: frame.size.height - anchoredYPosition)
|
||||
let panFrame = panContainerView.frame
|
||||
panContainerView.frame.size = frame.size
|
||||
|
||||
let positions = [shortFormYPosition, mediumFormYPosition, longFormYPosition]
|
||||
|
||||
if !positions.contains(panFrame.origin.y) {
|
||||
// if the container is already in the correct position, no need to adjust positioning
|
||||
// (rotations & size changes cause positioning to be out of sync)
|
||||
let yPosition = panFrame.origin.y - panFrame.height + frame.height
|
||||
presentedView.frame.origin.y = max(yPosition, anchoredYPosition)
|
||||
}
|
||||
panContainerView.frame.origin.x = frame.origin.x
|
||||
presentedViewController.view.frame = CGRect(origin: .zero, size: adjustedSize)
|
||||
let frame = containerView?.frame ?? .zero
|
||||
let size = CGSize(width: frame.size.width, height: frame.height - anchoredYPosition)
|
||||
presentedViewController.view.frame = CGRect(origin: .zero, size: size)
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -431,7 +384,7 @@ private extension PanModalPresentationController {
|
|||
}
|
||||
|
||||
/**
|
||||
Calculates & stores the layout anchor points & options
|
||||
Caluclates & stores the layout anchor points & options
|
||||
*/
|
||||
func configureViewLayout() {
|
||||
|
||||
|
|
@ -439,7 +392,6 @@ private extension PanModalPresentationController {
|
|||
else { return }
|
||||
|
||||
shortFormYPosition = layoutPresentable.shortFormYPos
|
||||
mediumFormYPosition = layoutPresentable.mediumFormYPos
|
||||
longFormYPosition = layoutPresentable.longFormYPos
|
||||
anchorModalToLongForm = layoutPresentable.anchorModalToLongForm
|
||||
extendsPanScrolling = layoutPresentable.allowsExtendedPanScrolling
|
||||
|
|
@ -468,15 +420,7 @@ private extension PanModalPresentationController {
|
|||
Set the appropriate contentInset as the configuration within this class
|
||||
offsets it
|
||||
*/
|
||||
let bottomInset: CGFloat
|
||||
|
||||
if #available(iOS 11.0, *) {
|
||||
bottomInset = presentingViewController.view.safeAreaInsets.bottom
|
||||
} else {
|
||||
bottomInset = presentingViewController.bottomLayoutGuide.length
|
||||
}
|
||||
|
||||
scrollView.contentInset.bottom = bottomInset
|
||||
scrollView.contentInset.bottom = presentingViewController.bottomLayoutGuide.length
|
||||
|
||||
/**
|
||||
As we adjust the bounds during `handleScrollViewTopBounce`
|
||||
|
|
@ -499,7 +443,7 @@ private extension PanModalPresentationController {
|
|||
@objc func didPanOnPresentedView(_ recognizer: UIPanGestureRecognizer) {
|
||||
|
||||
guard
|
||||
shouldRespond(to: recognizer),
|
||||
shouldRespond(to: panGestureRecognizer),
|
||||
let containerView = containerView
|
||||
else {
|
||||
recognizer.setTranslation(.zero, in: recognizer.view)
|
||||
|
|
@ -540,18 +484,12 @@ private extension PanModalPresentationController {
|
|||
if velocity.y < 0 {
|
||||
transition(to: .longForm)
|
||||
|
||||
} else if nearest(to: presentedView.frame.minY,
|
||||
inValues: [mediumFormYPosition, containerView.bounds.height]) == mediumFormYPosition
|
||||
&& presentedView.frame.minY < mediumFormYPosition {
|
||||
transition(to: .mediumForm)
|
||||
|
||||
} else if (nearest(to: presentedView.frame.minY,
|
||||
inValues: [longFormYPosition, containerView.bounds.height]) == longFormYPosition
|
||||
&& presentedView.frame.minY < shortFormYPosition) || allowsDragToDismiss == false {
|
||||
} else if (nearestDistance(to: presentedView.frame.minY, inDistances: [longFormYPosition, containerView.bounds.height]) == longFormYPosition
|
||||
&& presentedView.frame.minY < shortFormYPosition) || presentable?.allowsDragToDismiss == false {
|
||||
transition(to: .shortForm)
|
||||
|
||||
} else {
|
||||
presentable?.onDragToDismiss?()
|
||||
dismissPresentedViewController()
|
||||
}
|
||||
|
||||
} else {
|
||||
|
|
@ -560,23 +498,16 @@ private extension PanModalPresentationController {
|
|||
The `containerView.bounds.height` is used to determine
|
||||
how close the presented view is to the bottom of the screen
|
||||
*/
|
||||
let position = nearest(to: presentedView.frame.minY,
|
||||
inValues: [containerView.bounds.height,
|
||||
shortFormYPosition,
|
||||
mediumFormYPosition,
|
||||
longFormYPosition])
|
||||
let position = nearestDistance(to: presentedView.frame.minY, inDistances: [containerView.bounds.height, shortFormYPosition, longFormYPosition])
|
||||
|
||||
if position == longFormYPosition {
|
||||
transition(to: .longForm)
|
||||
|
||||
} else if position == mediumFormYPosition {
|
||||
transition(to: .mediumForm)
|
||||
|
||||
} else if position == shortFormYPosition || allowsDragToDismiss == false {
|
||||
} else if position == shortFormYPosition || presentable?.allowsDragToDismiss == false {
|
||||
transition(to: .shortForm)
|
||||
|
||||
} else {
|
||||
presentable?.onDragToDismiss?()
|
||||
dismissPresentedViewController()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -688,23 +619,40 @@ private extension PanModalPresentationController {
|
|||
*/
|
||||
func adjust(toYPosition yPos: CGFloat) {
|
||||
presentedView.frame.origin.y = max(yPos, anchoredYPosition)
|
||||
|
||||
guard presentedView.frame.origin.y > shortFormYPosition else {
|
||||
backgroundView.dimState = .max
|
||||
return
|
||||
}
|
||||
|
||||
let maxHeight = UIScreen.main.bounds.height - longFormYPosition
|
||||
let yDisplacementFromShortForm = presentedView.frame.origin.y - shortFormYPosition
|
||||
|
||||
backgroundView.dimState = .percent(1.0 - presentedView.frame.origin.y / maxHeight)
|
||||
/**
|
||||
Once presentedView is translated below shortForm, calculate yPos relative to bottom of screen
|
||||
and apply percentage to backgroundView alpha
|
||||
*/
|
||||
backgroundView.dimState = .percent(1.0 - (yDisplacementFromShortForm / presentedView.frame.height))
|
||||
}
|
||||
|
||||
/**
|
||||
Finds the nearest value to a given number out of a given array of float values
|
||||
Finds the nearest distance to a given position out of a given array of distance values
|
||||
|
||||
- Parameters:
|
||||
- number: reference float we are trying to find the closest value to
|
||||
- values: array of floats we would like to compare against
|
||||
- position: reference postion we are trying to find the closest distance to
|
||||
- distances: array of positions we would like to compare against
|
||||
*/
|
||||
func nearest(to number: CGFloat, inValues values: [CGFloat]) -> CGFloat {
|
||||
guard let nearestVal = values.min(by: { abs(number - $0) < abs(number - $1) })
|
||||
else { return number }
|
||||
return nearestVal
|
||||
func nearestDistance(to position: CGFloat, inDistances distances: [CGFloat]) -> CGFloat {
|
||||
guard let nearestDistance = distances.min(by: { abs(position - $0) < abs(position - $1) })
|
||||
else { return position }
|
||||
return nearestDistance
|
||||
}
|
||||
|
||||
/**
|
||||
Dismiss presented view
|
||||
*/
|
||||
func dismissPresentedViewController() {
|
||||
presentable?.panModalWillDismiss()
|
||||
presentedViewController.dismiss(animated: true, completion: nil)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -810,7 +758,7 @@ private extension PanModalPresentationController {
|
|||
*/
|
||||
func handleScrollViewTopBounce(scrollView: UIScrollView, change: NSKeyValueObservedChange<CGPoint>) {
|
||||
|
||||
guard let oldYValue = change.oldValue?.y, scrollView.isDecelerating
|
||||
guard let oldYValue = change.oldValue?.y
|
||||
else { return }
|
||||
|
||||
let yOffset = scrollView.contentOffset.y
|
||||
|
|
@ -850,11 +798,11 @@ extension PanModalPresentationController: UIGestureRecognizerDelegate {
|
|||
}
|
||||
|
||||
/**
|
||||
Allow simultaneous gesture recognizers only when the other gesture recognizer's view
|
||||
is the pan scrollable view
|
||||
Allow simultaneous gesture recognizers only when the other gesture recognizer
|
||||
is a pan gesture recognizer
|
||||
*/
|
||||
public func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldRecognizeSimultaneouslyWith otherGestureRecognizer: UIGestureRecognizer) -> Bool {
|
||||
return otherGestureRecognizer.view == presentable?.panScrollable
|
||||
return otherGestureRecognizer.isKind(of: UIPanGestureRecognizer.self)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -915,4 +863,3 @@ private extension UIScrollView {
|
|||
return isDragging && !isDecelerating || isTracking
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -5,7 +5,6 @@
|
|||
// Copyright © 2019 Tiny Speck, Inc. All rights reserved.
|
||||
//
|
||||
|
||||
#if os(iOS)
|
||||
import UIKit
|
||||
|
||||
/**
|
||||
|
|
@ -74,8 +73,8 @@ extension PanModalPresentationDelegate: UIAdaptivePresentationControllerDelegate
|
|||
Dismisses the presented view controller
|
||||
*/
|
||||
public func adaptivePresentationStyle(for controller: UIPresentationController, traitCollection: UITraitCollection) -> UIModalPresentationStyle {
|
||||
controller.presentedViewController.dismiss(animated: false, completion: nil)
|
||||
return .none
|
||||
}
|
||||
|
||||
}
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -1,66 +0,0 @@
|
|||
//
|
||||
// Copyright (c) 2022 Touch Instinct
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
// of this software and associated documentation files (the Software), to deal
|
||||
// in the Software without restriction, including without limitation the rights
|
||||
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
// copies of the Software, and to permit persons to whom the Software is
|
||||
// furnished to do so, subject to the following conditions:
|
||||
//
|
||||
// The above copyright notice and this permission notice shall be included in
|
||||
// all copies or substantial portions of the Software.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
// THE SOFTWARE.
|
||||
//
|
||||
|
||||
import Foundation
|
||||
|
||||
public struct ModalViewPresentationDetent: Hashable {
|
||||
|
||||
// MARK: - Default Values
|
||||
|
||||
public static var headerOnly: ModalViewPresentationDetent {
|
||||
ModalViewPresentationDetent(height: CGFloat(Int.min))
|
||||
}
|
||||
|
||||
public static func height(_ height: CGFloat) -> ModalViewPresentationDetent {
|
||||
ModalViewPresentationDetent(height: height)
|
||||
}
|
||||
|
||||
public static var maxHeight: ModalViewPresentationDetent {
|
||||
ModalViewPresentationDetent(height: CGFloat(Int.max))
|
||||
}
|
||||
|
||||
// MARK: - Public Properties
|
||||
|
||||
public var height: CGFloat
|
||||
|
||||
// MARK: - Internal Methods
|
||||
|
||||
func panModalHeight(headerHeight: CGFloat = .zero) -> PanModalHeight {
|
||||
if self == .headerOnly {
|
||||
return .contentHeight(headerHeight)
|
||||
}
|
||||
|
||||
if self == .maxHeight {
|
||||
return .maxHeight
|
||||
}
|
||||
|
||||
return .contentHeight(height)
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Comparable
|
||||
|
||||
extension ModalViewPresentationDetent: Comparable {
|
||||
public static func < (lhs: ModalViewPresentationDetent, rhs: ModalViewPresentationDetent) -> Bool {
|
||||
lhs.height < rhs.height
|
||||
}
|
||||
}
|
||||
|
|
@ -5,7 +5,6 @@
|
|||
// Copyright © 2019 Tiny Speck, Inc. All rights reserved.
|
||||
//
|
||||
|
||||
#if os(iOS)
|
||||
import UIKit
|
||||
|
||||
/**
|
||||
|
|
@ -41,4 +40,3 @@ public enum PanModalHeight: Equatable {
|
|||
*/
|
||||
case intrinsicHeight
|
||||
}
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -5,7 +5,6 @@
|
|||
// Copyright © 2018 Tiny Speck, Inc. All rights reserved.
|
||||
//
|
||||
|
||||
#if os(iOS)
|
||||
import UIKit
|
||||
|
||||
/**
|
||||
|
|
@ -13,30 +12,14 @@ import UIKit
|
|||
*/
|
||||
public extension PanModalPresentable where Self: UIViewController {
|
||||
|
||||
var onTapToDismiss: (() -> Void)? {
|
||||
{ [weak self] in
|
||||
self?.dismiss(animated: true)
|
||||
}
|
||||
}
|
||||
|
||||
var onDragToDismiss: (() -> Void)? {
|
||||
{ [weak self] in
|
||||
self?.dismiss(animated: true)
|
||||
}
|
||||
}
|
||||
|
||||
var topOffset: CGFloat {
|
||||
topLayoutOffset
|
||||
return topLayoutOffset + 21.0
|
||||
}
|
||||
|
||||
var shortFormHeight: PanModalHeight {
|
||||
return longFormHeight
|
||||
}
|
||||
|
||||
var mediumFormHeight: PanModalHeight {
|
||||
longFormHeight
|
||||
}
|
||||
|
||||
var longFormHeight: PanModalHeight {
|
||||
|
||||
guard let scrollView = panScrollable
|
||||
|
|
@ -47,10 +30,6 @@ public extension PanModalPresentable where Self: UIViewController {
|
|||
return .contentHeight(scrollView.contentSize.height)
|
||||
}
|
||||
|
||||
var dimmedView: DimmedView? {
|
||||
DimmedView()
|
||||
}
|
||||
|
||||
var cornerRadius: CGFloat {
|
||||
return 8.0
|
||||
}
|
||||
|
|
@ -59,20 +38,8 @@ public extension PanModalPresentable where Self: UIViewController {
|
|||
return 0.8
|
||||
}
|
||||
|
||||
var transitionDuration: Double {
|
||||
return PanModalAnimator.Constants.defaultTransitionDuration
|
||||
}
|
||||
|
||||
var transitionAnimationOptions: UIView.AnimationOptions {
|
||||
return [.curveEaseInOut, .allowUserInteraction, .beginFromCurrentState]
|
||||
}
|
||||
|
||||
var panModalBackgroundColor: UIColor {
|
||||
return UIColor.black.withAlphaComponent(0.7)
|
||||
}
|
||||
|
||||
var dragIndicatorBackgroundColor: UIColor {
|
||||
return UIColor.lightGray
|
||||
var backgroundAlpha: CGFloat {
|
||||
return 0.7
|
||||
}
|
||||
|
||||
var scrollIndicatorInsets: UIEdgeInsets {
|
||||
|
|
@ -97,10 +64,6 @@ public extension PanModalPresentable where Self: UIViewController {
|
|||
return true
|
||||
}
|
||||
|
||||
var allowsTapToDismiss: Bool {
|
||||
return true
|
||||
}
|
||||
|
||||
var isUserInteractionEnabled: Bool {
|
||||
return true
|
||||
}
|
||||
|
|
@ -141,8 +104,4 @@ public extension PanModalPresentable where Self: UIViewController {
|
|||
|
||||
}
|
||||
|
||||
func panModalDidDismiss() {
|
||||
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -5,7 +5,6 @@
|
|||
// Copyright © 2018 Tiny Speck, Inc. All rights reserved.
|
||||
//
|
||||
|
||||
#if os(iOS)
|
||||
import UIKit
|
||||
|
||||
/**
|
||||
|
|
@ -27,11 +26,7 @@ extension PanModalPresentable where Self: UIViewController {
|
|||
Gives us the safe area inset from the top.
|
||||
*/
|
||||
var topLayoutOffset: CGFloat {
|
||||
|
||||
guard let rootVC = rootViewController
|
||||
else { return 0}
|
||||
|
||||
if #available(iOS 11.0, *) { return rootVC.view.safeAreaInsets.top } else { return rootVC.topLayoutGuide.length }
|
||||
return UIApplication.shared.keyWindow?.rootViewController?.topLayoutGuide.length ?? 0
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -39,15 +34,11 @@ extension PanModalPresentable where Self: UIViewController {
|
|||
Gives us the safe area inset from the bottom.
|
||||
*/
|
||||
var bottomLayoutOffset: CGFloat {
|
||||
|
||||
guard let rootVC = rootViewController
|
||||
else { return 0}
|
||||
|
||||
if #available(iOS 11.0, *) { return rootVC.view.safeAreaInsets.bottom } else { return rootVC.bottomLayoutGuide.length }
|
||||
return UIApplication.shared.keyWindow?.rootViewController?.bottomLayoutGuide.length ?? 0
|
||||
}
|
||||
|
||||
/**
|
||||
Returns the short form Y position
|
||||
Returns the short form Y postion
|
||||
|
||||
- Note: If voiceover is on, the `longFormYPos` is returned.
|
||||
We do not support short form when voiceover is on as it would make it difficult for user to navigate.
|
||||
|
|
@ -63,14 +54,8 @@ extension PanModalPresentable where Self: UIViewController {
|
|||
return max(shortFormYPos, longFormYPos)
|
||||
}
|
||||
|
||||
var mediumFormYPos: CGFloat {
|
||||
let mediumFormYPos = topMargin(from: mediumFormHeight)
|
||||
|
||||
return max(mediumFormYPos, longFormYPos)
|
||||
}
|
||||
|
||||
/**
|
||||
Returns the long form Y position
|
||||
Returns the long form Y postion
|
||||
|
||||
- Note: We cap this value to the max possible height
|
||||
to ensure content is not rendered outside of the view bounds
|
||||
|
|
@ -114,13 +99,4 @@ extension PanModalPresentable where Self: UIViewController {
|
|||
}
|
||||
}
|
||||
|
||||
private var rootViewController: UIViewController? {
|
||||
|
||||
guard let application = UIApplication.value(forKeyPath: #keyPath(UIApplication.shared)) as? UIApplication
|
||||
else { return nil }
|
||||
|
||||
return application.keyWindow?.rootViewController
|
||||
}
|
||||
|
||||
}
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -5,7 +5,6 @@
|
|||
// Copyright © 2018 Tiny Speck, Inc. All rights reserved.
|
||||
//
|
||||
|
||||
#if os(iOS)
|
||||
import UIKit
|
||||
|
||||
/**
|
||||
|
|
@ -30,6 +29,16 @@ public extension PanModalPresentable where Self: UIViewController {
|
|||
presentedVC?.transition(to: state)
|
||||
}
|
||||
|
||||
/**
|
||||
Programmatically set the content offset of the pan scrollable.
|
||||
|
||||
This is required to use while in the short form presentation state,
|
||||
as due to content offset observation, setting the content offset directly would fail
|
||||
*/
|
||||
func panModalSetContentOffset(offset: CGPoint) {
|
||||
presentedVC?.setContentOffset(offset: offset)
|
||||
}
|
||||
|
||||
/**
|
||||
A function wrapper over the `setNeedsLayoutUpdate()`
|
||||
function in the PanModalPresentationController.
|
||||
|
|
@ -40,16 +49,6 @@ public extension PanModalPresentable where Self: UIViewController {
|
|||
presentedVC?.setNeedsLayoutUpdate()
|
||||
}
|
||||
|
||||
/**
|
||||
Operations on the scroll view, such as content height changes, or when inserting/deleting rows can cause the pan modal to jump,
|
||||
caused by the pan modal responding to content offset changes.
|
||||
|
||||
To avoid this, you can call this method to perform scroll view updates, with scroll observation temporarily disabled.
|
||||
*/
|
||||
func panModalPerformUpdates(_ updates: () -> Void) {
|
||||
presentedVC?.performUpdates(updates)
|
||||
}
|
||||
|
||||
/**
|
||||
A function wrapper over the animate function in PanModalAnimator.
|
||||
|
||||
|
|
@ -60,4 +59,3 @@ public extension PanModalPresentable where Self: UIViewController {
|
|||
}
|
||||
|
||||
}
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -5,7 +5,6 @@
|
|||
// Copyright © 2017 Tiny Speck, Inc. All rights reserved.
|
||||
//
|
||||
|
||||
#if os(iOS)
|
||||
import UIKit
|
||||
|
||||
/**
|
||||
|
|
@ -19,7 +18,7 @@ import UIKit
|
|||
}
|
||||
```
|
||||
*/
|
||||
public protocol PanModalPresentable: AnyObject {
|
||||
public protocol PanModalPresentable {
|
||||
|
||||
/**
|
||||
The scroll view embedded in the view controller.
|
||||
|
|
@ -45,8 +44,6 @@ public protocol PanModalPresentable: AnyObject {
|
|||
*/
|
||||
var shortFormHeight: PanModalHeight { get }
|
||||
|
||||
var mediumFormHeight: PanModalHeight { get }
|
||||
|
||||
/**
|
||||
The height of the pan modal container view
|
||||
when in the longForm presentation state.
|
||||
|
|
@ -57,7 +54,6 @@ public protocol PanModalPresentable: AnyObject {
|
|||
*/
|
||||
var longFormHeight: PanModalHeight { get }
|
||||
|
||||
var dimmedView: DimmedView? { get }
|
||||
/**
|
||||
The corner radius used when `shouldRoundTopCorners` is enabled.
|
||||
|
||||
|
|
@ -74,36 +70,13 @@ public protocol PanModalPresentable: AnyObject {
|
|||
var springDamping: CGFloat { get }
|
||||
|
||||
/**
|
||||
The transitionDuration value is used to set the speed of animation during a transition,
|
||||
including initial presentation.
|
||||
|
||||
Default value is 0.5.
|
||||
*/
|
||||
var transitionDuration: Double { get }
|
||||
|
||||
/**
|
||||
The animation options used when performing animations on the PanModal, utilized mostly
|
||||
during a transition.
|
||||
|
||||
Default value is [.curveEaseInOut, .allowUserInteraction, .beginFromCurrentState].
|
||||
*/
|
||||
var transitionAnimationOptions: UIView.AnimationOptions { get }
|
||||
|
||||
/**
|
||||
The background view color.
|
||||
The background view alpha.
|
||||
|
||||
- Note: This is only utilized at the very start of the transition.
|
||||
|
||||
Default Value is black with alpha component 0.7.
|
||||
*/
|
||||
var panModalBackgroundColor: UIColor { get }
|
||||
|
||||
/**
|
||||
The drag indicator view color.
|
||||
|
||||
Default value is light gray.
|
||||
*/
|
||||
var dragIndicatorBackgroundColor: UIColor { get }
|
||||
Default Value is 0.7.
|
||||
*/
|
||||
var backgroundAlpha: CGFloat { get }
|
||||
|
||||
/**
|
||||
We configure the panScrollable's scrollIndicatorInsets interally so override this value
|
||||
|
|
@ -138,17 +111,6 @@ public protocol PanModalPresentable: AnyObject {
|
|||
*/
|
||||
var allowsDragToDismiss: Bool { get }
|
||||
|
||||
var onTapToDismiss: (() -> Void)? { get }
|
||||
|
||||
var onDragToDismiss: (() -> Void)? { get }
|
||||
|
||||
/**
|
||||
A flag to determine if dismissal should be initiated when tapping on the dimmed background view.
|
||||
|
||||
Default value is true.
|
||||
*/
|
||||
var allowsTapToDismiss: Bool { get }
|
||||
|
||||
/**
|
||||
A flag to toggle user interactions on the container view.
|
||||
|
||||
|
|
@ -234,11 +196,4 @@ public protocol PanModalPresentable: AnyObject {
|
|||
*/
|
||||
func panModalWillDismiss()
|
||||
|
||||
/**
|
||||
Notifies the delegate after the pan modal is dismissed.
|
||||
|
||||
Default value is an empty implementation.
|
||||
*/
|
||||
func panModalDidDismiss()
|
||||
}
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -5,7 +5,6 @@
|
|||
// Copyright © 2019 Tiny Speck, Inc. All rights reserved.
|
||||
//
|
||||
|
||||
#if os(iOS)
|
||||
import UIKit
|
||||
|
||||
/**
|
||||
|
|
@ -18,7 +17,7 @@ import UIKit
|
|||
sourceRect: .zero)
|
||||
```
|
||||
*/
|
||||
protocol PanModalPresenter: AnyObject {
|
||||
public protocol PanModalPresenter {
|
||||
|
||||
/**
|
||||
A flag that returns true if the current presented view controller
|
||||
|
|
@ -29,10 +28,6 @@ protocol PanModalPresenter: AnyObject {
|
|||
/**
|
||||
Presents a view controller that conforms to the PanModalPresentable protocol
|
||||
*/
|
||||
func presentPanModal(_ viewControllerToPresent: PanModalPresentable.LayoutType,
|
||||
sourceView: UIView?,
|
||||
sourceRect: CGRect,
|
||||
completion: (() -> Void)?)
|
||||
func presentPanModal(_ viewControllerToPresent: PanModalPresentable.LayoutType, sourceView: UIView?, sourceRect: CGRect)
|
||||
|
||||
}
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -5,7 +5,6 @@
|
|||
// Copyright © 2019 Tiny Speck, Inc. All rights reserved.
|
||||
//
|
||||
|
||||
#if os(iOS)
|
||||
import UIKit
|
||||
|
||||
/**
|
||||
|
|
@ -35,14 +34,10 @@ extension UIViewController: PanModalPresenter {
|
|||
- viewControllerToPresent: The view controller to be presented
|
||||
- sourceView: The view containing the anchor rectangle for the popover.
|
||||
- sourceRect: The rectangle in the specified view in which to anchor the popover.
|
||||
- completion: The block to execute after the presentation finishes. You may specify nil for this parameter.
|
||||
|
||||
- Note: sourceView & sourceRect are only required for presentation on an iPad.
|
||||
*/
|
||||
public func presentPanModal(_ viewControllerToPresent: PanModalPresentable.LayoutType,
|
||||
sourceView: UIView? = nil,
|
||||
sourceRect: CGRect = .zero,
|
||||
completion: (() -> Void)? = nil) {
|
||||
public func presentPanModal(_ viewControllerToPresent: PanModalPresentable.LayoutType, sourceView: UIView? = nil, sourceRect: CGRect = .zero) {
|
||||
|
||||
/**
|
||||
Here, we deliberately do not check for size classes. More info in `PanModalPresentationDelegate`
|
||||
|
|
@ -59,8 +54,7 @@ extension UIViewController: PanModalPresenter {
|
|||
viewControllerToPresent.transitioningDelegate = PanModalPresentationDelegate.default
|
||||
}
|
||||
|
||||
present(viewControllerToPresent, animated: true, completion: completion)
|
||||
present(viewControllerToPresent, animated: true, completion: nil)
|
||||
}
|
||||
|
||||
}
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -5,19 +5,18 @@
|
|||
// Copyright © 2017 Tiny Speck, Inc. All rights reserved.
|
||||
//
|
||||
|
||||
#if os(iOS)
|
||||
import UIKit
|
||||
|
||||
/**
|
||||
A dim view for use as an overlay over content you want dimmed.
|
||||
*/
|
||||
open class DimmedView: UIView {
|
||||
public class DimmedView: UIView {
|
||||
|
||||
/**
|
||||
Represents the possible states of the dimmed view.
|
||||
max, off or a percentage of dimAlpha.
|
||||
*/
|
||||
public enum DimState {
|
||||
enum DimState {
|
||||
case max
|
||||
case off
|
||||
case percent(CGFloat)
|
||||
|
|
@ -30,14 +29,22 @@ open class DimmedView: UIView {
|
|||
*/
|
||||
var dimState: DimState = .off {
|
||||
didSet {
|
||||
onChange(dimState: dimState)
|
||||
switch dimState {
|
||||
case .max:
|
||||
alpha = dimAlpha
|
||||
case .off:
|
||||
alpha = 0.0
|
||||
case .percent(let percentage):
|
||||
let val = max(0.0, min(1.0, percentage))
|
||||
alpha = dimAlpha * val
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
The closure to be executed when a tap occurs
|
||||
*/
|
||||
var didTap: ((_ recognizer: UITapGestureRecognizer) -> Void)?
|
||||
var didTap: ((_ recognizer: UIGestureRecognizer) -> Void)?
|
||||
|
||||
/**
|
||||
Tap gesture recognizer
|
||||
|
|
@ -46,11 +53,15 @@ open class DimmedView: UIView {
|
|||
return UITapGestureRecognizer(target: self, action: #selector(didTapView))
|
||||
}()
|
||||
|
||||
private let dimAlpha: CGFloat
|
||||
|
||||
// MARK: - Initializers
|
||||
|
||||
public init() {
|
||||
init(dimAlpha: CGFloat = 0.7) {
|
||||
self.dimAlpha = dimAlpha
|
||||
super.init(frame: .zero)
|
||||
alpha = 0.0
|
||||
backgroundColor = .black
|
||||
addGestureRecognizer(tapGesture)
|
||||
}
|
||||
|
||||
|
|
@ -60,22 +71,8 @@ open class DimmedView: UIView {
|
|||
|
||||
// MARK: - Event Handlers
|
||||
|
||||
@objc private func didTapView(sender: UITapGestureRecognizer) {
|
||||
didTap?(sender)
|
||||
}
|
||||
|
||||
// MARK: - Subclass override
|
||||
|
||||
open func onChange(dimState: DimState) {
|
||||
switch dimState {
|
||||
case .max:
|
||||
alpha = 1.0
|
||||
case .off:
|
||||
alpha = 0.0
|
||||
case .percent(let percentage):
|
||||
alpha = max(0.0, min(1.0, percentage))
|
||||
}
|
||||
@objc private func didTapView() {
|
||||
didTap?(tapGesture)
|
||||
}
|
||||
|
||||
}
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -5,7 +5,6 @@
|
|||
// Copyright © 2018 Tiny Speck, Inc. All rights reserved.
|
||||
//
|
||||
|
||||
#if os(iOS)
|
||||
import UIKit
|
||||
|
||||
/**
|
||||
|
|
@ -21,9 +20,8 @@ class PanContainerView: UIView {
|
|||
addSubview(presentedView)
|
||||
}
|
||||
|
||||
@available(*, unavailable)
|
||||
required init?(coder aDecoder: NSCoder) {
|
||||
fatalError("init(coder:) has not been implemented")
|
||||
fatalError()
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -35,10 +33,7 @@ extension UIView {
|
|||
from the view hierachy
|
||||
*/
|
||||
var panContainerView: PanContainerView? {
|
||||
return subviews.first(where: { view -> Bool in
|
||||
view is PanContainerView
|
||||
}) as? PanContainerView
|
||||
return subviews.compactMap({ $0 as? PanContainerView }).first
|
||||
}
|
||||
|
||||
}
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -41,7 +41,6 @@
|
|||
943904ED2226366700859537 /* AlertViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 943904EC2226366700859537 /* AlertViewController.swift */; };
|
||||
943904EF2226383700859537 /* NavigationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 943904EE2226383700859537 /* NavigationController.swift */; };
|
||||
943904F32226484F00859537 /* UserGroupStackedViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 943904F22226484F00859537 /* UserGroupStackedViewController.swift */; };
|
||||
944EBA2E227BB7F400C4C97B /* FullScreenNavController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 944EBA2D227BB7F400C4C97B /* FullScreenNavController.swift */; };
|
||||
94795C9B21F0335D008045A0 /* PanModalPresentationDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94795C9A21F0335D008045A0 /* PanModalPresentationDelegate.swift */; };
|
||||
94795C9D21F03368008045A0 /* PanContainerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94795C9C21F03368008045A0 /* PanContainerView.swift */; };
|
||||
DC13905E216D90D5007A3E64 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = DC13905D216D90D5007A3E64 /* Assets.xcassets */; };
|
||||
|
|
@ -113,7 +112,6 @@
|
|||
943904EC2226366700859537 /* AlertViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AlertViewController.swift; sourceTree = "<group>"; };
|
||||
943904EE2226383700859537 /* NavigationController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NavigationController.swift; sourceTree = "<group>"; };
|
||||
943904F22226484F00859537 /* UserGroupStackedViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserGroupStackedViewController.swift; sourceTree = "<group>"; };
|
||||
944EBA2D227BB7F400C4C97B /* FullScreenNavController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FullScreenNavController.swift; sourceTree = "<group>"; };
|
||||
94795C9A21F0335D008045A0 /* PanModalPresentationDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PanModalPresentationDelegate.swift; sourceTree = "<group>"; };
|
||||
94795C9C21F03368008045A0 /* PanContainerView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PanContainerView.swift; sourceTree = "<group>"; };
|
||||
DC13905D216D90D5007A3E64 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
|
||||
|
|
@ -240,22 +238,6 @@
|
|||
path = Presenter;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
944EBA2B227BB7D900C4C97B /* Basic */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
943904EA2226354100859537 /* BasicViewController.swift */,
|
||||
);
|
||||
path = Basic;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
944EBA2C227BB7E100C4C97B /* Full Screen */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
944EBA2D227BB7F400C4C97B /* FullScreenNavController.swift */,
|
||||
);
|
||||
path = "Full Screen";
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
DC13905F216D93AB007A3E64 /* Resources */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
|
|
@ -328,8 +310,7 @@
|
|||
DC139079216D9AAA007A3E64 /* View Controllers */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
944EBA2B227BB7D900C4C97B /* Basic */,
|
||||
944EBA2C227BB7E100C4C97B /* Full Screen */,
|
||||
943904EA2226354100859537 /* BasicViewController.swift */,
|
||||
DC3B2EBB222A5882000C8A4A /* Alert */,
|
||||
DC3B2EBC222A5893000C8A4A /* Alert (Transient) */,
|
||||
743CB2AB222661EA00665A55 /* User Groups (Stacked) */,
|
||||
|
|
@ -586,7 +567,6 @@
|
|||
DC139075216D9458007A3E64 /* DimmedView.swift in Sources */,
|
||||
743CABD322265F2E00634A5A /* ProfileViewController.swift in Sources */,
|
||||
DC139070216D9458007A3E64 /* PanModalPresentationAnimator.swift in Sources */,
|
||||
944EBA2E227BB7F400C4C97B /* FullScreenNavController.swift in Sources */,
|
||||
DCA741AE216D90410021F2F2 /* AppDelegate.swift in Sources */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
|
|
@ -629,7 +609,7 @@
|
|||
PRODUCT_BUNDLE_IDENTIFIER = com.slack.PanModal;
|
||||
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
|
||||
SKIP_INSTALL = YES;
|
||||
SWIFT_VERSION = 5.0;
|
||||
SWIFT_VERSION = 4.2;
|
||||
TARGETED_DEVICE_FAMILY = "1,2";
|
||||
VERSIONING_SYSTEM = "apple-generic";
|
||||
VERSION_INFO_PREFIX = "";
|
||||
|
|
@ -658,7 +638,7 @@
|
|||
PRODUCT_BUNDLE_IDENTIFIER = com.slack.PanModal;
|
||||
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
|
||||
SKIP_INSTALL = YES;
|
||||
SWIFT_VERSION = 5.0;
|
||||
SWIFT_VERSION = 4.2;
|
||||
TARGETED_DEVICE_FAMILY = "1,2";
|
||||
VERSIONING_SYSTEM = "apple-generic";
|
||||
VERSION_INFO_PREFIX = "";
|
||||
|
|
@ -679,7 +659,7 @@
|
|||
);
|
||||
PRODUCT_BUNDLE_IDENTIFIER = slack.PanModalTests;
|
||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||
SWIFT_VERSION = 5.0;
|
||||
SWIFT_VERSION = 4.2;
|
||||
TARGETED_DEVICE_FAMILY = "1,2";
|
||||
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/PanModalDemo.app/PanModalDemo";
|
||||
};
|
||||
|
|
@ -699,7 +679,7 @@
|
|||
);
|
||||
PRODUCT_BUNDLE_IDENTIFIER = slack.PanModalTests;
|
||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||
SWIFT_VERSION = 5.0;
|
||||
SWIFT_VERSION = 4.2;
|
||||
TARGETED_DEVICE_FAMILY = "1,2";
|
||||
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/PanModalDemo.app/PanModalDemo";
|
||||
};
|
||||
|
|
@ -763,7 +743,6 @@
|
|||
SDKROOT = iphoneos;
|
||||
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
|
||||
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
|
||||
SWIFT_VERSION = 5.0;
|
||||
};
|
||||
name = Debug;
|
||||
};
|
||||
|
|
@ -818,7 +797,6 @@
|
|||
SDKROOT = iphoneos;
|
||||
SWIFT_COMPILATION_MODE = wholemodule;
|
||||
SWIFT_OPTIMIZATION_LEVEL = "-O";
|
||||
SWIFT_VERSION = 5.0;
|
||||
VALIDATE_PRODUCT = YES;
|
||||
};
|
||||
name = Release;
|
||||
|
|
@ -839,7 +817,7 @@
|
|||
);
|
||||
PRODUCT_BUNDLE_IDENTIFIER = com.PanModal;
|
||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||
SWIFT_VERSION = 5.0;
|
||||
SWIFT_VERSION = 4.2;
|
||||
TARGETED_DEVICE_FAMILY = "1,2";
|
||||
};
|
||||
name = Debug;
|
||||
|
|
@ -860,7 +838,7 @@
|
|||
);
|
||||
PRODUCT_BUNDLE_IDENTIFIER = com.PanModal;
|
||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||
SWIFT_VERSION = 5.0;
|
||||
SWIFT_VERSION = 4.2;
|
||||
TARGETED_DEVICE_FAMILY = "1,2";
|
||||
};
|
||||
name = Release;
|
||||
|
|
|
|||
21
README.md
21
README.md
|
|
@ -1,13 +1,10 @@
|
|||
|
||||
### PanModal is an elegant and highly customizable presentation API for constructing bottom sheet modals on iOS.
|
||||
|
||||
<p align="center">
|
||||
<img src="https://github.com/slackhq/PanModal/raw/master/Screenshots/panModal.gif" width="30%" height="30%" alt="Screenshot Preview" />
|
||||
</p>
|
||||
|
||||
<p align="center">
|
||||
<img src="https://img.shields.io/badge/Platform-iOS_10+-green.svg" alt="Platform: iOS 10.0+" />
|
||||
<a href="https://developer.apple.com/swift" target="_blank"><img src="https://img.shields.io/badge/Language-Swift_5-blueviolet.svg" alt="Language: Swift 5" /></a>
|
||||
<a href="https://developer.apple.com/swift" target="_blank"><img src="https://img.shields.io/badge/Language-Swift_4-blueviolet.svg" alt="Language: Swift 4" /></a>
|
||||
<a href="https://cocoapods.org/pods/PanModal" target="_blank"><img src="https://img.shields.io/badge/CocoaPods-v1.0-red.svg" alt="CocoaPods compatible" /></a>
|
||||
<a href="https://github.com/Carthage/Carthage" target="_blank"><img src="https://img.shields.io/badge/Carthage-compatible-blue.svg" alt="Carthage compatible" /></a>
|
||||
<img src="https://img.shields.io/badge/License-MIT-green.svg" alt="License: MIT" />
|
||||
|
|
@ -24,12 +21,6 @@
|
|||
• <a href="#license">License</a>
|
||||
</p>
|
||||
|
||||
<p align="center">
|
||||
Read our <a href="https://slack.engineering/panmodal-better-support-for-thumb-accessibility-on-slack-mobile-52b2a7596031" target="_blank">blog</a> on how Slack is getting more :thumbsup: with PanModal
|
||||
|
||||
Swift 4.2 support can be found on the `Swift4.2` branch.
|
||||
</p>
|
||||
|
||||
## Features
|
||||
|
||||
* Supports any type of `UIViewController`
|
||||
|
|
@ -54,14 +45,6 @@ pod 'PanModal'
|
|||
github "slackhq/PanModal"
|
||||
```
|
||||
|
||||
* <a href="https://swift.org/package-manager/" target="_blank">Swift Package Manager</a>:
|
||||
|
||||
```swift
|
||||
dependencies: [
|
||||
.package(url: "https://github.com/slackhq/PanModal.git", .exact("1.2.6")),
|
||||
],
|
||||
```
|
||||
|
||||
## Usage
|
||||
|
||||
PanModal was designed to be used effortlessly. Simply call `presentPanModal` in the same way you would expect to present a `UIViewController`
|
||||
|
|
@ -147,7 +130,7 @@ We will only be fixing critical bugs, thus, for any non-critical issues or featu
|
|||
|
||||
## Authors
|
||||
|
||||
[Stephen Sowole](https://github.com/ste57) • [Tosin Afolabi](https://github.com/tosinaf)
|
||||
[Stephen Sowole](https://github.com/tun57) • [Tosin Afolabi](https://github.com/tosinaf)
|
||||
|
||||
## License
|
||||
|
||||
|
|
|
|||
|
|
@ -67,7 +67,6 @@ private extension SampleViewController {
|
|||
|
||||
enum RowType: Int, CaseIterable {
|
||||
case basic
|
||||
case fullScreen
|
||||
case alert
|
||||
case transientAlert
|
||||
case userGroups
|
||||
|
|
@ -78,7 +77,6 @@ private extension SampleViewController {
|
|||
var presentable: RowPresentable {
|
||||
switch self {
|
||||
case .basic: return Basic()
|
||||
case .fullScreen: return FullScreen()
|
||||
case .alert: return Alert()
|
||||
case .transientAlert: return TransientAlert()
|
||||
case .userGroups: return UserGroup()
|
||||
|
|
@ -88,38 +86,33 @@ private extension SampleViewController {
|
|||
}
|
||||
|
||||
struct Basic: RowPresentable {
|
||||
let string: String = "Basic"
|
||||
let rowVC: PanModalPresentable.LayoutType = BasicViewController()
|
||||
}
|
||||
|
||||
struct FullScreen: RowPresentable {
|
||||
let string: String = "Full Screen"
|
||||
let rowVC: PanModalPresentable.LayoutType = FullScreenNavController()
|
||||
var string: String { return "Basic" }
|
||||
var rowVC: PanModalPresentable.LayoutType { return BasicViewController() }
|
||||
}
|
||||
|
||||
struct Alert: RowPresentable {
|
||||
let string: String = "Alert"
|
||||
let rowVC: PanModalPresentable.LayoutType = AlertViewController()
|
||||
var string: String { return "Alert" }
|
||||
var rowVC: PanModalPresentable.LayoutType { return AlertViewController() }
|
||||
}
|
||||
|
||||
struct TransientAlert: RowPresentable {
|
||||
let string: String = "Alert (Transient)"
|
||||
let rowVC: PanModalPresentable.LayoutType = TransientAlertViewController()
|
||||
var string: String { return "Alert (Transient)"}
|
||||
var rowVC: PanModalPresentable.LayoutType { return TransientAlertViewController() }
|
||||
}
|
||||
|
||||
struct UserGroup: RowPresentable {
|
||||
let string: String = "User Groups"
|
||||
let rowVC: PanModalPresentable.LayoutType = UserGroupViewController()
|
||||
var string: String { return "User Groups" }
|
||||
var rowVC: PanModalPresentable.LayoutType { return UserGroupViewController() }
|
||||
}
|
||||
|
||||
struct Navigation: RowPresentable {
|
||||
let string: String = "User Groups (NavigationController)"
|
||||
let rowVC: PanModalPresentable.LayoutType = NavigationController()
|
||||
var string: String { return "User Groups (NavigationController)" }
|
||||
var rowVC: PanModalPresentable.LayoutType { return NavigationController() }
|
||||
}
|
||||
|
||||
struct Stacked: RowPresentable {
|
||||
let string: String = "User Groups (Stacked)"
|
||||
let rowVC: PanModalPresentable.LayoutType = UserGroupStackedViewController()
|
||||
var string: String { return "User Groups (Stacked)" }
|
||||
var rowVC: PanModalPresentable.LayoutType { return UserGroupStackedViewController() }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -59,8 +59,8 @@ class TransientAlertViewController: AlertViewController {
|
|||
return true
|
||||
}
|
||||
|
||||
override var panModalBackgroundColor: UIColor {
|
||||
return .clear
|
||||
override var backgroundAlpha: CGFloat {
|
||||
return 0.0
|
||||
}
|
||||
|
||||
override var isUserInteractionEnabled: Bool {
|
||||
|
|
|
|||
|
|
@ -46,8 +46,8 @@ class AlertViewController: UIViewController, PanModalPresentable {
|
|||
return shortFormHeight
|
||||
}
|
||||
|
||||
var panModalBackgroundColor: UIColor {
|
||||
return UIColor.black.withAlphaComponent(0.1)
|
||||
var backgroundAlpha: CGFloat {
|
||||
return 0.1
|
||||
}
|
||||
|
||||
var shouldRoundTopCorners: Bool {
|
||||
|
|
|
|||
|
|
@ -1,73 +0,0 @@
|
|||
//
|
||||
// FullScreenNavController.swift
|
||||
// PanModalDemo
|
||||
//
|
||||
// Created by Stephen Sowole on 5/2/19.
|
||||
// Copyright © 2019 Detail. All rights reserved.
|
||||
//
|
||||
|
||||
import UIKit
|
||||
|
||||
class FullScreenNavController: UINavigationController {
|
||||
|
||||
override func viewDidLoad() {
|
||||
super.viewDidLoad()
|
||||
pushViewController(FullScreenViewController(), animated: false)
|
||||
}
|
||||
}
|
||||
|
||||
extension FullScreenNavController: PanModalPresentable {
|
||||
|
||||
var panScrollable: UIScrollView? {
|
||||
return nil
|
||||
}
|
||||
|
||||
var topOffset: CGFloat {
|
||||
return 0.0
|
||||
}
|
||||
|
||||
var springDamping: CGFloat {
|
||||
return 1.0
|
||||
}
|
||||
|
||||
var transitionDuration: Double {
|
||||
return 0.4
|
||||
}
|
||||
|
||||
var transitionAnimationOptions: UIView.AnimationOptions {
|
||||
return [.allowUserInteraction, .beginFromCurrentState]
|
||||
}
|
||||
|
||||
var shouldRoundTopCorners: Bool {
|
||||
return false
|
||||
}
|
||||
|
||||
var showDragIndicator: Bool {
|
||||
return false
|
||||
}
|
||||
}
|
||||
|
||||
private class FullScreenViewController: UIViewController {
|
||||
|
||||
let textLabel: UILabel = {
|
||||
let label = UILabel()
|
||||
label.text = "Drag downwards to dismiss"
|
||||
label.font = UIFont(name: "Lato-Bold", size: 17)
|
||||
label.translatesAutoresizingMaskIntoConstraints = false
|
||||
return label
|
||||
}()
|
||||
|
||||
override func viewDidLoad() {
|
||||
super.viewDidLoad()
|
||||
title = "Full Screen"
|
||||
view.backgroundColor = .white
|
||||
setupConstraints()
|
||||
}
|
||||
|
||||
private func setupConstraints() {
|
||||
view.addSubview(textLabel)
|
||||
textLabel.centerXAnchor.constraint(equalTo: view.centerXAnchor).isActive = true
|
||||
textLabel.centerYAnchor.constraint(equalTo: view.centerYAnchor).isActive = true
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -12,19 +12,15 @@ class NavigationController: UINavigationController, PanModalPresentable {
|
|||
|
||||
private let navGroups = NavUserGroups()
|
||||
|
||||
init() {
|
||||
super.init(nibName: nil, bundle: nil)
|
||||
viewControllers = [navGroups]
|
||||
}
|
||||
|
||||
required init?(coder aDecoder: NSCoder) {
|
||||
fatalError()
|
||||
}
|
||||
|
||||
override var preferredStatusBarStyle: UIStatusBarStyle {
|
||||
return .lightContent
|
||||
}
|
||||
|
||||
override func viewDidLoad() {
|
||||
super.viewDidLoad()
|
||||
pushViewController(navGroups, animated: false)
|
||||
}
|
||||
|
||||
override func popViewController(animated: Bool) -> UIViewController? {
|
||||
let vc = super.popViewController(animated: animated)
|
||||
panModalSetNeedsLayoutUpdate()
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
import UIKit
|
||||
|
||||
class UserGroupViewController: UITableViewController, PanModalPresentable {
|
||||
class UserGroupViewController: UITableViewController, PanModalPresentable, UIGestureRecognizerDelegate {
|
||||
|
||||
let members: [UserGroupMemberPresentable] = [
|
||||
UserGroupMemberPresentable(name: "Naida Schill ✈️", role: "Staff Engineer - Mobile DevXP", avatarBackgroundColor: #colorLiteral(red: 0.7215686275, green: 0.9098039216, blue: 0.5607843137, alpha: 1)),
|
||||
|
|
|
|||
|
|
@ -48,21 +48,17 @@ class PanModalTests: XCTestCase {
|
|||
XCTAssertEqual(vc.shortFormHeight, PanModalHeight.maxHeight)
|
||||
XCTAssertEqual(vc.longFormHeight, PanModalHeight.maxHeight)
|
||||
XCTAssertEqual(vc.springDamping, 0.8)
|
||||
XCTAssertEqual(vc.panModalBackgroundColor, UIColor.black.withAlphaComponent(0.7))
|
||||
XCTAssertEqual(vc.dragIndicatorBackgroundColor, UIColor.lightGray)
|
||||
XCTAssertEqual(vc.backgroundAlpha, 0.7)
|
||||
XCTAssertEqual(vc.scrollIndicatorInsets, .zero)
|
||||
XCTAssertEqual(vc.anchorModalToLongForm, true)
|
||||
XCTAssertEqual(vc.allowsExtendedPanScrolling, false)
|
||||
XCTAssertEqual(vc.allowsDragToDismiss, true)
|
||||
XCTAssertEqual(vc.allowsTapToDismiss, true)
|
||||
XCTAssertEqual(vc.isUserInteractionEnabled, true)
|
||||
XCTAssertEqual(vc.isHapticFeedbackEnabled, true)
|
||||
XCTAssertEqual(vc.shouldRoundTopCorners, false)
|
||||
XCTAssertEqual(vc.showDragIndicator, false)
|
||||
XCTAssertEqual(vc.shouldRoundTopCorners, false)
|
||||
XCTAssertEqual(vc.cornerRadius, 8.0)
|
||||
XCTAssertEqual(vc.transitionDuration, PanModalAnimator.Constants.defaultTransitionDuration)
|
||||
XCTAssertEqual(vc.transitionAnimationOptions, [.curveEaseInOut, .allowUserInteraction, .beginFromCurrentState])
|
||||
}
|
||||
|
||||
func testPresentableYValues() {
|
||||
|
|
|
|||
Loading…
Reference in New Issue