mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-17 11:08:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "Fix MessageView"

Browse source 
This reverts commit 4f31af47a3.
This commit is contained in:
Benoit Martins 2023-07-20 10:29:28 +02:00
parent 5113a74839
commit 2789c59c6b
1 changed files with 6 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Classes/Swift/Chat/Views/ChatConversationViewSwift.swift
View file

@ -358,7 +358,7 @@ class ChatConversationViewSwift: BackActionsNavigationView, PHPickerViewControll
ChatConversationViewModel.sharedModel.imageT = []
self.collectionViewMedia.reloadData()
self.collectionViewReply.reloadData()
if messageView.messageText.textColor == UIColor.lightGray || self.messageView.messageText.text.isEmpty{
if self.messageView.messageText.text.isEmpty{
self.messageView.sendButton.isEnabled = false
} else {
self.messageView.sendButton.isEnabled = true
@ -791,18 +791,12 @@ class ChatConversationViewSwift: BackActionsNavigationView, PHPickerViewControll
func sendMessageInMessageField(rootMessage: ChatMessage?) {
if ChatConversationViewModel.sharedModel.sendMessage(message: messageView.messageText.textColor != UIColor.lightGray ? messageView.messageText.text.trimmingCharacters(in: .whitespacesAndNewlines) : "", withExterlBodyUrl: nil, rootMessage: rootMessage) {
if !messageView.messageText.isFirstResponder{
messageView.messageText.textColor = UIColor.lightGray
messageView.messageText.text = "Message"
} else {
messageView.messageText.text = ""
}
if ChatConversationViewModel.sharedModel.sendMessage(message: messageView.messageText.text.trimmingCharacters(in: .whitespacesAndNewlines), withExterlBodyUrl: nil, rootMessage: rootMessage) {
//messageView.messageText.textColor = UIColor.lightGray
messageView.messageText.text = ""
messageView.emojisButton.isHidden = false
messageView.isComposing = false
}
setSendButtonState()
}
func onSendClick() {
@ -876,7 +870,7 @@ class ChatConversationViewSwift: BackActionsNavigationView, PHPickerViewControll
fileTransfer.text = ""
}
fileTransfer.uploadFileContent(forSwift: ChatConversationViewModel.sharedModel.fileContext, urlList: ChatConversationViewModel.sharedModel.mediaURLCollection, for: ChatConversationViewModel.sharedModel.chatRoom?.getCobject, rootMessage: rootMessage?.getCobject)
if fileTransfer.text.isEmpty && !messageView.messageText.isFirstResponder{
if fileTransfer.text.isEmpty {
messageView.messageText.textColor = UIColor.lightGray
messageView.messageText.text = "Message"
messageView.emojisButton.isHidden = false
@ -884,8 +878,6 @@ class ChatConversationViewSwift: BackActionsNavigationView, PHPickerViewControll
messageView.messageText.text = ""
messageView.emojisButton.isHidden = false
}
messageView.sendButton.isEnabled = false
tableControllerSwift.refreshData(isOutgoing: true)
return true
@ -1522,7 +1514,7 @@ class ChatConversationViewSwift: BackActionsNavigationView, PHPickerViewControll
}
func setSendButtonState() {
self.messageView.sendButton.isEnabled = ((ChatConversationViewModel.sharedModel.isPendingVoiceRecord && linphone_recorder_get_duration(ChatConversationViewModel.sharedModel.voiceRecorder?.getCobject) > 0) || (messageView.messageText.textColor != UIColor.lightGray && self.messageView.messageText.text.count > 0) || ChatConversationViewModel.sharedModel.fileContext.count > 0)
self.messageView.sendButton.isEnabled = ((ChatConversationViewModel.sharedModel.isPendingVoiceRecord && linphone_recorder_get_duration(ChatConversationViewModel.sharedModel.voiceRecorder?.getCobject) > 0) || self.messageView.messageText.text.count > 0 || ChatConversationViewModel.sharedModel.fileContext.count > 0)
}
func onvrPlayPauseStop() {