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

Improve how the ThumbnailView is added to the composition

Browse source
This commit is contained in:
Benoit Marty 2026-04-24 10:41:36 +02:00 • committed by Benoit Marty
parent 2d706d0020
commit 667e0da3a2
1 changed files with 19 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

40
libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerView.kt
View file

@ -373,11 +373,12 @@ private fun MediaViewerPage(
isUserSelected = isUserSelected, isUserSelected = isUserSelected,
audioFocus = audioFocus, audioFocus = audioFocus,
) )
ThumbnailView( if (showThumbnail) {
mediaInfo = data.mediaInfo, ThumbnailView(
thumbnailSource = data.thumbnailSource, mediaInfo = data.mediaInfo,
isVisible = showThumbnail, thumbnailSource = data.thumbnailSource,
) )
}
if (showError) { if (showError) {
ErrorView( ErrorView(
errorMessage = stringResource(id = CommonStrings.error_unknown), errorMessage = stringResource(id = CommonStrings.error_unknown),
@ -603,7 +604,6 @@ private val maxCaptionHeightLandscape = 128.dp
@Composable @Composable
private fun ThumbnailView( private fun ThumbnailView(
thumbnailSource: MediaSource?, thumbnailSource: MediaSource?,
isVisible: Boolean,
mediaInfo: MediaInfo, mediaInfo: MediaInfo,
modifier: Modifier = Modifier, modifier: Modifier = Modifier,
) { ) {
@ -611,21 +611,19 @@ private fun ThumbnailView(
modifier = modifier.fillMaxSize(), modifier = modifier.fillMaxSize(),
contentAlignment = Alignment.Center contentAlignment = Alignment.Center
) { ) {
if (isVisible) { val mediaRequestData = MediaRequestData(
val mediaRequestData = MediaRequestData( source = thumbnailSource,
source = thumbnailSource, kind = MediaRequestData.Kind.File(mediaInfo.filename, mediaInfo.mimeType)
kind = MediaRequestData.Kind.File(mediaInfo.filename, mediaInfo.mimeType) )
) val alpha = if (LocalInspectionMode.current) 0.1f else 1f
val alpha = if (LocalInspectionMode.current) 0.1f else 1f AsyncImage(
AsyncImage( modifier = Modifier
modifier = Modifier .fillMaxSize()
.fillMaxSize() .alpha(alpha),
.alpha(alpha), model = mediaRequestData,
model = mediaRequestData, contentScale = ContentScale.Fit,
contentScale = ContentScale.Fit, contentDescription = null,
contentDescription = null, )
)
}
} }
} }