mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2025-03-24 23:09:02 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request from vector-im/feature/attachement_pager_fix

Browse source 
Fix / view attachment crash + freeze when offline
This commit is contained in:
Benoit Marty 2020-07-13 11:33:11 +02:00 • committed by GitHub
commit ca61751a8b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 4 deletions
vector/src/main/java/im/vector/riotx/features/media
ImageContentRenderer.ktVectorAttachmentViewerActivity.kt

8
vector/src/main/java/im/vector/riotx/features/media/ImageContentRenderer.kt
View file

@ -151,7 +151,10 @@ class ImageContentRenderer @Inject constructor(private val activeSessionHolder:
.into(imageView) .into(imageView)
} }
fun renderThumbnailDontTransform(data: Data, imageView: ImageView, callback: ((Boolean) -> Unit)? = null) { /**
* onlyRetrieveFromCache is true!
*/
fun renderForSharedElementTransition(data: Data, imageView: ImageView, callback: ((Boolean) -> Unit)? = null) {
// a11y // a11y
imageView.contentDescription = data.filename imageView.contentDescription = data.filename
@ -186,7 +189,8 @@ class ImageContentRenderer @Inject constructor(private val activeSessionHolder:
return false return false
} }
}) })
.dontTransform() .onlyRetrieveFromCache(true)
.fitCenter()
.into(imageView) .into(imageView)
} }

4
vector/src/main/java/im/vector/riotx/features/media/VectorAttachmentViewerActivity.kt
View file

@ -96,7 +96,7 @@ class VectorAttachmentViewerActivity : AttachmentViewerActivity(), BaseAttachmen
// will be shown at end of transition // will be shown at end of transition
pager2.isInvisible = true pager2.isInvisible = true
supportPostponeEnterTransition() supportPostponeEnterTransition()
imageContentRenderer.renderThumbnailDontTransform(mediaData, imageTransitionView) { imageContentRenderer.renderForSharedElementTransition(mediaData, imageTransitionView) {
// Proceed with transaction // Proceed with transaction
scheduleStartPostponedTransition(imageTransitionView) scheduleStartPostponedTransition(imageTransitionView)
} }
@ -104,7 +104,7 @@ class VectorAttachmentViewerActivity : AttachmentViewerActivity(), BaseAttachmen
// will be shown at end of transition // will be shown at end of transition
pager2.isInvisible = true pager2.isInvisible = true
supportPostponeEnterTransition() supportPostponeEnterTransition()
imageContentRenderer.renderThumbnailDontTransform(mediaData.thumbnailMediaData, imageTransitionView) { imageContentRenderer.renderForSharedElementTransition(mediaData.thumbnailMediaData, imageTransitionView) {
// Proceed with transaction // Proceed with transaction
scheduleStartPostponedTransition(imageTransitionView) scheduleStartPostponedTransition(imageTransitionView)
} }