ehealthsolutions/element-x-android
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-android.git synced 2026-11-04 10:32:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve code and use type Video when necessary

Browse Source
This commit is contained in:
Benoit Marty
2026-07-10 15:13:36 +02:00
committed by Benoit Marty
parent 566b0c6f86
commit 754eb3d0c1
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/messages/reply/InReplyToMetadata.kt
+15 -7
View File
@@ -111,13 +111,12 @@ internal fun InReplyToDetails.Ready.metadata(hideImage: Boolean): InReplyToMetad
is GalleryMessageType -> { is GalleryMessageType -> {
val caption = textContent?.takeIf { it.isNotBlank() } val caption = textContent?.takeIf { it.isNotBlank() }
val isMediaGallery = type.items.all { it is GalleryItemType.Image || it is GalleryItemType.Video } val isMediaGallery = type.items.all { it is GalleryItemType.Image || it is GalleryItemType.Video }
val countPlural = if (isMediaGallery) {
CommonPlurals.common_gallery_reply_media_items
} else {
CommonPlurals.common_gallery_reply_attachments
}
val text = caption ?: pluralStringResource(countPlural, type.items.size, type.items.size)
if (isMediaGallery) { if (isMediaGallery) {
val text = caption ?: pluralStringResource(
CommonPlurals.common_gallery_reply_media_items,
type.items.size,
type.items.size,
)
val firstMediaItem = type.items.firstOrNull { it is GalleryItemType.Image || it is GalleryItemType.Video } val firstMediaItem = type.items.firstOrNull { it is GalleryItemType.Image || it is GalleryItemType.Video }
val thumbnailSource = when (firstMediaItem) { val thumbnailSource = when (firstMediaItem) {
is GalleryItemType.Image -> (firstMediaItem.content.info?.thumbnailSource ?: firstMediaItem.content.source).takeUnless { hideImage } is GalleryItemType.Image -> (firstMediaItem.content.info?.thumbnailSource ?: firstMediaItem.content.source).takeUnless { hideImage }
@@ -129,15 +128,24 @@ internal fun InReplyToDetails.Ready.metadata(hideImage: Boolean): InReplyToMetad
is GalleryItemType.Video -> firstMediaItem.content.info?.blurhash is GalleryItemType.Video -> firstMediaItem.content.info?.blurhash
else -> null else -> null
} }
val type = when (firstMediaItem) {
is GalleryItemType.Video -> AttachmentThumbnailType.Video
else -> AttachmentThumbnailType.Image
}
Thumbnail( Thumbnail(
AttachmentThumbnailInfo( AttachmentThumbnailInfo(
thumbnailSource = thumbnailSource, thumbnailSource = thumbnailSource,
textContent = text, textContent = text,
type = AttachmentThumbnailType.Image, type = type,
blurHash = blurHash, blurHash = blurHash,
) )
) )
} else { } else {
val text = caption ?: pluralStringResource(
CommonPlurals.common_gallery_reply_attachments,
type.items.size,
type.items.size,
)
Thumbnail( Thumbnail(
AttachmentThumbnailInfo( AttachmentThumbnailInfo(
textContent = text, textContent = text,