ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-10-09 03:20:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix animations

Browse Source
This commit is contained in:
Ali 2019-12-17 22:19:39 +04:00
parent 82c1c8c68e
commit 0f2e9e955c
2 changed files with 33 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
submodules/Display/Display/GridNode.swift
View File

@ -226,6 +226,7 @@ open class GridNode: GridNodeScroller, UIScrollViewDelegate {
public var scrollingInitiated: (() -> Void)?
public var scrollingCompleted: (() -> Void)?
public var interactiveScrollingEnded: (() -> Void)?
public var interactiveScrollingWillBeEnded: ((CGPoint, CGPoint) -> Void)?
public var visibleContentOffsetChanged: (GridNodeVisibleContentOffset) -> Void = { _ in }
public final var floatingSections = false
@ -374,6 +375,10 @@ open class GridNode: GridNodeScroller, UIScrollViewDelegate {
self.scrollingInitiated?()
}
public func scrollViewWillEndDragging(_ scrollView: UIScrollView, withVelocity velocity: CGPoint, targetContentOffset: UnsafeMutablePointer<CGPoint>) {
self.interactiveScrollingWillBeEnded?(velocity, targetContentOffset.pointee)
}
public func scrollViewDidEndDragging(_ scrollView: UIScrollView, willDecelerate decelerate: Bool) {
self.interactiveScrollingEnded?()
if !decelerate {

42
submodules/StickerPackPreviewUI/Sources/StickerPackScreen.swift
View File

@ -157,18 +157,28 @@ private final class StickerPackContainer: ASDisplayNode {
}
}
self.gridNode.scrollingCompleted = { [weak self] in
self.gridNode.interactiveScrollingWillBeEnded = { [weak self] velocity, targetOffset in
guard let strongSelf = self, !strongSelf.isDismissed else {
return
}
let contentOffset = strongSelf.gridNode.scrollView.contentOffset
let contentOffset = targetOffset
let insets = strongSelf.gridNode.scrollView.contentInset
if contentOffset.y <= 0.0 && contentOffset.y >= -insets.top {
if contentOffset.y <= -insets.top / 2.0 {
strongSelf.gridNode.scrollView.setContentOffset(CGPoint(x: 0.0, y: -insets.top), animated: true)
} else {
var modalProgress: CGFloat = 0.0
if contentOffset.y < 0.0 && contentOffset.y >= -insets.top {
if contentOffset.y > -insets.top / 2.0 || velocity.y <= -100.0 {
strongSelf.gridNode.scrollView.setContentOffset(CGPoint(x: 0.0, y: 0.0), animated: true)
modalProgress = 1.0
} else {
strongSelf.gridNode.scrollView.setContentOffset(CGPoint(x: 0.0, y: -insets.top), animated: true)
}
} else if contentOffset.y >= 0.0 {
modalProgress = 1.0
}
if abs(strongSelf.modalProgress - modalProgress) > CGFloat.ulpOfOne {
strongSelf.modalProgress = modalProgress
strongSelf.expandProgressUpdated(strongSelf, .animated(duration: 0.4, curve: .spring))
}
}
@ -346,6 +356,8 @@ private final class StickerPackContainer: ASDisplayNode {
if updateLayout, let (layout, _, _, _) = self.validLayout {
let titleSize = self.titleNode.updateLayout(CGSize(width: layout.size.width - 12.0 * 2.0, height: .greatestFiniteMagnitude))
self.titleNode.frame = CGRect(origin: CGPoint(x: floor((-titleSize.width) / 2.0), y: floor((-titleSize.height) / 2.0)), size: titleSize)
self.updateLayout(layout: layout, transition: .immediate)
}
let transaction = StickerPackPreviewGridTransaction(previousList: previousEntries, list: entries, account: self.context.account, interaction: self.interaction)
@ -385,12 +397,21 @@ private final class StickerPackContainer: ASDisplayNode {
let fillingWidth = horizontalContainerFillingSizeForLayout(layout: layout, sideInset: 0.0)
let itemWidth = floor(fillingWidth / CGFloat(itemsPerRow))
let gridLeftInset = floor((layout.size.width - fillingWidth) / 2.0)
let contentHeight: CGFloat
if let (_, items, _) = self.currentStickerPack {
let rowCount = items.count / itemsPerRow + ((items.count % itemsPerRow) == 0 ? 0 : 1)
contentHeight = itemWidth * CGFloat(rowCount)
} else {
contentHeight = gridFrame.size.height
}
let initialRevealedRowCount: CGFloat = 4.5
let topInset = max(0.0, layout.size.height - floor(initialRevealedRowCount * itemWidth) - insets.top - actionAreaHeight - titleAreaInset)
let gridInsets = UIEdgeInsets(top: insets.top + topInset, left: gridLeftInset, bottom: actionAreaHeight, right: layout.size.width - fillingWidth - gridLeftInset)
let additionalGridBottomInset = max(0.0, gridFrame.size.height - actionAreaHeight - contentHeight)
let gridInsets = UIEdgeInsets(top: insets.top + topInset, left: gridLeftInset, bottom: actionAreaHeight + additionalGridBottomInset, right: layout.size.width - fillingWidth - gridLeftInset)
let firstTime = self.validLayout == nil
self.validLayout = (layout, gridFrame, titleAreaInset, gridInsets)
@ -428,13 +449,6 @@ private final class StickerPackContainer: ASDisplayNode {
var expandProgressTransition = transition
var expandUpdated = false
let modalProgress: CGFloat = unclippedBackgroundY <= minBackgroundY ? 1.0 : 0.0
if abs(self.modalProgress - modalProgress) > CGFloat.ulpOfOne {
self.modalProgress = modalProgress
expandUpdated = true
expandProgressTransition = .animated(duration: 0.3, curve: .easeInOut)
}
if abs(self.expandProgress - expandProgress) > CGFloat.ulpOfOne {
self.expandProgress = expandProgress
expandUpdated = true