6543
/
BayernMessenger
forked from GitHub-Mirror/riotX-android
1
0
Fork 0
Code Issues 4 Pull Requests Releases Wiki Activity

Fix / can't zoom after rotation

This commit is contained in:
Valere 2019-07-19 11:58:24 +02:00
parent db88caf7fa
commit d78ff7ab08
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
vector/src/main/java/im/vector/riotx/features/media/ImageMediaViewerActivity.kt
View File

@ -21,7 +21,6 @@ import android.content.Intent
import android.graphics.drawable.Drawable import android.graphics.drawable.Drawable
import android.os.Build import android.os.Build
import android.os.Bundle import android.os.Bundle
import android.os.Handler
import android.view.View import android.view.View
import android.view.ViewTreeObserver import android.view.ViewTreeObserver
import androidx.annotation.RequiresApi import androidx.annotation.RequiresApi
@ -49,8 +48,6 @@ class ImageMediaViewerActivity : VectorBaseActivity() {


@Inject lateinit var imageContentRenderer: ImageContentRenderer @Inject lateinit var imageContentRenderer: ImageContentRenderer


private val mHideHandler = Handler()

lateinit var mediaData: ImageContentRenderer.Data lateinit var mediaData: ImageContentRenderer.Data


override fun injectWith(injector: ScreenComponent) { override fun injectWith(injector: ScreenComponent) {
@ -71,13 +68,15 @@ class ImageMediaViewerActivity : VectorBaseActivity() {


configureToolbar(imageMediaViewerToolbar, mediaData) configureToolbar(imageMediaViewerToolbar, mediaData)


if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP && addTransitionListener()) { if (isFirstCreation() && Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP && addTransitionListener()) {
// Encrypted image // Encrypted image
imageTransitionView.isVisible = true imageTransitionView.isVisible = true
imageMediaViewerImageView.isVisible = false imageMediaViewerImageView.isVisible = false
encryptedImageView.isVisible = false encryptedImageView.isVisible = false
//Postpone transaction a bit until thumbnail is loaded
supportPostponeEnterTransition() supportPostponeEnterTransition()
imageContentRenderer.renderFitTarget(mediaData, ImageContentRenderer.Mode.THUMBNAIL, imageTransitionView) { imageContentRenderer.renderFitTarget(mediaData, ImageContentRenderer.Mode.THUMBNAIL, imageTransitionView) {
//Proceed with transaction
scheduleStartPostponedTransition(imageTransitionView) scheduleStartPostponedTransition(imageTransitionView)
} }


@ -126,13 +125,10 @@ class ImageMediaViewerActivity : VectorBaseActivity() {
object : ViewTreeObserver.OnPreDrawListener { object : ViewTreeObserver.OnPreDrawListener {
override fun onPreDraw(): Boolean { override fun onPreDraw(): Boolean {
sharedElement.viewTreeObserver.removeOnPreDrawListener(this) sharedElement.viewTreeObserver.removeOnPreDrawListener(this)
supportStartPostponedEnterTransition() supportStartPostponedEnterTransition()
return true return true
} }
}) })

//Any how hide the transition image view after a delay
mHideHandler.postDelayed({ imageTransitionView.isInvisible = true }, 600)
} }


/** /**