From ecd58293b4e097d47721add62ca9a63496fc2cd1 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 3 Dec 2024 09:42:13 +0100 Subject: [PATCH] Move more fields to TimelineItemEventContentWithAttachment --- .../features/messages/impl/MessagesFlowNode.kt | 4 ++-- .../event/TimelineItemContentMessageFactory.kt | 6 ++++-- .../model/event/TimelineItemAudioContent.kt | 8 ++++---- .../model/event/TimelineItemEventContent.kt | 5 +++++ .../model/event/TimelineItemFileContent.kt | 8 ++++---- .../event/TimelineItemFileContentProvider.kt | 2 +- .../model/event/TimelineItemImageContent.kt | 8 ++++---- .../model/event/TimelineItemStickerContent.kt | 8 ++++---- .../model/event/TimelineItemVideoContent.kt | 8 ++++---- .../event/TimelineItemVideoContentProvider.kt | 2 +- .../model/event/TimelineItemVoiceContent.kt | 6 ++++-- .../event/TimelineItemVoiceContentProvider.kt | 2 ++ .../messages/impl/MessagesPresenterTest.kt | 4 ++-- .../TimelineItemContentMessageFactoryTest.kt | 16 ++++++++++------ 14 files changed, 51 insertions(+), 36 deletions(-) diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesFlowNode.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesFlowNode.kt index e80f99a67c..53500cfd35 100644 --- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesFlowNode.kt +++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesFlowNode.kt @@ -381,7 +381,7 @@ class MessagesFlowNode @AssistedInject constructor( senderName = event.safeSenderName, dateSent = event.sentTime, ), - mediaSource = event.content.videoSource, + mediaSource = event.content.mediaSource, thumbnailSource = event.content.thumbnailSource, ) overlay.show(navTarget) @@ -398,7 +398,7 @@ class MessagesFlowNode @AssistedInject constructor( senderName = event.safeSenderName, dateSent = event.sentTime, ), - mediaSource = event.content.fileSource, + mediaSource = event.content.mediaSource, thumbnailSource = event.content.thumbnailSource, ) overlay.show(navTarget) diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentMessageFactory.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentMessageFactory.kt index 867cb694db..c2515560f5 100644 --- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentMessageFactory.kt +++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentMessageFactory.kt @@ -147,7 +147,7 @@ class TimelineItemContentMessageFactory @Inject constructor( formattedCaption = parseHtml(messageType.formattedCaption) ?: messageType.caption?.withLinks(), isEdited = content.isEdited, thumbnailSource = messageType.info?.thumbnailSource, - videoSource = messageType.source, + mediaSource = messageType.source, mimeType = messageType.info?.mimetype ?: MimeTypes.OctetStream, width = messageType.info?.width?.toInt(), height = messageType.info?.height?.toInt(), @@ -186,6 +186,8 @@ class TimelineItemContentMessageFactory @Inject constructor( duration = messageType.info?.duration ?: Duration.ZERO, mimeType = messageType.info?.mimetype ?: MimeTypes.OctetStream, waveform = messageType.details?.waveform?.toImmutableList() ?: persistentListOf(), + formattedFileSize = fileSizeFormatter.format(messageType.info?.size ?: 0), + fileExtension = fileExtensionExtractor.extractFromName(messageType.filename) ) } false -> { @@ -211,7 +213,7 @@ class TimelineItemContentMessageFactory @Inject constructor( formattedCaption = parseHtml(messageType.formattedCaption) ?: messageType.caption?.withLinks(), isEdited = content.isEdited, thumbnailSource = messageType.info?.thumbnailSource, - fileSource = messageType.source, + mediaSource = messageType.source, mimeType = messageType.info?.mimetype ?: MimeTypes.fromFileExtension(fileExtension), formattedFileSize = fileSizeFormatter.format(messageType.info?.size ?: 0), fileExtension = fileExtension diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemAudioContent.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemAudioContent.kt index 46176cc474..a3b2061b92 100644 --- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemAudioContent.kt +++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemAudioContent.kt @@ -17,10 +17,10 @@ data class TimelineItemAudioContent( override val formattedCaption: CharSequence?, override val isEdited: Boolean, val duration: Duration, - val mediaSource: MediaSource, - val mimeType: String, - val formattedFileSize: String, - val fileExtension: String, + override val mediaSource: MediaSource, + override val mimeType: String, + override val formattedFileSize: String, + override val fileExtension: String, ) : TimelineItemEventContentWithAttachment { val fileExtensionAndSize = formatFileExtensionAndSize( diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemEventContent.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemEventContent.kt index 62c55c22ef..6c823462bf 100644 --- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemEventContent.kt +++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemEventContent.kt @@ -8,6 +8,7 @@ package io.element.android.features.messages.impl.timeline.model.event import androidx.compose.runtime.Immutable +import io.element.android.libraries.matrix.api.media.MediaSource @Immutable sealed interface TimelineItemEventContent { @@ -26,6 +27,10 @@ sealed interface TimelineItemEventContentWithAttachment : val filename: String val caption: String? val formattedCaption: CharSequence? + val mediaSource: MediaSource + val mimeType: String + val formattedFileSize: String + val fileExtension: String val bestDescription: String get() = caption ?: filename diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemFileContent.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemFileContent.kt index 3f1d8fe041..286411c511 100644 --- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemFileContent.kt +++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemFileContent.kt @@ -15,11 +15,11 @@ data class TimelineItemFileContent( override val caption: String?, override val formattedCaption: CharSequence?, override val isEdited: Boolean, - val fileSource: MediaSource, + override val mediaSource: MediaSource, val thumbnailSource: MediaSource?, - val formattedFileSize: String, - val fileExtension: String, - val mimeType: String, + override val formattedFileSize: String, + override val fileExtension: String, + override val mimeType: String, ) : TimelineItemEventContentWithAttachment { override val type: String = "TimelineItemFileContent" diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemFileContentProvider.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemFileContentProvider.kt index 409e26079e..b8f28c741a 100644 --- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemFileContentProvider.kt +++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemFileContentProvider.kt @@ -31,7 +31,7 @@ fun aTimelineItemFileContent( formattedCaption = null, isEdited = false, thumbnailSource = null, - fileSource = MediaSource(url = ""), + mediaSource = MediaSource(url = ""), mimeType = MimeTypes.Pdf, formattedFileSize = "100kB", fileExtension = "pdf" diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemImageContent.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemImageContent.kt index 78323166b4..80b055a5a6 100644 --- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemImageContent.kt +++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemImageContent.kt @@ -18,11 +18,11 @@ data class TimelineItemImageContent( override val caption: String?, override val formattedCaption: CharSequence?, override val isEdited: Boolean, - val mediaSource: MediaSource, + override val mediaSource: MediaSource, val thumbnailSource: MediaSource?, - val formattedFileSize: String, - val fileExtension: String, - val mimeType: String, + override val formattedFileSize: String, + override val fileExtension: String, + override val mimeType: String, val blurhash: String?, val width: Int?, val height: Int?, diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemStickerContent.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemStickerContent.kt index ebaeb53b4b..ebf25d7e95 100644 --- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemStickerContent.kt +++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemStickerContent.kt @@ -14,11 +14,11 @@ data class TimelineItemStickerContent( override val caption: String?, override val formattedCaption: CharSequence?, override val isEdited: Boolean, - val mediaSource: MediaSource, + override val mediaSource: MediaSource, val thumbnailSource: MediaSource?, - val formattedFileSize: String, - val fileExtension: String, - val mimeType: String, + override val formattedFileSize: String, + override val fileExtension: String, + override val mimeType: String, val blurhash: String?, val width: Int?, val height: Int?, diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemVideoContent.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemVideoContent.kt index caee06ef64..74406aaf37 100644 --- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemVideoContent.kt +++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemVideoContent.kt @@ -16,7 +16,7 @@ data class TimelineItemVideoContent( override val formattedCaption: CharSequence?, override val isEdited: Boolean, val duration: Duration, - val videoSource: MediaSource, + override val mediaSource: MediaSource, val thumbnailSource: MediaSource?, val aspectRatio: Float?, val blurHash: String?, @@ -24,9 +24,9 @@ data class TimelineItemVideoContent( val width: Int?, val thumbnailWidth: Int?, val thumbnailHeight: Int?, - val mimeType: String, - val formattedFileSize: String, - val fileExtension: String, + override val mimeType: String, + override val formattedFileSize: String, + override val fileExtension: String, ) : TimelineItemEventContentWithAttachment { override val type: String = "TimelineItemImageContent" diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemVideoContentProvider.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemVideoContentProvider.kt index 1ed05fa606..477c00d808 100644 --- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemVideoContentProvider.kt +++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemVideoContentProvider.kt @@ -35,7 +35,7 @@ fun aTimelineItemVideoContent( blurHash = blurhash, aspectRatio = aspectRatio, duration = 100.milliseconds, - videoSource = MediaSource(""), + mediaSource = MediaSource(""), width = 150, height = 300, thumbnailWidth = 150, diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemVoiceContent.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemVoiceContent.kt index 21b6696ffe..ad3908166a 100644 --- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemVoiceContent.kt +++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemVoiceContent.kt @@ -19,8 +19,10 @@ data class TimelineItemVoiceContent( override val formattedCaption: CharSequence?, override val isEdited: Boolean, val duration: Duration, - val mediaSource: MediaSource, - val mimeType: String, + override val mediaSource: MediaSource, + override val formattedFileSize: String, + override val fileExtension: String, + override val mimeType: String, val waveform: ImmutableList, ) : TimelineItemEventContentWithAttachment { override val type: String = "TimelineItemAudioContent" diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemVoiceContentProvider.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemVoiceContentProvider.kt index bd7308d970..0c3fd246ca 100644 --- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemVoiceContentProvider.kt +++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemVoiceContentProvider.kt @@ -53,4 +53,6 @@ fun aTimelineItemVoiceContent( mediaSource = mediaSource, mimeType = mimeType, waveform = waveform.toPersistentList(), + formattedFileSize = "1.0 MB", + fileExtension = "ogg", ) diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/MessagesPresenterTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/MessagesPresenterTest.kt index 541034bc57..8cb7464a9a 100644 --- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/MessagesPresenterTest.kt +++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/MessagesPresenterTest.kt @@ -371,7 +371,7 @@ class MessagesPresenterTest { formattedCaption = null, isEdited = false, duration = 10.milliseconds, - videoSource = MediaSource(AN_AVATAR_URL), + mediaSource = MediaSource(AN_AVATAR_URL), thumbnailSource = MediaSource(AN_AVATAR_URL), mimeType = MimeTypes.Mp4, blurHash = null, @@ -413,7 +413,7 @@ class MessagesPresenterTest { caption = null, isEdited = false, formattedCaption = null, - fileSource = MediaSource(AN_AVATAR_URL), + mediaSource = MediaSource(AN_AVATAR_URL), thumbnailSource = MediaSource(AN_AVATAR_URL), formattedFileSize = "10 MB", mimeType = MimeTypes.Pdf, diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentMessageFactoryTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentMessageFactoryTest.kt index b771141ce3..751186554c 100644 --- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentMessageFactoryTest.kt +++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentMessageFactoryTest.kt @@ -239,7 +239,7 @@ class TimelineItemContentMessageFactoryTest { formattedCaption = null, isEdited = false, duration = Duration.ZERO, - videoSource = MediaSource(url = "url", json = null), + mediaSource = MediaSource(url = "url", json = null), thumbnailSource = null, aspectRatio = null, blurHash = null, @@ -291,7 +291,7 @@ class TimelineItemContentMessageFactoryTest { formattedCaption = SpannedString("formatted"), isEdited = true, duration = 1.minutes, - videoSource = MediaSource(url = "url", json = null), + mediaSource = MediaSource(url = "url", json = null), thumbnailSource = MediaSource("url_thumbnail"), aspectRatio = 3f, blurHash = A_BLUR_HASH, @@ -380,7 +380,9 @@ class TimelineItemContentMessageFactoryTest { duration = Duration.ZERO, mediaSource = MediaSource(url = "url", json = null), mimeType = MimeTypes.OctetStream, - waveform = emptyList().toImmutableList() + waveform = emptyList().toImmutableList(), + fileExtension = "", + formattedFileSize = "", ) assertThat(result).isEqualTo(expected) } @@ -419,7 +421,9 @@ class TimelineItemContentMessageFactoryTest { duration = 1.minutes, mediaSource = MediaSource(url = "url", json = null), mimeType = MimeTypes.Ogg, - waveform = persistentListOf(1f, 2f) + waveform = persistentListOf(1f, 2f), + fileExtension = "", + formattedFileSize = "", ) assertThat(result).isEqualTo(expected) } @@ -571,7 +575,7 @@ class TimelineItemContentMessageFactoryTest { caption = null, formattedCaption = null, isEdited = false, - fileSource = MediaSource(url = "url", json = null), + mediaSource = MediaSource(url = "url", json = null), thumbnailSource = null, formattedFileSize = "0 Bytes", fileExtension = "", @@ -612,7 +616,7 @@ class TimelineItemContentMessageFactoryTest { caption = null, formattedCaption = null, isEdited = true, - fileSource = MediaSource(url = "url", json = null), + mediaSource = MediaSource(url = "url", json = null), thumbnailSource = MediaSource("url_thumbnail"), formattedFileSize = "123 Bytes", fileExtension = "pdf",