fenix
/
Simple-Gallery
mirror of https://github.com/SimpleMobileTools/Simple-Gallery.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix rotating images with Deep zoomable images disabled

This commit is contained in:
tibbi 2019-02-07 14:58:09 +01:00
parent 5e41e17143
commit 40902b8310
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/src/main/kotlin/com/simplemobiletools/gallery/pro/fragments/PhotoFragment.kt
View File

@ -352,15 +352,15 @@ class PhotoFragment : ViewPagerFragment() {
.into(mView.gestures_view) .into(mView.gestures_view)
} }
private fun loadBitmap(degrees: Int = mCurrentRotationDegrees, addZoomableView: Boolean = true) { private fun loadBitmap(addZoomableView: Boolean = true) {
val options = RequestOptions() val options = RequestOptions()
.signature(mMedium.path.getFileSignature()) .signature(mMedium.path.getFileSignature())
.format(DecodeFormat.PREFER_ARGB_8888) .format(DecodeFormat.PREFER_ARGB_8888)
.diskCacheStrategy(DiskCacheStrategy.RESOURCE) .diskCacheStrategy(DiskCacheStrategy.RESOURCE)
.fitCenter() .fitCenter()
if (degrees != 0) { if (mCurrentRotationDegrees != 0) {
options.transform(GlideRotateTransformation(degrees)) options.transform(GlideRotateTransformation(mCurrentRotationDegrees))
options.diskCacheStrategy(DiskCacheStrategy.NONE) options.diskCacheStrategy(DiskCacheStrategy.NONE)
} }
@ -370,7 +370,7 @@ class PhotoFragment : ViewPagerFragment() {
.listener(object : RequestListener<Drawable> { .listener(object : RequestListener<Drawable> {
override fun onLoadFailed(e: GlideException?, model: Any?, target: Target<Drawable>?, isFirstResource: Boolean): Boolean { override fun onLoadFailed(e: GlideException?, model: Any?, target: Target<Drawable>?, isFirstResource: Boolean): Boolean {
if (activity != null) { if (activity != null) {
tryLoadingWithPicasso(degrees, addZoomableView) tryLoadingWithPicasso(addZoomableView)
} }
return false return false
} }
@ -384,7 +384,7 @@ class PhotoFragment : ViewPagerFragment() {
}).into(mView.gestures_view) }).into(mView.gestures_view)
} }
private fun tryLoadingWithPicasso(degrees: Int = 0, addZoomableView: Boolean) { private fun tryLoadingWithPicasso(addZoomableView: Boolean) {
var pathToLoad = if (mMedium.path.startsWith("content://")) mMedium.path else "file://${mMedium.path}" var pathToLoad = if (mMedium.path.startsWith("content://")) mMedium.path else "file://${mMedium.path}"
pathToLoad = pathToLoad.replace("%", "%25").replace("#", "%23") pathToLoad = pathToLoad.replace("%", "%25").replace("#", "%23")
@ -395,15 +395,15 @@ class PhotoFragment : ViewPagerFragment() {
.stableKey(mMedium.path.getFileKey()) .stableKey(mMedium.path.getFileKey())
.resize(mScreenWidth, mScreenHeight) .resize(mScreenWidth, mScreenHeight)
if (degrees != 0) { if (mCurrentRotationDegrees != 0) {
picasso.rotate(degrees.toFloat()) picasso.rotate(mCurrentRotationDegrees.toFloat())
} else { } else {
degreesForRotation(mImageOrientation).toFloat() degreesForRotation(mImageOrientation).toFloat()
} }
picasso.into(mView.gestures_view, object : Callback { picasso.into(mView.gestures_view, object : Callback {
override fun onSuccess() { override fun onSuccess() {
mView.gestures_view.controller.settings.isZoomEnabled = degrees != 0 || context?.config?.allowZoomingImages == false mView.gestures_view.controller.settings.isZoomEnabled = mCurrentRotationDegrees != 0 || context?.config?.allowZoomingImages == false
if (mIsFragmentVisible && addZoomableView) { if (mIsFragmentVisible && addZoomableView) {
scheduleZoomableView() scheduleZoomableView()
} }
@ -482,7 +482,7 @@ class PhotoFragment : ViewPagerFragment() {
val useHeight = if (fullRotation == 90 || fullRotation == 270) sWidth else sHeight val useHeight = if (fullRotation == 90 || fullRotation == 270) sWidth else sHeight
doubleTapZoomScale = getDoubleTapZoomScale(useWidth, useHeight) doubleTapZoomScale = getDoubleTapZoomScale(useWidth, useHeight)
mCurrentRotationDegrees = (mCurrentRotationDegrees + degrees) % 360 mCurrentRotationDegrees = (mCurrentRotationDegrees + degrees) % 360
loadBitmap(mCurrentRotationDegrees, false) loadBitmap(false)
activity?.invalidateOptionsMenu() activity?.invalidateOptionsMenu()
} }
} }
@ -563,7 +563,7 @@ class PhotoFragment : ViewPagerFragment() {
mCurrentRotationDegrees = (mCurrentRotationDegrees + degrees) % 360 mCurrentRotationDegrees = (mCurrentRotationDegrees + degrees) % 360
mLoadZoomableViewHandler.removeCallbacksAndMessages(null) mLoadZoomableViewHandler.removeCallbacksAndMessages(null)
mIsSubsamplingVisible = false mIsSubsamplingVisible = false
loadBitmap(degrees) loadBitmap()
} }
} }