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

Open keyboard on reply, scroll to latest message when keyboard is opened, removed onNewEvents causing duplicated messages, fixed latest message display when adding new ones that should be grouped with it

Browse source
This commit is contained in:
Sylvain Berfini 2023-11-20 11:21:54 +01:00
parent ed23268672
commit c2eccd23a8
2 changed files with 46 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationFragment.kt
View file

@ -451,6 +451,9 @@ class ConversationFragment : GenericFragment() {
binding.root.setKeyboardInsetListener { keyboardVisible ->
if (keyboardVisible) {
sendMessageViewModel.isEmojiPickerOpen.value = false
// Scroll to bottom when keyboard is opened so latest message is visible
binding.eventsList.scrollToPosition(adapter.itemCount - 1)
}
}
}
@ -549,6 +552,9 @@ class ConversationFragment : GenericFragment() {
Log.i("$TAG Updating sending area to reply to selected message")
sendMessageViewModel.replyToMessage(chatMessageModel)
dialog.dismiss()
// Open keyboard & focus edit text
binding.sendArea.messageToSend.showKeyboard()
}
layout.model = chatMessageModel

85
app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationViewModel.kt
View file

@ -99,34 +99,26 @@ class ConversationViewModel @UiThread constructor() : ViewModel() {
val list = arrayListOf<EventLogModel>()
list.addAll(events.value.orEmpty())
val avatarModel = coreContext.contactsManager.getContactAvatarModelForAddress(
message?.localAddress
)
val lastEvent = events.value.orEmpty().lastOrNull()
val group = if (lastEvent != null) {
shouldWeGroupTwoEvents(eventLog, lastEvent.eventLog)
} else {
false
}
list.add(
EventLogModel(
eventLog,
avatarModel,
LinphoneUtils.isChatRoomAGroup(chatRoom),
group,
true,
{ file ->
fileToDisplayEvent.postValue(Event(file))
},
{ conferenceUri ->
conferenceToJoinEvent.postValue(Event(conferenceUri))
},
{ url ->
openWebBrowserEvent.postValue(Event(url))
}
if (lastEvent != null && shouldWeGroupTwoEvents(eventLog, lastEvent.eventLog)) {
list.remove(lastEvent)
val eventsLogsArray = arrayOf<EventLog>()
eventsLogsArray[0] = lastEvent.eventLog
eventsLogsArray[1] = eventLog
val newList = getEventsListFromHistory(
eventsLogsArray,
searchFilter.value.orEmpty().trim()
)
)
list.addAll(newList)
} else {
val newList = getEventsListFromHistory(
arrayOf(eventLog),
searchFilter.value.orEmpty().trim()
)
list.addAll(newList)
}
events.postValue(list)
}
@ -157,29 +149,32 @@ class ConversationViewModel @UiThread constructor() : ViewModel() {
val list = arrayListOf<EventLogModel>()
list.addAll(events.value.orEmpty())
val lastEvent = list.lastOrNull()
val newList = getEventsListFromHistory(
eventLogs,
searchFilter.value.orEmpty().trim()
)
list.addAll(newList)
if (lastEvent != null && shouldWeGroupTwoEvents(eventLogs.first(), lastEvent.eventLog)) {
list.remove(lastEvent)
// TODO: handle case when first one of the newly received messages should be grouped with last one of the current list
val eventsLogsArray = arrayOf<EventLog>()
eventsLogsArray[0] = lastEvent.eventLog
var index = 1
for (eventLog in eventLogs) {
eventsLogsArray[index] = eventLog
index += 1
}
events.postValue(list)
}
@WorkerThread
override fun onNewEvents(chatRoom: ChatRoom, eventLogs: Array<out EventLog>) {
Log.i("$TAG Adding [${eventLogs.size}] new events")
val list = arrayListOf<EventLogModel>()
list.addAll(events.value.orEmpty())
val fakeFriend = chatRoom.core.createFriend()
val avatarModel = ContactAvatarModel(fakeFriend)
for (eventLog in eventLogs) {
Log.i("$TAG New event [${eventLog.type}] added")
list.add(EventLogModel(eventLog, avatarModel))
val newList = getEventsListFromHistory(
eventsLogsArray,
searchFilter.value.orEmpty().trim()
)
list.addAll(newList)
} else {
val newList = getEventsListFromHistory(
eventLogs,
searchFilter.value.orEmpty().trim()
)
list.addAll(newList)
}
events.postValue(list)
}