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

Various improvements

Browse Source
This commit is contained in:
Ilya Laktyushin
2024-11-29 00:28:50 +04:00
parent 6b528aa70f
commit c4013c3df6
22 changed files with 335 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1020,6 +1020,7 @@ private final class CameraScreenComponent: CombinedComponent {
hasAccess: hasAllRequiredAccess,
hideControls: component.cameraState.collageProgress > 1.0 - .ulpOfOne,
collageProgress: component.cameraState.collageProgress,
collageCount: component.cameraState.isCollageEnabled ? component.cameraState.collageGrid.count : nil,
tintColor: controlsTintColor,
shutterState: shutterState,
lastGalleryAsset: state.lastGalleryAsset,
@@ -1683,6 +1684,7 @@ public class CameraScreenImpl: ViewController, CameraScreen {
fileprivate var additionalPreviewView: CameraSimplePreviewView
fileprivate let previewBlurView: BlurView
fileprivate let mainPreviewBlurView: BlurView
private var mainPreviewSnapshotView: UIView?
private var additionalPreviewSnapshotView: UIView?
fileprivate let previewFrameLeftDimView: UIView
@@ -1795,6 +1797,9 @@ public class CameraScreenImpl: ViewController, CameraScreen {
self.previewBlurView = BlurView()
self.previewBlurView.isUserInteractionEnabled = false
self.mainPreviewBlurView = BlurView()
self.mainPreviewBlurView.isUserInteractionEnabled = false
var isDualCameraEnabled = Camera.isDualCameraSupported(forRoundVideo: false)
if isDualCameraEnabled {
if let isDualCameraEnabledValue = UserDefaults.standard.object(forKey: "TelegramStoryCameraIsDualEnabled") as? NSNumber {
@@ -2122,9 +2127,17 @@ public class CameraScreenImpl: ViewController, CameraScreen {
}
}
if case .position = modeChange {
UIView.transition(with: self.previewContainerView, duration: 0.4, options: [.transitionFlipFromLeft, .curveEaseOut], animations: {
self.previewBlurView.effect = UIBlurEffect(style: .dark)
})
if self.cameraState.isCollageEnabled {
self.mainPreviewBlurView.frame = self.mainPreviewContainerView.bounds
self.mainPreviewContainerView.addSubview(self.mainPreviewBlurView)
UIView.transition(with: self.mainPreviewContainerView, duration: 0.4, options: [.transitionFlipFromLeft, .curveEaseOut], animations: {
self.mainPreviewBlurView.effect = UIBlurEffect(style: .dark)
})
} else {
UIView.transition(with: self.previewContainerView, duration: 0.4, options: [.transitionFlipFromLeft, .curveEaseOut], animations: {
self.previewBlurView.effect = UIBlurEffect(style: .dark)
})
}
} else {
self.previewContainerView.insertSubview(self.previewBlurView, belowSubview: self.additionalPreviewContainerView)
@@ -2137,6 +2150,13 @@ public class CameraScreenImpl: ViewController, CameraScreen {
self.previewBlurView.effect = UIBlurEffect(style: .dark)
}
} else {
if self.mainPreviewBlurView.effect != nil {
UIView.animate(withDuration: 0.4, animations: {
self.mainPreviewBlurView.effect = nil
}, completion: { _ in
self.mainPreviewBlurView.removeFromSuperview()
})
}
if self.previewBlurView.effect != nil {
UIView.animate(withDuration: 0.4, animations: {
self.previewBlurView.effect = nil
@@ -2971,7 +2991,7 @@ public class CameraScreenImpl: ViewController, CameraScreen {
}
self.updatingCollageProgress = true
self.controller?.updateCameraState({ state in
return state.updatedCollageProgress(collageState.progress)
return state.updatedCollageProgress(collageState.innerProgress)
}, transition: .spring(duration: 0.3))
self.updatingCollageProgress = false
})