forked from mirrors/linphone-iphone
Fix MessageView
This commit is contained in:
parent
946b9e7a6b
commit
197c1b3cdf
1 changed files with 14 additions and 6 deletions
|
|
@ -358,7 +358,7 @@ class ChatConversationViewSwift: BackActionsNavigationView, PHPickerViewControll
|
|||
ChatConversationViewModel.sharedModel.imageT = []
|
||||
self.collectionViewMedia.reloadData()
|
||||
self.collectionViewReply.reloadData()
|
||||
if self.messageView.messageText.text.isEmpty{
|
||||
if messageView.messageText.textColor == UIColor.lightGray || self.messageView.messageText.text.isEmpty{
|
||||
self.messageView.sendButton.isEnabled = false
|
||||
} else {
|
||||
self.messageView.sendButton.isEnabled = true
|
||||
|
|
@ -791,12 +791,18 @@ class ChatConversationViewSwift: BackActionsNavigationView, PHPickerViewControll
|
|||
|
||||
|
||||
func sendMessageInMessageField(rootMessage: ChatMessage?) {
|
||||
if ChatConversationViewModel.sharedModel.sendMessage(message: messageView.messageText.text.trimmingCharacters(in: .whitespacesAndNewlines), withExterlBodyUrl: nil, rootMessage: rootMessage) {
|
||||
//messageView.messageText.textColor = UIColor.lightGray
|
||||
messageView.messageText.text = ""
|
||||
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 = ""
|
||||
}
|
||||
messageView.emojisButton.isHidden = false
|
||||
messageView.isComposing = false
|
||||
}
|
||||
|
||||
setSendButtonState()
|
||||
}
|
||||
|
||||
func onSendClick() {
|
||||
|
|
@ -870,7 +876,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 {
|
||||
if fileTransfer.text.isEmpty && !messageView.messageText.isFirstResponder{
|
||||
messageView.messageText.textColor = UIColor.lightGray
|
||||
messageView.messageText.text = "Message"
|
||||
messageView.emojisButton.isHidden = false
|
||||
|
|
@ -878,6 +884,8 @@ class ChatConversationViewSwift: BackActionsNavigationView, PHPickerViewControll
|
|||
messageView.messageText.text = ""
|
||||
messageView.emojisButton.isHidden = false
|
||||
}
|
||||
|
||||
messageView.sendButton.isEnabled = false
|
||||
|
||||
tableControllerSwift.refreshData(isOutgoing: true)
|
||||
return true
|
||||
|
|
@ -1514,7 +1522,7 @@ class ChatConversationViewSwift: BackActionsNavigationView, PHPickerViewControll
|
|||
}
|
||||
|
||||
func setSendButtonState() {
|
||||
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)
|
||||
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)
|
||||
}
|
||||
|
||||
func onvrPlayPauseStop() {
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue