Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Reply preview on 2 lines.

Browse source
This commit is contained in:
Benoit Marty 2023-06-29 17:58:38 +02:00 • committed by Benoit Marty
parent 7093ab101b
commit 129afe6a86
1 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

19
features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRow.kt
View file

@ -379,7 +379,7 @@ private fun ReplyToContent(
style = ElementTheme.typography.fontBodyMdRegular, style = ElementTheme.typography.fontBodyMdRegular,
textAlign = TextAlign.Start, textAlign = TextAlign.Start,
color = ElementTheme.materialColors.secondary, color = ElementTheme.materialColors.secondary,
maxLines = 1, maxLines = 2,
overflow = TextOverflow.Ellipsis, overflow = TextOverflow.Ellipsis,
) )
} }
@ -472,6 +472,13 @@ internal fun TimelineItemEventRowWithReplyDarkPreview() =
private fun ContentToPreviewWithReply() { private fun ContentToPreviewWithReply() {
Column { Column {
sequenceOf(false, true).forEach { sequenceOf(false, true).forEach {
val replyContent = if(it) {
// Short
"Message which are being replied."
} else {
// Long, to test 2 lines and ellipsis)
"Message which are being replied, and which was long enough to be displayed on two lines (only!)."
}
TimelineItemEventRow( TimelineItemEventRow(
event = aTimelineItemEvent( event = aTimelineItemEvent(
isMine = it, isMine = it,
@ -479,7 +486,7 @@ private fun ContentToPreviewWithReply() {
body = "A long text which will be displayed on several lines and" + body = "A long text which will be displayed on several lines and" +
" hopefully can be manually adjusted to test different behaviors." " hopefully can be manually adjusted to test different behaviors."
), ),
inReplyTo = aInReplyToReady() inReplyTo = aInReplyToReady(replyContent)
), ),
isHighlighted = false, isHighlighted = false,
onClick = {}, onClick = {},
@ -495,7 +502,7 @@ private fun ContentToPreviewWithReply() {
content = aTimelineItemImageContent().copy( content = aTimelineItemImageContent().copy(
aspectRatio = 5f aspectRatio = 5f
), ),
inReplyTo = aInReplyToReady() inReplyTo = aInReplyToReady(replyContent)
), ),
isHighlighted = false, isHighlighted = false,
onClick = {}, onClick = {},
@ -509,10 +516,12 @@ private fun ContentToPreviewWithReply() {
} }
} }
private fun aInReplyToReady(): InReplyTo.Ready { private fun aInReplyToReady(
replyContent: String
): InReplyTo.Ready {
return InReplyTo.Ready( return InReplyTo.Ready(
eventId = EventId("\$event"), eventId = EventId("\$event"),
content = MessageContent("Message which are being replied.", null, false, TextMessageType("Message", null)), content = MessageContent(replyContent, null, false, TextMessageType(replyContent, null)),
senderId = UserId("@Sender:domain"), senderId = UserId("@Sender:domain"),
senderDisplayName = "Sender", senderDisplayName = "Sender",
senderAvatarUrl = null, senderAvatarUrl = null,