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

Merge branch 'master' into experimental-2

Browse Source
This commit is contained in:
Ali
2021-08-05 01:44:20 +02:00
parent e3f307925e 31bc746984
commit d6446a284b
778 changed files with 11584 additions and 4657 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
submodules/InstantPageUI/Sources/InstantPageControllerNode.swift
View File

@@ -544,7 +544,7 @@ final class InstantPageControllerNode: ASDisplayNode, UIScrollViewDelegate {
var itemNode = self.visibleItemsWithNodes[itemIndex]
if let currentItemNode = itemNode {
if !item.matchesNode(currentItemNode) {
(currentItemNode as! ASDisplayNode).removeFromSupernode()
currentItemNode.removeFromSupernode()
self.visibleItemsWithNodes.removeValue(forKey: itemIndex)
itemNode = nil
}
@@ -619,9 +619,9 @@ final class InstantPageControllerNode: ASDisplayNode, UIScrollViewDelegate {
}
}
} else {
if (itemNode as! ASDisplayNode).frame != itemFrame {
transition.updateFrame(node: (itemNode as! ASDisplayNode), frame: itemFrame)
itemNode?.updateLayout(size: itemFrame.size, transition: transition)
if let itemNode = itemNode, itemNode.frame != itemFrame {
transition.updateFrame(node: itemNode, frame: itemFrame)
itemNode.updateLayout(size: itemFrame.size, transition: transition)
}
}
@@ -689,9 +689,9 @@ final class InstantPageControllerNode: ASDisplayNode, UIScrollViewDelegate {
for (index, itemNode) in self.visibleItemsWithNodes {
if !visibleItemIndices.contains(index) {
removeItemIndices.append(index)
(itemNode as! ASDisplayNode).removeFromSupernode()
itemNode.removeFromSupernode()
} else {
var itemFrame = (itemNode as! ASDisplayNode).frame
var itemFrame = itemNode.frame
let itemThreshold: CGFloat = 200.0
itemFrame.origin.y -= itemThreshold
itemFrame.size.height += itemThreshold * 2.0
@@ -725,7 +725,6 @@ final class InstantPageControllerNode: ASDisplayNode, UIScrollViewDelegate {
}
let bounds = self.scrollNode.view.bounds
let contentOffset = self.scrollNode.view.contentOffset
let maxBarHeight: CGFloat
let minBarHeight: CGFloat
@@ -741,7 +740,7 @@ final class InstantPageControllerNode: ASDisplayNode, UIScrollViewDelegate {
minBarHeight = 20.0
}
var transition: ContainedViewLayoutTransition = .immediate
let transition: ContainedViewLayoutTransition = .immediate
var navigationBarFrame = self.navigationBar.frame
navigationBarFrame.size.width = bounds.size.width
if navigationBarFrame.size.height.isZero {