diff --git a/app/src/main/java/org/linphone/ui/main/chat/model/EventLogModel.kt b/app/src/main/java/org/linphone/ui/main/chat/model/EventLogModel.kt index a1ecfac89..82adb0c36 100644 --- a/app/src/main/java/org/linphone/ui/main/chat/model/EventLogModel.kt +++ b/app/src/main/java/org/linphone/ui/main/chat/model/EventLogModel.kt @@ -29,12 +29,12 @@ import org.linphone.utils.LinphoneUtils class EventLogModel @WorkerThread constructor( val eventLog: EventLog, val avatarModel: ContactAvatarModel, - val isFromGroup: Boolean = false, + isFromGroup: Boolean = false, isGroupedWithPreviousOne: Boolean = false, isGroupedWithNextOne: Boolean = false, - val onContentClicked: ((file: String) -> Unit)? = null, - val onJoinConferenceClicked: ((uri: String) -> Unit)? = null, - val onWebUrlClicked: ((url: String) -> Unit)? = null + onContentClicked: ((file: String) -> Unit)? = null, + onJoinConferenceClicked: ((uri: String) -> Unit)? = null, + onWebUrlClicked: ((url: String) -> Unit)? = null ) { companion object { private const val TAG = "[Event Log Model]" @@ -78,6 +78,7 @@ class EventLogModel @WorkerThread constructor( replyTo, replyText, chatMessage.replyMessageId, + chatMessage.isForward, isGroupedWithPreviousOne, isGroupedWithNextOne, onContentClicked, diff --git a/app/src/main/java/org/linphone/ui/main/chat/model/MessageModel.kt b/app/src/main/java/org/linphone/ui/main/chat/model/MessageModel.kt index 91927fff2..fedc789fa 100644 --- a/app/src/main/java/org/linphone/ui/main/chat/model/MessageModel.kt +++ b/app/src/main/java/org/linphone/ui/main/chat/model/MessageModel.kt @@ -66,6 +66,7 @@ class MessageModel @WorkerThread constructor( val replyTo: String, val replyText: String, val replyToMessageId: String?, + val isForward: Boolean, isGroupedWithPreviousOne: Boolean, isGroupedWithNextOne: Boolean, private val onContentClicked: ((file: String) -> Unit)? = null, diff --git a/app/src/main/res/layout/chat_bubble_incoming.xml b/app/src/main/res/layout/chat_bubble_incoming.xml index 70191a2e0..900b987dc 100644 --- a/app/src/main/res/layout/chat_bubble_incoming.xml +++ b/app/src/main/res/layout/chat_bubble_incoming.xml @@ -130,6 +130,32 @@ app:layout_constraintStart_toStartOf="@id/bubble" app:layout_constraintTop_toBottomOf="@id/reply_name" /> + + + + + + + + Reactions %s %s %s Click to remove + Forwarded No meeting for the moment… Today