From bba5c06166c30a11a85fa13af83077cca46dac8c Mon Sep 17 00:00:00 2001
From: Alibek Omarov <a1ba.omarov@gmail.com>
Date: Mon, 5 Oct 2020 15:52:13 +0300
Subject: [PATCH] ViewImageFragment: fix thumbnail being shown under main
 image, fix scaling

---
 .../com/keylesspalace/tusky/fragment/ViewImageFragment.kt    | 5 ++++-
 app/src/main/res/layout/fragment_view_image.xml              | 3 +--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/keylesspalace/tusky/fragment/ViewImageFragment.kt b/app/src/main/java/com/keylesspalace/tusky/fragment/ViewImageFragment.kt
index 64c01f52..f7d8538a 100644
--- a/app/src/main/java/com/keylesspalace/tusky/fragment/ViewImageFragment.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/fragment/ViewImageFragment.kt
@@ -40,6 +40,7 @@ import java.io.File
 import java.lang.Exception
 import kotlin.math.abs
 import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView
+import com.github.piasy.biv.view.BigImageView
 
 
 class ViewImageFragment : ViewMediaFragment() {
@@ -248,7 +249,7 @@ class ViewImageFragment : ViewMediaFragment() {
         // if we had preview, load full image, as transition has ended
         if (showingPreview) {
             showingPreview = false
-            photoView.loadMainImageNow()
+            photoView.showImage(uri)
         }
     }
 
@@ -256,6 +257,8 @@ class ViewImageFragment : ViewMediaFragment() {
         override fun onSuccess(image: File?) {
             if(!showingPreview) {
                 progressBar?.hide()
+
+                photoView.setInitScaleType(BigImageView.INIT_SCALE_TYPE_CENTER_INSIDE)
                 photoView.ssiv?.orientation = SubsamplingScaleImageView.ORIENTATION_USE_EXIF
                 photoView.mainView?.setOnTouchListener(imageOnTouchListener)
             }
diff --git a/app/src/main/res/layout/fragment_view_image.xml b/app/src/main/res/layout/fragment_view_image.xml
index caec9eec..1676427e 100644
--- a/app/src/main/res/layout/fragment_view_image.xml
+++ b/app/src/main/res/layout/fragment_view_image.xml
@@ -11,8 +11,7 @@
         android:id="@+id/photoView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        app:initScaleType="fitCenter"
-        app:optimizeDisplay="false" />
+        app:optimizeDisplay="true" />
 
     <ProgressBar
         android:id="@+id/progressBar"