Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Improved typing performances

Browse source
This commit is contained in:
Sylvain Berfini 2020-04-02 16:27:08 +02:00
parent a8b057c05a
commit e96d073ff0
2 changed files with 23 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/org/linphone/activities/main/chat/fragments/DetailChatRoomFragment.kt
View file

@ -129,6 +129,10 @@ class DetailChatRoomFragment : MasterFragment() {
} }
binding.chatMessagesList.addOnScrollListener(chatScrollListener) binding.chatMessagesList.addOnScrollListener(chatScrollListener)
chatSendingViewModel.textToSend.observe(viewLifecycleOwner, Observer {
chatSendingViewModel.onTextToSendChanged(it)
})
listViewModel.events.observe(viewLifecycleOwner, Observer { events -> listViewModel.events.observe(viewLifecycleOwner, Observer { events ->
adapter.submitList(events) adapter.submitList(events)
}) })

38
app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatMessageSendingViewModel.kt
View file

@ -47,21 +47,7 @@ class ChatMessageSendingViewModel(private val chatRoom: ChatRoom) : ViewModel()
val isReadOnly = MutableLiveData<Boolean>() val isReadOnly = MutableLiveData<Boolean>()
var textToSend: String = "" var textToSend = MutableLiveData<String>()
set(value) {
sendMessageEnabled.value = value.isNotEmpty() || attachments.value?.isNotEmpty() ?: false
if (value.isNotEmpty()) {
if (!corePreferences.allowMultipleFilesAndTextInSameMessage) {
attachFileEnabled.value = false
}
chatRoom.compose()
} else {
if (!corePreferences.allowMultipleFilesAndTextInSameMessage) {
attachFileEnabled.value = attachments.value?.isEmpty() ?: true
}
}
field = value
}
init { init {
attachments.value = arrayListOf() attachments.value = arrayListOf()
@ -71,6 +57,20 @@ class ChatMessageSendingViewModel(private val chatRoom: ChatRoom) : ViewModel()
isReadOnly.value = chatRoom.hasBeenLeft() isReadOnly.value = chatRoom.hasBeenLeft()
} }
fun onTextToSendChanged(value: String) {
sendMessageEnabled.value = value.isNotEmpty() || attachments.value?.isNotEmpty() ?: false
if (value.isNotEmpty()) {
if (attachFileEnabled.value == true && !corePreferences.allowMultipleFilesAndTextInSameMessage) {
attachFileEnabled.value = false
}
chatRoom.compose()
} else {
if (!corePreferences.allowMultipleFilesAndTextInSameMessage) {
attachFileEnabled.value = attachments.value?.isEmpty() ?: true
}
}
}
fun addAttachment(path: String) { fun addAttachment(path: String) {
val list = arrayListOf<ChatMessageAttachmentViewModel>() val list = arrayListOf<ChatMessageAttachmentViewModel>()
list.addAll(attachments.value.orEmpty()) list.addAll(attachments.value.orEmpty())
@ -79,7 +79,7 @@ class ChatMessageSendingViewModel(private val chatRoom: ChatRoom) : ViewModel()
}) })
attachments.value = list attachments.value = list
sendMessageEnabled.value = textToSend.isNotEmpty() || list.isNotEmpty() sendMessageEnabled.value = textToSend.value.orEmpty().isNotEmpty() || list.isNotEmpty()
if (!corePreferences.allowMultipleFilesAndTextInSameMessage) { if (!corePreferences.allowMultipleFilesAndTextInSameMessage) {
attachFileEnabled.value = false attachFileEnabled.value = false
} }
@ -91,7 +91,7 @@ class ChatMessageSendingViewModel(private val chatRoom: ChatRoom) : ViewModel()
list.remove(attachment) list.remove(attachment)
attachments.value = list attachments.value = list
sendMessageEnabled.value = textToSend.isNotEmpty() || list.isNotEmpty() sendMessageEnabled.value = textToSend.value.orEmpty().isNotEmpty() || list.isNotEmpty()
if (!corePreferences.allowMultipleFilesAndTextInSameMessage) { if (!corePreferences.allowMultipleFilesAndTextInSameMessage) {
attachFileEnabled.value = list.isEmpty() attachFileEnabled.value = list.isEmpty()
} }
@ -101,8 +101,8 @@ class ChatMessageSendingViewModel(private val chatRoom: ChatRoom) : ViewModel()
val isBasicChatRoom: Boolean = chatRoom.hasCapability(ChatRoomCapabilities.Basic.toInt()) val isBasicChatRoom: Boolean = chatRoom.hasCapability(ChatRoomCapabilities.Basic.toInt())
val message: ChatMessage = chatRoom.createEmptyMessage() val message: ChatMessage = chatRoom.createEmptyMessage()
if (textToSend.isNotEmpty()) { if (textToSend.value.orEmpty().isNotEmpty()) {
message.addTextContent(textToSend) message.addTextContent(textToSend.value)
} }
for (attachment in attachments.value.orEmpty()) { for (attachment in attachments.value.orEmpty()) {