From 44f171bbf511b283be52c07db7de295e10f70bf9 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Tue, 14 Aug 2018 12:27:39 +0200
Subject: [PATCH] fix #900, handle one finger zooming toggle at PhotoView too

---
 app/build.gradle                                              | 4 +++-
 .../simplemobiletools/gallery/activities/SettingsActivity.kt  | 1 -
 .../com/simplemobiletools/gallery/fragments/PhotoFragment.kt  | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 81b1e9966..5c264e4d1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -52,7 +52,6 @@ dependencies {
     implementation 'com.android.support:multidex:1.0.3'
     implementation 'it.sephiroth.android.exif:library:1.0.1'
     implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.12'
-    implementation 'com.github.chrisbanes:PhotoView:2.1.4'
     implementation 'com.android.support.constraint:constraint-layout:1.1.2'
     implementation 'com.google.android.exoplayer:exoplayer-core:2.8.2'
     implementation 'com.google.vr:sdk-panowidget:1.150.0'
@@ -67,6 +66,9 @@ dependencies {
     //implementation 'com.davemorrissey.labs:subsampling-scale-image-view:3.9.0'
     implementation 'com.github.tibbi:subsampling-scale-image-view:v3.10.0-fork'
 
+    // implementation 'com.github.chrisbanes:PhotoView:2.1.4'
+    implementation 'com.github.tibbi:PhotoView:2.1.4-fork'
+
     debugImplementation "com.squareup.leakcanary:leakcanary-android:$leakCanaryVersion"
     releaseImplementation "com.squareup.leakcanary:leakcanary-android-no-op:$leakCanaryVersion"
 }
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/SettingsActivity.kt
index 4e17609c7..596b79ffc 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/SettingsActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/SettingsActivity.kt
@@ -336,7 +336,6 @@ class SettingsActivity : SimpleActivity() {
     }
 
     private fun setupAllowZoomingImages() {
-        settings_one_finger_zoom_holder.beVisibleIf(config.allowZoomingImages)
         settings_allow_zooming_images.isChecked = config.allowZoomingImages
         settings_allow_zooming_images_holder.setOnClickListener {
             settings_allow_zooming_images.toggle()
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 e87f90478..1ab3c2ef6 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/fragments/PhotoFragment.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/fragments/PhotoFragment.kt
@@ -155,6 +155,7 @@ class PhotoFragment : ViewPagerFragment() {
             photo_brightness_controller.beVisibleIf(allowPhotoGestures)
             instant_prev_item.beVisibleIf(allowInstantChange)
             instant_next_item.beVisibleIf(allowInstantChange)
+            photo_view.setAllowFingerDragZoom(activity!!.config.oneFingerZoom)
         }
 
         storeStateVariables()