ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-11-08 01:40:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add sheet component pan dismissal

Browse Source
This commit is contained in:
Ilya Laktyushin 2022-05-29 00:21:58 +04:00
parent c29cb46ef7
commit 8aca1f28fb
4 changed files with 93 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
submodules/Components/SheetComponent/Sources/SheetComponent.swift
View File

@ -6,9 +6,9 @@ import ViewControllerComponent
public final class SheetComponentEnvironment: Equatable { public final class SheetComponentEnvironment: Equatable {
public let isDisplaying: Bool public let isDisplaying: Bool
public let dismiss: () -> Void public let dismiss: (Bool) -> Void
public init(isDisplaying: Bool, dismiss: @escaping () -> Void) { public init(isDisplaying: Bool, dismiss: @escaping (Bool) -> Void) {
self.isDisplaying = isDisplaying self.isDisplaying = isDisplaying
self.dismiss = dismiss self.dismiss = dismiss
} }
@ -55,7 +55,7 @@ public final class SheetComponent<ChildEnvironmentType: Equatable>: Component {
private let contentView: ComponentHostView<ChildEnvironmentType> private let contentView: ComponentHostView<ChildEnvironmentType>
private var previousIsDisplaying: Bool = false private var previousIsDisplaying: Bool = false
private var dismiss: (() -> Void)? private var dismiss: ((Bool) -> Void)?
override init(frame: CGRect) { override init(frame: CGRect) {
self.dimView = UIView() self.dimView = UIView()
@ -78,8 +78,9 @@ public final class SheetComponent<ChildEnvironmentType: Equatable>: Component {
super.init(frame: frame) super.init(frame: frame)
self.addSubview(self.dimView) self.scrollView.delegate = self
self.addSubview(self.dimView)
self.scrollView.addSubview(self.backgroundView) self.scrollView.addSubview(self.backgroundView)
self.scrollView.addSubview(self.contentView) self.scrollView.addSubview(self.contentView)
self.addSubview(self.scrollView) self.addSubview(self.scrollView)
@ -93,17 +94,39 @@ public final class SheetComponent<ChildEnvironmentType: Equatable>: Component {
@objc private func dimViewTapGesture(_ recognizer: UITapGestureRecognizer) { @objc private func dimViewTapGesture(_ recognizer: UITapGestureRecognizer) {
if case .ended = recognizer.state { if case .ended = recognizer.state {
self.dismiss?() self.dismiss?(true)
}
}
private var scrollingOut = false
public func scrollViewWillEndDragging(_ scrollView: UIScrollView, withVelocity velocity: CGPoint, targetContentOffset: UnsafeMutablePointer<CGPoint>) {
let contentOffset = (scrollView.contentOffset.y + scrollView.contentInset.top - scrollView.contentSize.height) * -1.0
let dismissalOffset = scrollView.contentSize.height - scrollView.contentInset.top + scrollView.contentSize.height
let delta = dismissalOffset - contentOffset
let initialVelocity = !delta.isZero ? velocity.y / delta : 0.0
targetContentOffset.pointee = scrollView.contentOffset
if velocity.y > 300.0 {
self.animateOut(initialVelocity: initialVelocity, completion: {
self.dismiss?(false)
})
} else {
if contentOffset < scrollView.contentSize.height * 0.333 {
scrollView.setContentOffset(CGPoint(x: 0.0, y: scrollView.contentSize.height - scrollView.contentInset.top), animated: true)
} else {
self.animateOut(initialVelocity: initialVelocity, completion: {
self.dismiss?(false)
})
}
} }
} }
public func scrollViewDidScroll(_ scrollView: UIScrollView) { public func scrollViewDidScroll(_ scrollView: UIScrollView) {
let contentOffset = (scrollView.contentOffset.y + scrollView.contentInset.top - scrollView.contentSize.height) * -1.0
if contentOffset >= scrollView.contentSize.height {
self.dismiss?(false)
} }
public func scrollViewWillEndDragging(_ scrollView: UIScrollView, withVelocity velocity: CGPoint, targetContentOffset: UnsafeMutablePointer<CGPoint>) {
}
public func scrollViewWillBeginDragging(_ scrollView: UIScrollView) {
} }
override public func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? { override public func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? {
@ -114,12 +137,36 @@ public final class SheetComponent<ChildEnvironmentType: Equatable>: Component {
return super.hitTest(point, with: event) return super.hitTest(point, with: event)
} }
private func animateOut(completion: @escaping () -> Void) { private func animateIn() {
self.dimView.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.3)
let transition = ContainedViewLayoutTransition.animated(duration: 0.4, curve: .spring)
let targetPosition = self.scrollView.center
self.scrollView.center = targetPosition.offsetBy(dx: 0.0, dy: self.scrollView.contentSize.height)
transition.animateView(allowUserInteraction: true, {
self.scrollView.center = targetPosition
})
}
private func animateOut(initialVelocity: CGFloat? = nil, completion: @escaping () -> Void) {
self.isUserInteractionEnabled = false self.isUserInteractionEnabled = false
self.dimView.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.25, removeOnCompletion: false) self.dimView.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.3, removeOnCompletion: false)
self.scrollView.layer.animatePosition(from: CGPoint(), to: CGPoint(x: 0.0, y: self.bounds.height - self.scrollView.contentInset.top), duration: 0.25, timingFunction: CAMediaTimingFunctionName.easeIn.rawValue, removeOnCompletion: false, additive: true, completion: { _ in
if let initialVelocity = initialVelocity {
let transition = ContainedViewLayoutTransition.animated(duration: 0.35, curve: .customSpring(damping: 124.0, initialVelocity: initialVelocity))
let contentOffset = (self.scrollView.contentOffset.y + self.scrollView.contentInset.top - self.scrollView.contentSize.height) * -1.0
let dismissalOffset = self.scrollView.contentSize.height
let delta = dismissalOffset - contentOffset
transition.updatePosition(layer: self.scrollView.layer, position: CGPoint(x: self.scrollView.center.x, y: self.scrollView.center.y + delta), completion: { _ in
completion() completion()
}) })
} else {
self.scrollView.layer.animatePosition(from: CGPoint(), to: CGPoint(x: 0.0, y: self.scrollView.contentSize.height), duration: 0.25, timingFunction: CAMediaTimingFunctionName.easeInEaseOut.rawValue, removeOnCompletion: false, additive: true, completion: { _ in
completion()
})
}
} }
func update(component: SheetComponent<ChildEnvironmentType>, availableSize: CGSize, state: EmptyComponentState, environment: Environment<EnvironmentType>, transition: Transition) -> CGSize { func update(component: SheetComponent<ChildEnvironmentType>, availableSize: CGSize, state: EmptyComponentState, environment: Environment<EnvironmentType>, transition: Transition) -> CGSize {
@ -147,15 +194,14 @@ public final class SheetComponent<ChildEnvironmentType: Equatable>: Component {
containerSize: CGSize(width: availableSize.width, height: .greatestFiniteMagnitude) containerSize: CGSize(width: availableSize.width, height: .greatestFiniteMagnitude)
) )
transition.setFrame(view: self.contentView, frame: CGRect(origin: CGPoint(), size: contentSize), completion: nil) transition.setFrame(view: self.contentView, frame: CGRect(origin: .zero, size: contentSize), completion: nil)
transition.setFrame(view: self.backgroundView, frame: CGRect(origin: CGPoint(), size: CGSize(width: contentSize.width, height: contentSize.height + 1000.0)), completion: nil) transition.setFrame(view: self.backgroundView, frame: CGRect(origin: .zero, size: CGSize(width: contentSize.width, height: contentSize.height + 1000.0)), completion: nil)
transition.setFrame(view: self.scrollView, frame: CGRect(origin: CGPoint(), size: availableSize), completion: nil) transition.setFrame(view: self.scrollView, frame: CGRect(origin: CGPoint(), size: availableSize), completion: nil)
self.scrollView.contentSize = contentSize self.scrollView.contentSize = contentSize
self.scrollView.contentInset = UIEdgeInsets(top: max(0.0, availableSize.height - contentSize.height), left: 0.0, bottom: 0.0, right: 0.0) self.scrollView.contentInset = UIEdgeInsets(top: max(0.0, availableSize.height - contentSize.height) + contentSize.height, left: 0.0, bottom: 0.0, right: 0.0)
if environment[SheetComponentEnvironment.self].value.isDisplaying, !self.previousIsDisplaying, let _ = transition.userData(ViewControllerComponentContainer.AnimateInTransition.self) { if environment[SheetComponentEnvironment.self].value.isDisplaying, !self.previousIsDisplaying, let _ = transition.userData(ViewControllerComponentContainer.AnimateInTransition.self) {
self.dimView.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.3) self.animateIn()
self.scrollView.layer.animatePosition(from: CGPoint(x: 0.0, y: availableSize.height - self.scrollView.contentInset.top), to: CGPoint(), duration: 0.5, timingFunction: kCAMediaTimingFunctionSpring, additive: true, completion: nil)
} else if !environment[SheetComponentEnvironment.self].value.isDisplaying, self.previousIsDisplaying, let _ = transition.userData(ViewControllerComponentContainer.AnimateOutTransition.self) { } else if !environment[SheetComponentEnvironment.self].value.isDisplaying, self.previousIsDisplaying, let _ = transition.userData(ViewControllerComponentContainer.AnimateOutTransition.self) {
self.animateOut(completion: {}) self.animateOut(completion: {})
} }

8
submodules/PaymentMethodUI/Sources/AddPaymentMethodSheetScreen.swift
View File

@ -207,12 +207,18 @@ private final class AddPaymentMethodSheetComponent: CombinedComponent {
environment environment
SheetComponentEnvironment( SheetComponentEnvironment(
isDisplaying: environment.value.isVisible, isDisplaying: environment.value.isVisible,
dismiss: { dismiss: { animated in
if animated {
animateOut.invoke(Action { _ in animateOut.invoke(Action { _ in
if let controller = controller() { if let controller = controller() {
controller.dismiss(completion: nil) controller.dismiss(completion: nil)
} }
}) })
} else {
if let controller = controller() {
controller.dismiss(completion: nil)
}
}
} }
) )
}, },

8
submodules/PremiumUI/Sources/PremiumDemoScreen.swift
View File

@ -935,12 +935,18 @@ private final class DemoSheetComponent: CombinedComponent {
environment environment
SheetComponentEnvironment( SheetComponentEnvironment(
isDisplaying: environment.value.isVisible, isDisplaying: environment.value.isVisible,
dismiss: { dismiss: { animated in
if animated {
animateOut.invoke(Action { _ in animateOut.invoke(Action { _ in
if let controller = controller() { if let controller = controller() {
controller.dismiss(completion: nil) controller.dismiss(completion: nil)
} }
}) })
} else {
if let controller = controller() {
controller.dismiss(completion: nil)
}
}
} }
) )
}, },

8
submodules/PremiumUI/Sources/PremiumLimitScreen.swift
View File

@ -909,12 +909,18 @@ private final class LimitSheetComponent: CombinedComponent {
environment environment
SheetComponentEnvironment( SheetComponentEnvironment(
isDisplaying: environment.value.isVisible, isDisplaying: environment.value.isVisible,
dismiss: { dismiss: { animated in
if animated {
animateOut.invoke(Action { _ in animateOut.invoke(Action { _ in
if let controller = controller() { if let controller = controller() {
controller.dismiss(completion: nil) controller.dismiss(completion: nil)
} }
}) })
} else {
if let controller = controller() {
controller.dismiss(completion: nil)
}
}
} }
) )
}, },