From 4c5e1277bde22503106769dc672d1f3f4836e89b Mon Sep 17 00:00:00 2001 From: yostyle Date: Tue, 30 Jul 2024 14:39:07 +0200 Subject: [PATCH] Rename maxSize to maxPxSize --- .../java/im/vector/app/features/home/AvatarRenderer.kt | 8 ++++---- .../java/im/vector/app/features/html/PillImageSpan.kt | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/vector/src/main/java/im/vector/app/features/home/AvatarRenderer.kt b/vector/src/main/java/im/vector/app/features/home/AvatarRenderer.kt index a83f6eec78..ffd5a4849c 100644 --- a/vector/src/main/java/im/vector/app/features/home/AvatarRenderer.kt +++ b/vector/src/main/java/im/vector/app/features/home/AvatarRenderer.kt @@ -163,7 +163,7 @@ class AvatarRenderer @Inject constructor( glideRequests: GlideRequests, matrixItem: MatrixItem, target: Target, - maxSize: Int = 0 + maxPxSize: Int = 0 ) { val placeholder = getPlaceholderDrawable(matrixItem) glideRequests.loadResolvedUrl(matrixItem.avatarUrl) @@ -174,7 +174,7 @@ class AvatarRenderer @Inject constructor( } else -> { // TCHAP Fix avatar sizing - it.apply(RequestOptions.circleCropTransform().override(maxSize, maxSize)) + it.apply(RequestOptions.circleCropTransform().override(maxPxSize, maxPxSize)) } } } @@ -266,10 +266,10 @@ class AvatarRenderer @Inject constructor( } @AnyThread - fun getCachedDrawable(glideRequests: GlideRequests, matrixItem: MatrixItem, maxSize: Int = 0): Drawable { + fun getCachedDrawable(glideRequests: GlideRequests, matrixItem: MatrixItem, maxPxSize: Int = 0): Drawable { return glideRequests.loadResolvedUrl(matrixItem.avatarUrl) .onlyRetrieveFromCache(true) - .apply(RequestOptions.circleCropTransform().override(maxSize, maxSize)) // TCHAP Fix avatar sizing + .apply(RequestOptions.circleCropTransform().override(maxPxSize, maxPxSize)) // TCHAP Fix avatar sizing .submit() .get() } diff --git a/vector/src/main/java/im/vector/app/features/html/PillImageSpan.kt b/vector/src/main/java/im/vector/app/features/html/PillImageSpan.kt index bc2d7708c9..390804ba81 100644 --- a/vector/src/main/java/im/vector/app/features/html/PillImageSpan.kt +++ b/vector/src/main/java/im/vector/app/features/html/PillImageSpan.kt @@ -57,7 +57,7 @@ class PillImageSpan( override val matrixItem: MatrixItem ) : ReplacementSpan(), MatrixItemSpan { - private val maxSize = context.resources.getDimensionPixelSize(im.vector.lib.ui.styles.R.dimen.pill_avatar_size) + private val maxPxSize = context.resources.getDimensionPixelSize(im.vector.lib.ui.styles.R.dimen.pill_avatar_size) private val pillDrawable = createChipDrawable() private val target = PillImageSpanTarget(this) private var tv: WeakReference? = null @@ -65,7 +65,7 @@ class PillImageSpan( @UiThread fun bind(textView: TextView) { tv = WeakReference(textView) - avatarRenderer.render(glideRequests, matrixItem, target, maxSize) // TCHAP Fix avatar sizing + avatarRenderer.render(glideRequests, matrixItem, target, maxPxSize) // TCHAP Fix avatar sizing } // ReplacementSpan ***************************************************************************** @@ -145,7 +145,7 @@ class PillImageSpan( } else -> { try { - avatarRenderer.getCachedDrawable(glideRequests, matrixItem, maxSize) // TCHAP Fix avatar sizing + avatarRenderer.getCachedDrawable(glideRequests, matrixItem, maxPxSize) // TCHAP Fix avatar sizing } catch (exception: Exception) { avatarRenderer.getPlaceholderDrawable(matrixItem) }