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

Cherry-pick various fixes

Browse Source
This commit is contained in:
Ilya Laktyushin
2022-03-22 18:22:49 +04:00
parent 702f254783
commit 000b1c7339
40 changed files with 2213 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
submodules/AttachmentUI/Sources/AttachmentController.swift
View File

@@ -279,6 +279,9 @@ public class AttachmentController: ViewController {
}
@objc func dimTapGesture(_ recognizer: UITapGestureRecognizer) {
guard !self.isDismissing else {
return
}
if case .ended = recognizer.state {
if let controller = self.currentControllers.last {
controller.requestDismiss(completion: { [weak self] in
@@ -436,9 +439,9 @@ public class AttachmentController: ViewController {
self.animating = true
if case .regular = layout.metrics.widthClass {
self.layer.allowsGroupOpacity = true
self.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.3, removeOnCompletion: false, completion: { _ in
let _ = self.container.dismiss(transition: .immediate, completion: completion)
self.animating = false
self.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.3, removeOnCompletion: false, completion: { [weak self] _ in
let _ = self?.container.dismiss(transition: .immediate, completion: completion)
self?.animating = false
})
} else {
let positionTransition: ContainedViewLayoutTransition = .animated(duration: 0.25, curve: .easeInOut)
@@ -515,7 +518,6 @@ public class AttachmentController: ViewController {
self.wrapperNode.view.mask = nil
}
let isEffecitvelyCollapsedUpdated = (self.selectionCount > 0) != (self.panel.isSelecting)
let panelHeight = self.panel.update(layout: containerLayout, buttons: self.controller?.buttons ?? [], isSelecting: self.selectionCount > 0, transition: transition)
var panelTransition = transition
@@ -583,6 +585,10 @@ public class AttachmentController: ViewController {
}
}
deinit {
print()
}
public required init(coder aDecoder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
@@ -596,11 +602,15 @@ public class AttachmentController: ViewController {
self.displayNodeDidLoad()
}
public func _dismiss() {
super.dismiss(animated: false, completion: {})
}
public override func dismiss(animated flag: Bool, completion: (() -> Void)? = nil) {
self.view.endEditing(true)
if flag {
self.node.animateOut(completion: {
super.dismiss(animated: false, completion: {})
self.node.animateOut(completion: { [weak self] in
self?._dismiss()
completion?()
})
} else {