From baee076e41c628ff3897b80097212f8b8fd40ae9 Mon Sep 17 00:00:00 2001 From: ganfra Date: Thu, 13 Jan 2022 12:33:58 +0100 Subject: [PATCH] Bubbles: fix types using wrong layout --- .../timeline/factory/MessageItemFactory.kt | 5 +- .../timeline/style/TimelineMessageLayout.kt | 9 +-- .../style/TimelineMessageLayoutFactory.kt | 56 ++++++++++++++----- 3 files changed, 49 insertions(+), 21 deletions(-) diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt index 80343fd909..a80b948428 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt @@ -172,9 +172,7 @@ class MessageItemFactory @Inject constructor( is MessagePollContent -> buildPollContent(messageContent, informationData, highlight, callback, attributes) else -> buildNotHandledMessageItem(messageContent, informationData, highlight, callback, attributes) } - return messageItem?.takeIf { - it.layout == R.layout.item_timeline_event_base - }?.apply { + return messageItem?.apply { layout(informationData.messageLayout.layoutRes) } } @@ -650,6 +648,7 @@ class MessageItemFactory @Inject constructor( private fun buildRedactedItem(attributes: AbsMessageItem.Attributes, highlight: Boolean): RedactedMessageItem? { return RedactedMessageItem_() + .layout(attributes.informationData.messageLayout.layoutRes) .leftGuideline(avatarSizeProvider.leftGuideline) .attributes(attributes) .highlighted(highlight) diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineMessageLayout.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineMessageLayout.kt index 48dba0a58a..50f4e95cee 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineMessageLayout.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineMessageLayout.kt @@ -27,10 +27,11 @@ sealed interface TimelineMessageLayout : Parcelable { val showTimestamp: Boolean @Parcelize - data class Modern(override val showAvatar: Boolean, - override val showDisplayName: Boolean, - override val showTimestamp: Boolean, - override val layoutRes: Int = R.layout.item_timeline_event_base) : TimelineMessageLayout + data class Default(override val showAvatar: Boolean, + override val showDisplayName: Boolean, + override val showTimestamp: Boolean, + // Keep defaultLayout generated on epoxy items + override val layoutRes: Int = 0) : TimelineMessageLayout @Parcelize data class Bubble(override val showAvatar: Boolean, diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineMessageLayoutFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineMessageLayoutFactory.kt index bd37c2d66a..9b2877f0f8 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineMessageLayoutFactory.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineMessageLayoutFactory.kt @@ -21,6 +21,7 @@ import im.vector.app.features.home.room.detail.timeline.factory.TimelineItemFact import im.vector.app.features.settings.VectorPreferences import org.matrix.android.sdk.api.session.Session import org.matrix.android.sdk.api.session.events.model.EventType +import org.matrix.android.sdk.api.session.room.model.message.MessageType import org.matrix.android.sdk.api.session.room.model.message.MessageVerificationRequestContent import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent import org.matrix.android.sdk.api.session.room.timeline.getLastMessageContent @@ -31,6 +32,18 @@ class TimelineMessageLayoutFactory @Inject constructor(private val session: Sess private val layoutSettingsProvider: TimelineLayoutSettingsProvider, private val vectorPreferences: VectorPreferences) { + companion object { + private val EVENT_TYPES_WITH_BUBBLE_LAYOUT = setOf( + EventType.MESSAGE, + EventType.ENCRYPTED, + EventType.STICKER + ) + private val MSG_TYPES_WITHOUT_BUBBLE_LAYOUT = setOf( + MessageType.MSGTYPE_POLL_START, + MessageType.MSGTYPE_VERIFICATION_REQUEST + ) + } + fun create(params: TimelineItemFactoryParams): TimelineMessageLayout { val event = params.event @@ -55,27 +68,42 @@ class TimelineMessageLayoutFactory @Inject constructor(private val session: Sess val messageLayout = when (layoutSettingsProvider.getLayoutSettings()) { TimelineLayoutSettings.MODERN -> { - TimelineMessageLayout.Modern( - showAvatar = showInformation, - showDisplayName = showInformation, - showTimestamp = showInformation || vectorPreferences.alwaysShowTimeStamps() - ) + buildModernLayout(showInformation) } TimelineLayoutSettings.BUBBLE -> { - val isFirstFromThisSender = nextDisplayableEvent?.root?.senderId != event.root.senderId || addDaySeparator - val isLastFromThisSender = prevDisplayableEvent?.root?.senderId != event.root.senderId || prevDisplayableEvent?.root?.localDateTime()?.toLocalDate() != date.toLocalDate() - TimelineMessageLayout.Bubble( - showAvatar = showInformation && !isSentByMe, - showDisplayName = showInformation && !isSentByMe, - isIncoming = !isSentByMe, - isFirstFromThisSender = isFirstFromThisSender, - isLastFromThisSender = isLastFromThisSender - ) + val type = event.root.getClearType() + if (type in EVENT_TYPES_WITH_BUBBLE_LAYOUT) { + val messageContent = if (type == EventType.MESSAGE) params.event.getLastMessageContent() else null + if (messageContent?.msgType in MSG_TYPES_WITHOUT_BUBBLE_LAYOUT) { + buildModernLayout(showInformation) + } + val isFirstFromThisSender = nextDisplayableEvent?.root?.senderId != event.root.senderId || addDaySeparator + val isLastFromThisSender = prevDisplayableEvent?.root?.senderId != event.root.senderId + || prevDisplayableEvent?.root?.localDateTime()?.toLocalDate() != date.toLocalDate() + + TimelineMessageLayout.Bubble( + showAvatar = showInformation && !isSentByMe, + showDisplayName = showInformation && !isSentByMe, + isIncoming = !isSentByMe, + isFirstFromThisSender = isFirstFromThisSender, + isLastFromThisSender = isLastFromThisSender + ) + } else { + buildModernLayout(showInformation) + } } } return messageLayout } + private fun buildModernLayout(showInformation: Boolean): TimelineMessageLayout.Default { + return TimelineMessageLayout.Default( + showAvatar = showInformation, + showDisplayName = showInformation, + showTimestamp = showInformation || vectorPreferences.alwaysShowTimeStamps() + ) + } + /** * Tiles type message never show the sender information (like verification request), so we should repeat it for next message * even if same sender