Skip to content

Commit 08ad9df

Browse files
committed
Add padding before first own message
1 parent b226ab5 commit 08ad9df

File tree

3 files changed

+9
-0
lines changed

3 files changed

+9
-0
lines changed

vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageItem.kt

+5
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,11 @@ abstract class AbsMessageItem<H : AbsMessageItem.Holder> : AbsBaseMessageItem<H>
9494
holder.memberNameView.setTextColor(attributes.getMemberNameColor())
9595
holder.memberNameView.onClick(_memberNameClickListener)
9696
holder.memberNameView.setOnLongClickListener(attributes.itemLongClickListener)
97+
} else if (attributes.informationData.messageLayout.marge) {
98+
holder.memberNameView.setOnClickListener(null)
99+
holder.memberNameView.setOnLongClickListener(null)
100+
holder.memberNameView.isVisible = true
101+
holder.memberNameView.text = ""
97102
} else {
98103
holder.memberNameView.setOnClickListener(null)
99104
holder.memberNameView.setOnLongClickListener(null)

vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineMessageLayout.kt

+3
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,14 @@ sealed interface TimelineMessageLayout : Parcelable {
2424
val layoutRes: Int
2525
val showAvatar: Boolean
2626
val showDisplayName: Boolean
27+
val marge: Boolean
2728
val showTimestamp: Boolean
2829

2930
@Parcelize
3031
data class Default(override val showAvatar: Boolean,
3132
override val showDisplayName: Boolean,
3233
override val showTimestamp: Boolean,
34+
override val marge: Boolean = false,
3335
// Keep defaultLayout generated on epoxy items
3436
override val layoutRes: Int = 0) : TimelineMessageLayout
3537

@@ -38,6 +40,7 @@ sealed interface TimelineMessageLayout : Parcelable {
3840
override val showAvatar: Boolean,
3941
override val showDisplayName: Boolean,
4042
override val showTimestamp: Boolean = true,
43+
override val marge: Boolean = false,
4144
val isIncoming: Boolean,
4245
val isPseudoBubble: Boolean,
4346
val cornersRadius: CornersRadius,

vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineMessageLayoutFactory.kt

+1
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ class TimelineMessageLayoutFactory @Inject constructor(private val session: Sess
118118
TimelineMessageLayout.Bubble(
119119
showAvatar = showInformation && !isSentByMe,
120120
showDisplayName = showInformation && !isSentByMe,
121+
marge = isFirstFromThisSender && isSentByMe,
121122
isIncoming = !isSentByMe,
122123
cornersRadius = cornersRadius,
123124
isPseudoBubble = messageContent.isPseudoBubble(),

0 commit comments

Comments
 (0)