From 2176129b11414f87a6ce597a973ad242538a8880 Mon Sep 17 00:00:00 2001
From: ericdecanini <eddecanini@gmail.com>
Date: Mon, 14 Mar 2022 11:46:48 +0100
Subject: [PATCH] Moves additional top space usage to bubble view

---
 .../detail/timeline/item/AbsMessageItem.kt    |  3 --
 .../timeline/style/TimelineMessageLayout.kt   | 49 ++++++++++---------
 .../detail/timeline/view/MessageBubbleView.kt |  2 +
 3 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageItem.kt
index 7b80acbc8e..2fac9df665 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageItem.kt
@@ -106,8 +106,6 @@ abstract class AbsMessageItem<H : AbsMessageItem.Holder> : AbsBaseMessageItem<H>
             holder.timeView.isVisible = false
         }
 
-        holder.additionalTopSpace.isVisible = attributes.informationData.messageLayout.addTopMargin
-
         // Render send state indicator
         holder.sendStateImageView.render(attributes.informationData.sendStateDecoration)
         holder.eventSendingIndicator.isVisible = attributes.informationData.sendStateDecoration == SendStateDecoration.SENDING_MEDIA
@@ -157,7 +155,6 @@ abstract class AbsMessageItem<H : AbsMessageItem.Holder> : AbsBaseMessageItem<H>
 
     abstract class Holder(@IdRes stubId: Int) : AbsBaseMessageItem.Holder(stubId) {
 
-        val additionalTopSpace by bind<View>(R.id.additionalTopSpace)
         val avatarImageView by bind<ImageView>(R.id.messageAvatarImageView)
         val memberNameView by bind<TextView>(R.id.messageMemberNameView)
         val timeView by bind<TextView>(R.id.messageTimeView)
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 202d8b05da..c0e668e013 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
@@ -21,43 +21,44 @@ import im.vector.app.R
 import kotlinx.parcelize.Parcelize
 
 sealed interface TimelineMessageLayout : Parcelable {
+
     val layoutRes: Int
     val showAvatar: Boolean
     val showDisplayName: Boolean
-    val addTopMargin: Boolean
     val showTimestamp: Boolean
 
     @Parcelize
-    data class Default(override val showAvatar: Boolean,
-                       override val showDisplayName: Boolean,
-                       override val showTimestamp: Boolean,
-                       override val addTopMargin: Boolean = false,
-            // Keep defaultLayout generated on epoxy items
-                       override val layoutRes: Int = 0) : 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,
-            override val showDisplayName: Boolean,
-            override val showTimestamp: Boolean = true,
-            override val addTopMargin: Boolean = false,
-            val isIncoming: Boolean,
-            val isPseudoBubble: Boolean,
-            val cornersRadius: CornersRadius,
-            val timestampAsOverlay: Boolean,
-            override val layoutRes: Int = if (isIncoming) {
-                R.layout.item_timeline_event_bubble_incoming_base
-            } else {
-                R.layout.item_timeline_event_bubble_outgoing_base
-            }
+        override val showAvatar: Boolean,
+        override val showDisplayName: Boolean,
+        override val showTimestamp: Boolean = true,
+        val addTopMargin: Boolean = false,
+        val isIncoming: Boolean,
+        val isPseudoBubble: Boolean,
+        val cornersRadius: CornersRadius,
+        val timestampAsOverlay: Boolean,
+        override val layoutRes: Int = if (isIncoming) {
+            R.layout.item_timeline_event_bubble_incoming_base
+        } else {
+            R.layout.item_timeline_event_bubble_outgoing_base
+        },
     ) : TimelineMessageLayout {
 
         @Parcelize
         data class CornersRadius(
-                val topStartRadius: Float,
-                val topEndRadius: Float,
-                val bottomStartRadius: Float,
-                val bottomEndRadius: Float
+            val topStartRadius: Float,
+            val topEndRadius: Float,
+            val bottomStartRadius: Float,
+            val bottomEndRadius: Float,
         ) : Parcelable
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/view/MessageBubbleView.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/view/MessageBubbleView.kt
index 93eae9a1d3..7f21e2a248 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/view/MessageBubbleView.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/view/MessageBubbleView.kt
@@ -139,6 +139,8 @@ class MessageBubbleView @JvmOverloads constructor(context: Context, attrs: Attri
                 marginStart = resources.getDimensionPixelSize(R.dimen.chat_bubble_margin_end)
             }
         }
+
+        views.additionalTopSpace.isVisible = messageLayout.addTopMargin
     }
 
     private fun TimelineMessageLayout.Bubble.CornersRadius.toFloatArray(): FloatArray {