Merge remote-tracking branch 'Sinofine/bubble-scale' into sc

Change-Id: I8d1ec00d90280bdfa107ec25b6ca691169b00ba5
2023-02-28 15:05:41 +01:00 · 2023-02-28 15:05:41 +01:00 · 7c43d951fb
parent 5c0fdcc1ea 772421f20d
commit 7c43d951fb
3 changed files with 3 additions and 2 deletions
--- a/vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
+++ b/vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
@ -117,6 +117,7 @@ class ImageContentRenderer @Inject constructor(
        */
        GlideApp.with(imageView)
                .load(imageUrl)
+                .fitCenter()
                .listener(object: RequestListener<Drawable> {
                    override fun onLoadFailed(e: GlideException?, model: Any?, target: Target<Drawable>?, isFirstResource: Boolean): Boolean {
                        Timber.e("Rendering url $imageUrl failed: $e")
--- a/vector/src/main/res/layout/view_url_preview.xml
+++ b/vector/src/main/res/layout/view_url_preview.xml
@ -99,4 +99,4 @@
    </androidx.constraintlayout.widget.ConstraintLayout>


-</merge>
+</merge>
--- a/vector/src/main/res/layout/view_url_preview_sc.xml
+++ b/vector/src/main/res/layout/view_url_preview_sc.xml
@ -86,4 +86,4 @@
        app:tint="?vctr_content_secondary"
        tools:ignore="MissingPrefix" />

-</merge>
+</merge>