From fe0e68ba5cef0ba776f24bc167e270024070970e Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Sun, 26 Jul 2020 16:06:21 +0300 Subject: [PATCH] ViewImageFragment: upgrade BigImageView to 1.6.6, enable swiping for all kinds of embedded views --- app/build.gradle | 6 +++--- .../keylesspalace/tusky/fragment/ViewImageFragment.kt | 10 ++++------ 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index f2f936bd..77f6b58f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -178,9 +178,9 @@ dependencies { implementation "com.github.connyduck:sparkbutton:4.0.0" - implementation 'com.github.piasy:BigImageViewer:1.6.5' - implementation 'com.github.piasy:GlideImageLoader:1.6.5' - implementation 'com.github.piasy:GlideImageViewFactory:1.6.5' + implementation 'com.github.piasy:BigImageViewer:1.6.6' + implementation 'com.github.piasy:GlideImageLoader:1.6.6' + implementation 'com.github.piasy:GlideImageViewFactory:1.6.6' implementation "com.mikepenz:materialdrawer:$materialdrawerVersion" implementation "com.mikepenz:materialdrawer-iconics:$materialdrawerVersion" 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 7da2559d..4a3c62af 100644 --- a/app/src/main/java/com/keylesspalace/tusky/fragment/ViewImageFragment.kt +++ b/app/src/main/java/com/keylesspalace/tusky/fragment/ViewImageFragment.kt @@ -118,7 +118,8 @@ class ViewImageFragment : ViewMediaFragment() { swipeStartedWithOneFinger = false } MotionEvent.ACTION_MOVE -> { - if(swipeStartedWithOneFinger && photoView.ssiv.scale <= photoView.ssiv.minScale) { + if(swipeStartedWithOneFinger && + (photoView.ssiv == null || photoView.ssiv.scale <= photoView.ssiv.minScale)) { val diff = event.rawY - lastY // This code is to prevent transformations during page scrolling // If we are already translating or we reached the threshold, then transform. @@ -149,7 +150,6 @@ class ViewImageFragment : ViewMediaFragment() { } }) - // photoView.setOnTouchListener(this) photoView.setImageLoaderCallback(imageLoaderCallback) photoView.setImageViewFactory(GlideImageViewFactory()) @@ -266,10 +266,8 @@ class ViewImageFragment : ViewMediaFragment() { override fun onSuccess(image: File?) { if(!showingPreview) { progressBar?.hide() - photoView.ssiv?.let { - it.orientation = SubsamplingScaleImageView.ORIENTATION_USE_EXIF - it.setOnTouchListener(imageOnTouchListener) - } + photoView.ssiv?.orientation = SubsamplingScaleImageView.ORIENTATION_USE_EXIF + photoView.mainView?.setOnTouchListener(imageOnTouchListener) } }