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

Merge commit '384cdf4a946653347c8973041be05d8bfbced0b0'

Browse Source
This commit is contained in:
Peter
2018-10-16 20:20:37 +03:00
parent c5e8eb03c1 384cdf4a94
commit c9fa04a1b4
30 changed files with 2641 additions and 2406 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
TelegramUI/ChatController.swift
View File

@@ -131,8 +131,8 @@ public final class ChatController: TelegramController, KeyShortcutResponder, UIV
private var searchState: (String, SearchMessagesLocation)?
private var recordingModeFeedback: HapticFeedback?
private var recorderFeedback: HapticFeedback?
private var audioRecorderValue: ManagedAudioRecorder?
private var audioRecorderFeedback: HapticFeedback?
private var audioRecorder = Promise<ManagedAudioRecorder?>()
private var audioRecorderDisposable: Disposable?
@@ -1193,7 +1193,7 @@ public final class ChatController: TelegramController, KeyShortcutResponder, UIV
if let audioRecorder = audioRecorder {
if !audioRecorder.beginWithTone {
strongSelf.audioRecorderFeedback?.tap()
strongSelf.recorderFeedback?.impact(.light)
}
audioRecorder.start()
}
@@ -1222,6 +1222,8 @@ public final class ChatController: TelegramController, KeyShortcutResponder, UIV
})
if let videoRecorder = videoRecorder {
strongSelf.recorderFeedback?.impact(.light)
videoRecorder.onDismiss = {
if let strongSelf = self {
strongSelf.videoRecorder.set(.single(nil))
@@ -1765,7 +1767,9 @@ public final class ChatController: TelegramController, KeyShortcutResponder, UIV
})
}
self.chatDisplayNode.sendGif = { [weak self] data in
if let strongSelf = self {
strongSelf.enqueueGifData(data)
}
}
self.chatDisplayNode.updateTypingActivity = { [weak self] value in
if let strongSelf = self, strongSelf.presentationInterfaceState.interfaceState.editMessage == nil {
@@ -3697,6 +3701,22 @@ public final class ChatController: TelegramController, KeyShortcutResponder, UIV
}
}
private func enqueueGifData(_ data: Data) {
self.enqueueMediaMessageDisposable.set((legacyEnqueueGifMessage(account: self.account, data: data) |> deliverOnMainQueue).start(next: { [weak self] message in
if let strongSelf = self {
let replyMessageId = strongSelf.presentationInterfaceState.interfaceState.replyMessageId
strongSelf.chatDisplayNode.setupSendActionOnViewUpdate({
if let strongSelf = self {
strongSelf.updateChatPresentationInterfaceState(animated: true, interactive: false, {
$0.updatedInterfaceState { $0.withUpdatedReplyMessageId(nil) }
})
}
})
strongSelf.sendMessages([message].map { $0.withUpdatedReplyToMessageId(replyMessageId) })
}
}))
}
private func enqueueChatContextResult(_ results: ChatContextResultCollection, _ result: ChatContextResult) {
guard case let .peer(peerId) = self.chatLocation else {
return
@@ -3745,9 +3765,9 @@ public final class ChatController: TelegramController, KeyShortcutResponder, UIV
private func requestAudioRecorder(beginWithTone: Bool) {
if self.audioRecorderValue == nil {
if let applicationContext = self.account.applicationContext as? TelegramApplicationContext {
if self.audioRecorderFeedback == nil {
self.audioRecorderFeedback = HapticFeedback()
self.audioRecorderFeedback?.prepareTap()
if self.recorderFeedback == nil {
self.recorderFeedback = HapticFeedback()
self.recorderFeedback?.prepareImpact(.light)
}
if let mediaManager = applicationContext.mediaManager {
@@ -3765,6 +3785,11 @@ public final class ChatController: TelegramController, KeyShortcutResponder, UIV
if self.videoRecorderValue == nil {
if let currentInputPanelFrame = self.chatDisplayNode.currentInputPanelFrame() {
if self.recorderFeedback == nil {
self.recorderFeedback = HapticFeedback()
self.recorderFeedback?.prepareImpact(.light)
}
self.videoRecorder.set(.single(legacyInstantVideoController(theme: self.presentationData.theme, panelFrame: currentInputPanelFrame, account: self.account, peerId: peerId, send: { [weak self] message in
if let strongSelf = self {
let replyMessageId = strongSelf.presentationInterfaceState.interfaceState.replyMessageId
@@ -3793,8 +3818,8 @@ public final class ChatController: TelegramController, KeyShortcutResponder, UIV
let _ = (audioRecorderValue.takenRecordedData() |> deliverOnMainQueue).start(next: { [weak self] data in
if let strongSelf = self, let data = data {
if data.duration < 0.5 {
strongSelf.audioRecorderFeedback?.error()
strongSelf.audioRecorderFeedback = nil
strongSelf.recorderFeedback?.error()
strongSelf.recorderFeedback = nil
} else if let waveform = data.waveform {
var randomId: Int64 = 0
arc4random_buf(&randomId, 8)
@@ -3806,7 +3831,7 @@ public final class ChatController: TelegramController, KeyShortcutResponder, UIV
strongSelf.updateChatPresentationInterfaceState(animated: true, interactive: true, {
$0.updatedRecordedMediaPreview(ChatRecordedMediaPreview(resource: resource, duration: Int32(data.duration), fileSize: Int32(data.compressedData.count), waveform: AudioWaveform(bitstream: waveform, bitsPerSample: 5)))
})
strongSelf.audioRecorderFeedback = nil
strongSelf.recorderFeedback = nil
}
}
})
@@ -3814,8 +3839,8 @@ public final class ChatController: TelegramController, KeyShortcutResponder, UIV
let _ = (audioRecorderValue.takenRecordedData() |> deliverOnMainQueue).start(next: { [weak self] data in
if let strongSelf = self, let data = data {
if data.duration < 0.5 {
strongSelf.audioRecorderFeedback?.error()
strongSelf.audioRecorderFeedback = nil
strongSelf.recorderFeedback?.error()
strongSelf.recorderFeedback = nil
} else {
var randomId: Int64 = 0
arc4random_buf(&randomId, 8)
@@ -3839,8 +3864,8 @@ public final class ChatController: TelegramController, KeyShortcutResponder, UIV
strongSelf.sendMessages([.message(text: "", attributes: [], mediaReference: .standalone(media: TelegramMediaFile(fileId: MediaId(namespace: Namespaces.Media.LocalFile, id: randomId), partialReference: nil, resource: resource, previewRepresentations: [], mimeType: "audio/ogg", size: data.compressedData.count, attributes: [.Audio(isVoice: true, duration: Int(data.duration), title: nil, performer: nil, waveform: waveformBuffer)])), replyToMessageId: strongSelf.presentationInterfaceState.interfaceState.replyMessageId, localGroupingKey: nil)])
strongSelf.audioRecorderFeedback?.tap()
strongSelf.audioRecorderFeedback = nil
strongSelf.recorderFeedback?.tap()
strongSelf.recorderFeedback = nil
}
}
})