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

Various fixes

Browse Source
This commit is contained in:
Ilya Laktyushin
2024-06-28 17:45:00 +04:00
parent ed8f1b35e9
commit 9d3cc5996b
12 changed files with 66 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
submodules/TelegramUI/Components/MinimizedContainer/Sources/MinimizedContainer.swift
View File

@@ -212,7 +212,9 @@ public class MinimizedContainerImpl: ASDisplayNode, MinimizedContainer, ASScroll
topInset += 10.0
}
self.containerNode.frame = CGRect(origin: .zero, size: size)
self.containerNode.subnodeTransform = CATransform3DMakeTranslation(0.0, -topInset, 0.0)
if let _ = self.item.controller.minimizedTopEdgeOffset {
self.containerNode.subnodeTransform = CATransform3DMakeTranslation(0.0, -topInset, 0.0)
}
self.snapshotContainerView.frame = CGRect(origin: .zero, size: size)
@@ -234,11 +236,15 @@ public class MinimizedContainerImpl: ASDisplayNode, MinimizedContainer, ASScroll
var requiresBlur = false
var blurFrame = snapshotFrame
if snapshotView.frame.width * 1.1 < size.width {
snapshotFrame = snapshotFrame.offsetBy(dx: 0.0, dy: -66.0)
if let _ = self.item.controller.minimizedTopEdgeOffset {
snapshotFrame = snapshotFrame.offsetBy(dx: 0.0, dy: -66.0)
}
blurFrame = CGRect(origin: CGPoint(x: 0.0, y: snapshotFrame.minY), size: CGSize(width: size.width, height: snapshotFrame.height))
requiresBlur = true
} else if snapshotView.frame.width > size.width * 1.5 {
snapshotFrame = snapshotFrame.offsetBy(dx: 0.0, dy: 66.0)
if let _ = self.item.controller.minimizedTopEdgeOffset {
snapshotFrame = snapshotFrame.offsetBy(dx: 0.0, dy: 66.0)
}
blurFrame = CGRect(origin: CGPoint(x: floorToScreenPixels((size.width - snapshotView.frame.width) / 2.0), y: snapshotFrame.minY), size: CGSize(width: snapshotFrame.width, height: size.height))
requiresBlur = true
}
@@ -282,7 +288,7 @@ public class MinimizedContainerImpl: ASDisplayNode, MinimizedContainer, ASScroll
private var presentationData: PresentationData
private var presentationDataDisposable: Disposable?
var isExpanded: Bool = false
public private(set) var isExpanded: Bool = false
public var willMaximize: (() -> Void)?
private let bottomEdgeView: UIImageView
@@ -552,6 +558,12 @@ public class MinimizedContainerImpl: ASDisplayNode, MinimizedContainer, ASScroll
self.requestUpdate(transition: .animated(duration: 0.4, curve: .spring))
}
}
public func collapse() {
self.isExpanded = false
self.currentTransition = .collapse
self.requestUpdate(transition: .animated(duration: 0.4, curve: .spring))
}
public func scrollViewDidScroll(_ scrollView: UIScrollView) {
guard self.isExpanded, let layout = self.validLayout else {
@@ -824,7 +836,10 @@ public class MinimizedContainerImpl: ASDisplayNode, MinimizedContainer, ASScroll
itemNode.animateIn()
var initialOffset = insets.top + itemNode.item.controller.minimizedTopEdgeOffset
var initialOffset = insets.top
if let minimizedTopEdgeOffset = itemNode.item.controller.minimizedTopEdgeOffset {
initialOffset += minimizedTopEdgeOffset
}
if layout.size.width < layout.size.height {
initialOffset += 10.0
}