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

Video message recording improvements

Browse Source
This commit is contained in:
Ilya Laktyushin 2024-01-14 18:21:09 +04:00
parent 42421342b8
commit 3f6ac92df7
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
submodules/TelegramUI/Components/VideoMessageCameraScreen/Sources/VideoMessageCameraScreen.swift
View File

@ -79,6 +79,7 @@ private final class VideoMessageCameraScreenComponent: CombinedComponent {
let previewFrame: CGRect let previewFrame: CGRect
let isPreviewing: Bool let isPreviewing: Bool
let isMuted: Bool let isMuted: Bool
let totalDuration: Double
let getController: () -> VideoMessageCameraScreen? let getController: () -> VideoMessageCameraScreen?
let present: (ViewController) -> Void let present: (ViewController) -> Void
let push: (ViewController) -> Void let push: (ViewController) -> Void
@ -92,6 +93,7 @@ private final class VideoMessageCameraScreenComponent: CombinedComponent {
previewFrame: CGRect, previewFrame: CGRect,
isPreviewing: Bool, isPreviewing: Bool,
isMuted: Bool, isMuted: Bool,
totalDuration: Double,
getController: @escaping () -> VideoMessageCameraScreen?, getController: @escaping () -> VideoMessageCameraScreen?,
present: @escaping (ViewController) -> Void, present: @escaping (ViewController) -> Void,
push: @escaping (ViewController) -> Void, push: @escaping (ViewController) -> Void,
@ -104,6 +106,7 @@ private final class VideoMessageCameraScreenComponent: CombinedComponent {
self.previewFrame = previewFrame self.previewFrame = previewFrame
self.isPreviewing = isPreviewing self.isPreviewing = isPreviewing
self.isMuted = isMuted self.isMuted = isMuted
self.totalDuration = totalDuration
self.getController = getController self.getController = getController
self.present = present self.present = present
self.push = push self.push = push
@ -128,6 +131,9 @@ private final class VideoMessageCameraScreenComponent: CombinedComponent {
if lhs.isMuted != rhs.isMuted { if lhs.isMuted != rhs.isMuted {
return false return false
} }
if lhs.totalDuration != rhs.totalDuration {
return false
}
return true return true
} }
@ -327,9 +333,12 @@ private final class VideoMessageCameraScreenComponent: CombinedComponent {
var showRecordMore = false var showRecordMore = false
if component.isPreviewing { if component.isPreviewing {
showViewOnce = true showViewOnce = true
if component.totalDuration < 59.0 {
showRecordMore = true showRecordMore = true
viewOnceOffset = 67.0 viewOnceOffset = 67.0
} else {
viewOnceOffset = 14.0
}
} else if case .handsFree = component.cameraState.recording { } else if case .handsFree = component.cameraState.recording {
showViewOnce = true showViewOnce = true
} }
@ -1038,7 +1047,10 @@ public class VideoMessageCameraScreen: ViewController {
self.didAppear() self.didAppear()
} }
let backgroundFrame = CGRect(origin: .zero, size: CGSize(width: layout.size.width, height: controller.inputPanelFrame.minY)) var backgroundFrame = CGRect(origin: .zero, size: CGSize(width: layout.size.width, height: controller.inputPanelFrame.minY))
if backgroundFrame.maxY < layout.size.height - 100.0 && (layout.inputHeight ?? 0.0).isZero {
backgroundFrame = CGRect(origin: .zero, size: CGSize(width: layout.size.width, height: layout.size.height - layout.intrinsicInsets.bottom - controller.inputPanelFrame.height))
}
transition.setPosition(view: self.backgroundView, position: backgroundFrame.center) transition.setPosition(view: self.backgroundView, position: backgroundFrame.center)
transition.setBounds(view: self.backgroundView, bounds: CGRect(origin: .zero, size: backgroundFrame.size)) transition.setBounds(view: self.backgroundView, bounds: CGRect(origin: .zero, size: backgroundFrame.size))
@ -1084,6 +1096,7 @@ public class VideoMessageCameraScreen: ViewController {
previewFrame: previewFrame, previewFrame: previewFrame,
isPreviewing: self.previewState != nil || self.transitioningToPreview, isPreviewing: self.previewState != nil || self.transitioningToPreview,
isMuted: self.previewState?.isMuted ?? true, isMuted: self.previewState?.isMuted ?? true,
totalDuration: self.previewState?.composition.duration.seconds ?? 0.0,
getController: { [weak self] in getController: { [weak self] in
return self?.controller return self?.controller
}, },

3
submodules/TelegramUI/Sources/ChatController.swift
View File

@ -15342,7 +15342,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
func deactivateRaiseGesture() { func deactivateRaiseGesture() {
self.raiseToListenActivateRecordingTimer?.invalidate() self.raiseToListenActivateRecordingTimer?.invalidate()
self.raiseToListenActivateRecordingTimer = nil self.raiseToListenActivateRecordingTimer = nil
self.dismissMediaRecorder(.preview) self.dismissMediaRecorder(.pause)
} }
func requestAudioRecorder(beginWithTone: Bool) { func requestAudioRecorder(beginWithTone: Bool) {
@ -15671,6 +15671,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
self.videoRecorder.set(.single(nil)) self.videoRecorder.set(.single(nil))
} }
self.recorderDataDisposable.set(nil)
self.chatDisplayNode.updateRecordedMediaDeleted(true) self.chatDisplayNode.updateRecordedMediaDeleted(true)
self.updateChatPresentationInterfaceState(animated: true, interactive: true, { self.updateChatPresentationInterfaceState(animated: true, interactive: true, {
$0.updatedRecordedMediaPreview(nil) $0.updatedRecordedMediaPreview(nil)