|
|
@ -92,6 +92,7 @@ import io.element.android.features.messages.impl.timeline.model.event.TimelineIt |
|
|
|
import io.element.android.features.messages.impl.timeline.model.event.aTimelineItemImageContent |
|
|
|
import io.element.android.features.messages.impl.timeline.model.event.aTimelineItemImageContent |
|
|
|
import io.element.android.features.messages.impl.timeline.model.event.aTimelineItemTextContent |
|
|
|
import io.element.android.features.messages.impl.timeline.model.event.aTimelineItemTextContent |
|
|
|
import io.element.android.features.messages.impl.timeline.model.event.canBeRepliedTo |
|
|
|
import io.element.android.features.messages.impl.timeline.model.event.canBeRepliedTo |
|
|
|
|
|
|
|
import io.element.android.features.messages.impl.timeline.model.event.isEdited |
|
|
|
import io.element.android.features.messages.impl.timeline.model.eventId |
|
|
|
import io.element.android.features.messages.impl.timeline.model.eventId |
|
|
|
import io.element.android.features.messages.impl.timeline.model.metadata |
|
|
|
import io.element.android.features.messages.impl.timeline.model.metadata |
|
|
|
import io.element.android.libraries.designsystem.atomic.atoms.PlaceholderAtom |
|
|
|
import io.element.android.libraries.designsystem.atomic.atoms.PlaceholderAtom |
|
|
@ -130,7 +131,6 @@ fun TimelineItemEventRow( |
|
|
|
onLinkClick: (String) -> Unit, |
|
|
|
onLinkClick: (String) -> Unit, |
|
|
|
onUserDataClick: (UserId) -> Unit, |
|
|
|
onUserDataClick: (UserId) -> Unit, |
|
|
|
inReplyToClick: (EventId) -> Unit, |
|
|
|
inReplyToClick: (EventId) -> Unit, |
|
|
|
onTimestampClick: (TimelineItem.Event) -> Unit, |
|
|
|
|
|
|
|
onReactionClick: (emoji: String, eventId: TimelineItem.Event) -> Unit, |
|
|
|
onReactionClick: (emoji: String, eventId: TimelineItem.Event) -> Unit, |
|
|
|
onReactionLongClick: (emoji: String, eventId: TimelineItem.Event) -> Unit, |
|
|
|
onReactionLongClick: (emoji: String, eventId: TimelineItem.Event) -> Unit, |
|
|
|
onMoreReactionsClick: (eventId: TimelineItem.Event) -> Unit, |
|
|
|
onMoreReactionsClick: (eventId: TimelineItem.Event) -> Unit, |
|
|
@ -190,7 +190,6 @@ fun TimelineItemEventRow( |
|
|
|
interactionSource = interactionSource, |
|
|
|
interactionSource = interactionSource, |
|
|
|
onClick = onClick, |
|
|
|
onClick = onClick, |
|
|
|
onLongClick = onLongClick, |
|
|
|
onLongClick = onLongClick, |
|
|
|
onTimestampClick = onTimestampClick, |
|
|
|
|
|
|
|
inReplyToClick = ::inReplyToClick, |
|
|
|
inReplyToClick = ::inReplyToClick, |
|
|
|
onUserDataClick = ::onUserDataClick, |
|
|
|
onUserDataClick = ::onUserDataClick, |
|
|
|
onReactionClick = { emoji -> onReactionClick(emoji, event) }, |
|
|
|
onReactionClick = { emoji -> onReactionClick(emoji, event) }, |
|
|
@ -209,7 +208,6 @@ fun TimelineItemEventRow( |
|
|
|
interactionSource = interactionSource, |
|
|
|
interactionSource = interactionSource, |
|
|
|
onClick = onClick, |
|
|
|
onClick = onClick, |
|
|
|
onLongClick = onLongClick, |
|
|
|
onLongClick = onLongClick, |
|
|
|
onTimestampClick = onTimestampClick, |
|
|
|
|
|
|
|
inReplyToClick = ::inReplyToClick, |
|
|
|
inReplyToClick = ::inReplyToClick, |
|
|
|
onUserDataClick = ::onUserDataClick, |
|
|
|
onUserDataClick = ::onUserDataClick, |
|
|
|
onReactionClick = { emoji -> onReactionClick(emoji, event) }, |
|
|
|
onReactionClick = { emoji -> onReactionClick(emoji, event) }, |
|
|
@ -265,7 +263,6 @@ private fun TimelineItemEventRowContent( |
|
|
|
interactionSource: MutableInteractionSource, |
|
|
|
interactionSource: MutableInteractionSource, |
|
|
|
onClick: () -> Unit, |
|
|
|
onClick: () -> Unit, |
|
|
|
onLongClick: () -> Unit, |
|
|
|
onLongClick: () -> Unit, |
|
|
|
onTimestampClick: (TimelineItem.Event) -> Unit, |
|
|
|
|
|
|
|
inReplyToClick: () -> Unit, |
|
|
|
inReplyToClick: () -> Unit, |
|
|
|
onUserDataClick: () -> Unit, |
|
|
|
onUserDataClick: () -> Unit, |
|
|
|
onReactionClick: (emoji: String) -> Unit, |
|
|
|
onReactionClick: (emoji: String) -> Unit, |
|
|
@ -337,9 +334,6 @@ private fun TimelineItemEventRowContent( |
|
|
|
event = event, |
|
|
|
event = event, |
|
|
|
onMessageLongClick = onLongClick, |
|
|
|
onMessageLongClick = onLongClick, |
|
|
|
inReplyToClick = inReplyToClick, |
|
|
|
inReplyToClick = inReplyToClick, |
|
|
|
onTimestampClick = { |
|
|
|
|
|
|
|
onTimestampClick(event) |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
onLinkClick = onLinkClick, |
|
|
|
onLinkClick = onLinkClick, |
|
|
|
eventSink = eventSink, |
|
|
|
eventSink = eventSink, |
|
|
|
) |
|
|
|
) |
|
|
@ -419,7 +413,6 @@ private fun MessageEventBubbleContent( |
|
|
|
event: TimelineItem.Event, |
|
|
|
event: TimelineItem.Event, |
|
|
|
onMessageLongClick: () -> Unit, |
|
|
|
onMessageLongClick: () -> Unit, |
|
|
|
inReplyToClick: () -> Unit, |
|
|
|
inReplyToClick: () -> Unit, |
|
|
|
onTimestampClick: () -> Unit, |
|
|
|
|
|
|
|
onLinkClick: (String) -> Unit, |
|
|
|
onLinkClick: (String) -> Unit, |
|
|
|
eventSink: (TimelineEvents.EventFromTimelineItem) -> Unit, |
|
|
|
eventSink: (TimelineEvents.EventFromTimelineItem) -> Unit, |
|
|
|
@SuppressLint("ModifierParameter") |
|
|
|
@SuppressLint("ModifierParameter") |
|
|
@ -467,9 +460,8 @@ private fun MessageEventBubbleContent( |
|
|
|
Box(modifier, contentAlignment = Alignment.Center) { |
|
|
|
Box(modifier, contentAlignment = Alignment.Center) { |
|
|
|
content {} |
|
|
|
content {} |
|
|
|
TimelineEventTimestampView( |
|
|
|
TimelineEventTimestampView( |
|
|
|
event = event, |
|
|
|
formattedTime = event.sentTime, |
|
|
|
onClick = onTimestampClick, |
|
|
|
isMessageEdited = event.content.isEdited(), |
|
|
|
onLongClick = ::onTimestampLongClick, |
|
|
|
|
|
|
|
modifier = Modifier |
|
|
|
modifier = Modifier |
|
|
|
// Outer padding |
|
|
|
// Outer padding |
|
|
|
.padding(horizontal = 4.dp, vertical = 4.dp) |
|
|
|
.padding(horizontal = 4.dp, vertical = 4.dp) |
|
|
@ -489,9 +481,8 @@ private fun MessageEventBubbleContent( |
|
|
|
content = { content(this::onContentLayoutChange) }, |
|
|
|
content = { content(this::onContentLayoutChange) }, |
|
|
|
overlay = { |
|
|
|
overlay = { |
|
|
|
TimelineEventTimestampView( |
|
|
|
TimelineEventTimestampView( |
|
|
|
event = event, |
|
|
|
formattedTime = event.sentTime, |
|
|
|
onClick = onTimestampClick, |
|
|
|
isMessageEdited = event.content.isEdited(), |
|
|
|
onLongClick = ::onTimestampLongClick, |
|
|
|
|
|
|
|
modifier = Modifier |
|
|
|
modifier = Modifier |
|
|
|
.padding(horizontal = 8.dp, vertical = 4.dp) |
|
|
|
.padding(horizontal = 8.dp, vertical = 4.dp) |
|
|
|
) |
|
|
|
) |
|
|
@ -501,9 +492,8 @@ private fun MessageEventBubbleContent( |
|
|
|
Column(modifier) { |
|
|
|
Column(modifier) { |
|
|
|
content {} |
|
|
|
content {} |
|
|
|
TimelineEventTimestampView( |
|
|
|
TimelineEventTimestampView( |
|
|
|
event = event, |
|
|
|
formattedTime = event.sentTime, |
|
|
|
onClick = onTimestampClick, |
|
|
|
isMessageEdited = event.content.isEdited(), |
|
|
|
onLongClick = ::onTimestampLongClick, |
|
|
|
|
|
|
|
modifier = Modifier |
|
|
|
modifier = Modifier |
|
|
|
.align(Alignment.End) |
|
|
|
.align(Alignment.End) |
|
|
|
.padding(horizontal = 8.dp, vertical = 4.dp) |
|
|
|
.padding(horizontal = 8.dp, vertical = 4.dp) |
|
|
|