Add padding before first own message

element-hq · Mar 1, 2022 · abd58c5 · abd58c5
1 parent b226ab5
commit abd58c5
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 0 deletions.
diff --git a/changelog.d/5384.misc b/changelog.d/5384.misc
@@ -0,0 +1 @@
+Add top margin before our first message
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
@@ -94,6 +94,11 @@ abstract class AbsMessageItem<H : AbsMessageItem.Holder> : AbsBaseMessageItem<H>
             holder.memberNameView.setTextColor(attributes.getMemberNameColor())
             holder.memberNameView.onClick(_memberNameClickListener)
             holder.memberNameView.setOnLongClickListener(attributes.itemLongClickListener)
+        } else if (attributes.informationData.messageLayout.addTopMargin) {
+            holder.memberNameView.setOnClickListener(null)
+            holder.memberNameView.setOnLongClickListener(null)
+            holder.memberNameView.isVisible = true
+            holder.memberNameView.text = ""
         } else {
             holder.memberNameView.setOnClickListener(null)
             holder.memberNameView.setOnLongClickListener(null)

diff --git a/...main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineMessageLayout.kt b/...main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineMessageLayout.kt
@@ -24,12 +24,14 @@ 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
 
@@ -38,6 +40,7 @@ sealed interface TimelineMessageLayout : Parcelable {
             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,

diff --git a/...va/im/vector/app/features/home/room/detail/timeline/style/TimelineMessageLayoutFactory.kt b/...va/im/vector/app/features/home/room/detail/timeline/style/TimelineMessageLayoutFactory.kt
@@ -118,6 +118,7 @@ class TimelineMessageLayoutFactory @Inject constructor(private val session: Sess
                     TimelineMessageLayout.Bubble(
                             showAvatar = showInformation && !isSentByMe,
                             showDisplayName = showInformation && !isSentByMe,
+                            addTopMargin = isFirstFromThisSender && isSentByMe,
                             isIncoming = !isSentByMe,
                             cornersRadius = cornersRadius,
                             isPseudoBubble = messageContent.isPseudoBubble(),