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

Various fixes

Browse Source
This commit is contained in:
Ilya Laktyushin
2025-05-05 18:42:51 +04:00
parent fa46338010
commit ee38ee55d4
18 changed files with 389 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
submodules/TelegramUI/Components/CameraScreen/Sources/CameraScreen.swift
View File

@@ -3630,7 +3630,13 @@ public class CameraScreenImpl: ViewController, CameraScreen {
self.node.resumeCameraCapture(fromGallery: true)
}
var dismissControllerImpl: (() -> Void)?
class DismissArgs {
var resumeOnDismiss = true
}
var dismissControllerImpl: ((Bool) -> Void)?
let dismissArgs = DismissArgs()
let controller: ViewController
if let current = self.galleryController {
controller = current
@@ -3686,7 +3692,7 @@ public class CameraScreenImpl: ViewController, CameraScreen {
}
}
dismissControllerImpl?()
dismissControllerImpl?(true)
} else {
stopCameraCapture()
@@ -3759,17 +3765,19 @@ public class CameraScreenImpl: ViewController, CameraScreen {
self.node.collage?.addResults(signals: results)
}
} else {
self.node.animateOutToEditor()
if let assets = results as? [PHAsset] {
self.completion(.single(.assets(assets)), nil, self.remainingStoryCount, {
})
}
}
self.galleryController = nil
dismissControllerImpl?()
dismissControllerImpl?(false)
}, dismissed: { [weak self] in
resumeCameraCapture()
if dismissArgs.resumeOnDismiss {
resumeCameraCapture()
}
if let self {
self.node.hasGallery = false
self.node.requestUpdateLayout(transition: .immediate)
@@ -3780,7 +3788,8 @@ public class CameraScreenImpl: ViewController, CameraScreen {
)
self.galleryController = controller
dismissControllerImpl = { [weak controller] in
dismissControllerImpl = { [weak controller] resume in
dismissArgs.resumeOnDismiss = resume
controller?.dismiss(animated: true)
}
}