From f74976f563e3fb392618372b19a7218c13116441 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Wed, 13 Nov 2024 17:14:06 +0100 Subject: [PATCH] Show forward icon in front of conversation last message if it has been forwarded --- .../ui/main/chat/model/ConversationModel.kt | 3 +++ app/src/main/res/layout/chat_list_cell.xml | 18 ++++++++++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/linphone/ui/main/chat/model/ConversationModel.kt b/app/src/main/java/org/linphone/ui/main/chat/model/ConversationModel.kt index c23669a3e..3f1da5cf2 100644 --- a/app/src/main/java/org/linphone/ui/main/chat/model/ConversationModel.kt +++ b/app/src/main/java/org/linphone/ui/main/chat/model/ConversationModel.kt @@ -77,6 +77,8 @@ class ConversationModel @WorkerThread constructor(val chatRoom: ChatRoom) { val lastMessageIcon = MutableLiveData() + val isLastMessageForwarded = MutableLiveData() + val isLastMessageOutgoing = MutableLiveData() val dateTime = MutableLiveData() @@ -290,6 +292,7 @@ class ConversationModel @WorkerThread constructor(val chatRoom: ChatRoom) { if (isOutgoing) { lastMessageIcon.postValue(LinphoneUtils.getChatIconResId(message.state)) } + isLastMessageForwarded.postValue(message.isForward) } @WorkerThread diff --git a/app/src/main/res/layout/chat_list_cell.xml b/app/src/main/res/layout/chat_list_cell.xml index 0e81426ae..3a43995ce 100644 --- a/app/src/main/res/layout/chat_list_cell.xml +++ b/app/src/main/res/layout/chat_list_cell.xml @@ -93,10 +93,24 @@ android:visibility="@{model.lastMessageTextSender.length() > 0 ? View.VISIBLE : View.GONE}" textFont="@{model.isBeingDeleted || model.unreadMessageCount > 0 || model.isComposing ? NotoSansFont.NotoSansBold : NotoSansFont.NotoSansRegular}" app:layout_constraintStart_toStartOf="@id/title" - app:layout_constraintEnd_toStartOf="@id/last_message_or_composing" + app:layout_constraintEnd_toStartOf="@id/last_message_forward" app:layout_constraintTop_toBottomOf="@id/title" app:layout_constraintBottom_toTopOf="@id/separator"/> + +