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

Take screen density into account when requesting thumbnails (#1262)

Browse source 
* Take screen density into account when requesting thumbnails

Otherwise, we could be asking for images with N size while we needed images for N@2x or N@3x size i.e.
This commit is contained in:
Jorge Martin Espinosa 2023-09-11 15:24:56 +02:00 • committed by GitHub
parent ac6d822bef
commit ddb8f66c32
2 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/CoilMediaFetcher.kt
View file

@ -16,6 +16,7 @@
package io.element.android.libraries.matrix.ui.media package io.element.android.libraries.matrix.ui.media
import android.content.Context
import coil.ImageLoader import coil.ImageLoader
import coil.decode.DataSource import coil.decode.DataSource
import coil.decode.ImageSource import coil.decode.ImageSource
@ -32,8 +33,10 @@ import okio.Buffer
import okio.Path.Companion.toOkioPath import okio.Path.Companion.toOkioPath
import timber.log.Timber import timber.log.Timber
import java.nio.ByteBuffer import java.nio.ByteBuffer
import kotlin.math.roundToLong
internal class CoilMediaFetcher( internal class CoilMediaFetcher(
private val scalingFunction: (Float) -> Float,
private val mediaLoader: MatrixMediaLoader, private val mediaLoader: MatrixMediaLoader,
private val mediaData: MediaRequestData?, private val mediaData: MediaRequestData?,
private val options: Options private val options: Options
@ -80,8 +83,8 @@ internal class CoilMediaFetcher(
private suspend fun fetchThumbnail(mediaSource: MediaSource, kind: MediaRequestData.Kind.Thumbnail, options: Options): FetchResult? { private suspend fun fetchThumbnail(mediaSource: MediaSource, kind: MediaRequestData.Kind.Thumbnail, options: Options): FetchResult? {
return mediaLoader.loadMediaThumbnail( return mediaLoader.loadMediaThumbnail(
source = mediaSource, source = mediaSource,
width = kind.width, width = scalingFunction(kind.width.toFloat()).roundToLong(),
height = kind.height height = scalingFunction(kind.height.toFloat()).roundToLong(),
).map { byteArray -> ).map { byteArray ->
byteArray.asSourceResult(options) byteArray.asSourceResult(options)
}.getOrNull() }.getOrNull()
@ -102,6 +105,7 @@ internal class CoilMediaFetcher(
} }
class MediaRequestDataFactory( class MediaRequestDataFactory(
private val context: Context,
private val client: MatrixClient private val client: MatrixClient
) : ) :
Fetcher.Factory<MediaRequestData> { Fetcher.Factory<MediaRequestData> {
@ -111,6 +115,7 @@ internal class CoilMediaFetcher(
imageLoader: ImageLoader imageLoader: ImageLoader
): Fetcher { ): Fetcher {
return CoilMediaFetcher( return CoilMediaFetcher(
scalingFunction = { context.resources.displayMetrics.density * it },
mediaLoader = client.mediaLoader, mediaLoader = client.mediaLoader,
mediaData = data, mediaData = data,
options = options options = options
@ -119,6 +124,7 @@ internal class CoilMediaFetcher(
} }
class AvatarFactory( class AvatarFactory(
private val context: Context,
private val client: MatrixClient private val client: MatrixClient
) : ) :
Fetcher.Factory<AvatarData> { Fetcher.Factory<AvatarData> {
@ -129,6 +135,7 @@ internal class CoilMediaFetcher(
imageLoader: ImageLoader imageLoader: ImageLoader
): Fetcher { ): Fetcher {
return CoilMediaFetcher( return CoilMediaFetcher(
scalingFunction = { context.resources.displayMetrics.density * it },
mediaLoader = client.mediaLoader, mediaLoader = client.mediaLoader,
mediaData = data.toMediaRequestData(), mediaData = data.toMediaRequestData(),
options = options options = options

4
libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/ImageLoaderFactories.kt
View file

@ -46,8 +46,8 @@ class LoggedInImageLoaderFactory @Inject constructor(
} }
add(AvatarDataKeyer()) add(AvatarDataKeyer())
add(MediaRequestDataKeyer()) add(MediaRequestDataKeyer())
add(CoilMediaFetcher.AvatarFactory(matrixClient)) add(CoilMediaFetcher.AvatarFactory(context, matrixClient))
add(CoilMediaFetcher.MediaRequestDataFactory(matrixClient)) add(CoilMediaFetcher.MediaRequestDataFactory(context, matrixClient))
} }
.build() .build()
} }