From 1cab607fa1261b4385834519f85efffbe25acc78 Mon Sep 17 00:00:00 2001 From: Hardcore Sushi Date: Sat, 23 Oct 2021 19:40:10 +0200 Subject: [PATCH] Decode images with BitmapFactory instead of Glide --- .../hardcore/droidfs/file_viewers/ImageViewer.kt | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/sushi/hardcore/droidfs/file_viewers/ImageViewer.kt b/app/src/main/java/sushi/hardcore/droidfs/file_viewers/ImageViewer.kt index 83b8bc1..0d945cc 100644 --- a/app/src/main/java/sushi/hardcore/droidfs/file_viewers/ImageViewer.kt +++ b/app/src/main/java/sushi/hardcore/droidfs/file_viewers/ImageViewer.kt @@ -2,15 +2,14 @@ package sushi.hardcore.droidfs.file_viewers import android.content.res.Configuration import android.graphics.Bitmap +import android.graphics.BitmapFactory import android.graphics.Matrix -import android.graphics.drawable.Drawable import android.os.Handler import android.view.MotionEvent import android.view.View import android.view.WindowManager import android.widget.Toast import com.bumptech.glide.Glide -import com.bumptech.glide.RequestBuilder import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool import com.bumptech.glide.load.resource.bitmap.BitmapTransformation import sushi.hardcore.droidfs.ConstValues @@ -32,7 +31,7 @@ class ImageViewer: FileViewerActivity() { private lateinit var fileName: String private lateinit var handler: Handler - private lateinit var glideImage: RequestBuilder + private lateinit var bitmap: Bitmap private var x1 = 0F private var x2 = 0F private var slideshowActive = false @@ -151,8 +150,8 @@ class ImageViewer: FileViewerActivity() { private fun loadImage(){ loadWholeFile(filePath)?.let { - glideImage = Glide.with(this).load(it) - glideImage.into(binding.imageViewer) + bitmap = BitmapFactory.decodeByteArray(it, 0, it.size) + Glide.with(this).load(bitmap).into(binding.imageViewer) fileName = File(filePath).name binding.textFilename.text = fileName rotationAngle = 0F @@ -206,7 +205,7 @@ class ImageViewer: FileViewerActivity() { private fun rotateImage(){ binding.imageViewer.restoreZoomNormal() - glideImage.transform(RotateTransformation(this)).into(binding.imageViewer) + Glide.with(this).load(bitmap).transform(RotateTransformation(this)).into(binding.imageViewer) } private fun askSaveRotation(callback: () -> Unit){