From aae7c3905892b0e05c9b48468a88b5dab5cc32d9 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Sat, 1 Apr 2017 15:55:12 +0200
Subject: [PATCH] set a background to subsampled images to avoid glitches at
 too small images

---
 .../gallery/fragments/PhotoFragment.kt        | 26 ++++++++++++++++++-
 .../gallery/models/Medium.kt                  |  2 ++
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/fragments/PhotoFragment.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/fragments/PhotoFragment.kt
index d12318165..126ae05eb 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/fragments/PhotoFragment.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/fragments/PhotoFragment.kt
@@ -3,7 +3,9 @@ package com.simplemobiletools.gallery.fragments
 import android.content.res.Configuration
 import android.graphics.Bitmap
 import android.graphics.BitmapFactory
+import android.graphics.Color
 import android.graphics.Matrix
+import android.graphics.drawable.ColorDrawable
 import android.net.Uri
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -22,6 +24,7 @@ import com.simplemobiletools.commons.extensions.beVisible
 import com.simplemobiletools.commons.extensions.toast
 import com.simplemobiletools.gallery.R
 import com.simplemobiletools.gallery.activities.ViewPagerActivity
+import com.simplemobiletools.gallery.extensions.config
 import com.simplemobiletools.gallery.extensions.getRealPathFromURI
 import com.simplemobiletools.gallery.helpers.GlideRotateTransformation
 import com.simplemobiletools.gallery.helpers.MEDIUM
@@ -112,6 +115,7 @@ class PhotoFragment : ViewPagerFragment() {
             } else {
                 view.subsampling_view.recycle()
                 view.subsampling_view.beGone()
+                view.subsampling_view.background = ColorDrawable(Color.TRANSPARENT)
             }
         }
     }
@@ -182,12 +186,32 @@ class PhotoFragment : ViewPagerFragment() {
     }
 
     private fun addZoomableView() {
-        if (!medium.isPng() && isMenuVisible && view.subsampling_view.visibility == View.GONE) {
+        if (medium.isJpg() && isMenuVisible && view.subsampling_view.visibility == View.GONE) {
             view.subsampling_view.apply {
                 beVisible()
                 setDoubleTapZoomScale(1.4f)
                 setImage(ImageSource.uri(medium.path))
                 orientation = SubsamplingScaleImageView.ORIENTATION_USE_EXIF
+                setOnImageEventListener(object : SubsamplingScaleImageView.OnImageEventListener {
+                    override fun onImageLoaded() {
+                    }
+
+                    override fun onReady() {
+                        background = ColorDrawable(context.config.backgroundColor)
+                    }
+
+                    override fun onTileLoadError(p0: java.lang.Exception?) {
+                    }
+
+                    override fun onPreviewReleased() {
+                    }
+
+                    override fun onImageLoadError(p0: java.lang.Exception?) {
+                    }
+
+                    override fun onPreviewLoadError(p0: java.lang.Exception?) {
+                    }
+                })
             }
         }
     }
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/models/Medium.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/models/Medium.kt
index d33f51d19..9c1bf6d17 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/models/Medium.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/models/Medium.kt
@@ -20,6 +20,8 @@ data class Medium(val name: String, var path: String, val isVideo: Boolean, val
 
     fun isGif() = path.isGif()
 
+    fun isJpg() = !isPng() && !isGif()
+
     fun isImage() = !isGif() && !isVideo
 
     fun getMimeType() = File(path).getMimeType()