From 050b59f09d3c178e4bdc82cb9ab7e0bfb48c1ab2 Mon Sep 17 00:00:00 2001 From: Alan Evans Date: Fri, 12 Feb 2021 10:35:04 -0400 Subject: [PATCH] Increase maximum zoom level for small images. --- .../securesms/components/ZoomingImageView.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/ZoomingImageView.java b/app/src/main/java/org/thoughtcrime/securesms/components/ZoomingImageView.java index d3e0340f5..d0b790e9f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/ZoomingImageView.java +++ b/app/src/main/java/org/thoughtcrime/securesms/components/ZoomingImageView.java @@ -40,8 +40,12 @@ public class ZoomingImageView extends FrameLayout { private static final int ZOOM_TRANSITION_DURATION = 300; private static final float ZOOM_LEVEL_MIN = 1.0f; - private static final float ZOOM_LEVEL_MID = 1.5f; - private static final float ZOOM_LEVEL_MAX = 2.0f; + + private static final float LARGE_IMAGES_ZOOM_LEVEL_MID = 1.5f; + private static final float LARGE_IMAGES_ZOOM_LEVEL_MAX = 2.0f; + + private static final float SMALL_IMAGES_ZOOM_LEVEL_MID = 3.0f; + private static final float SMALL_IMAGES_ZOOM_LEVEL_MAX = 8.0f; private final PhotoView photoView; private final SubsamplingScaleImageView subsamplingImageView; @@ -65,10 +69,11 @@ public class ZoomingImageView extends FrameLayout { this.subsamplingImageView.setOrientation(SubsamplingScaleImageView.ORIENTATION_USE_EXIF); this.photoView.setZoomTransitionDuration(ZOOM_TRANSITION_DURATION); - this.photoView.setScaleLevels(ZOOM_LEVEL_MIN, ZOOM_LEVEL_MID, ZOOM_LEVEL_MAX); + this.photoView.setScaleLevels(ZOOM_LEVEL_MIN, SMALL_IMAGES_ZOOM_LEVEL_MID, SMALL_IMAGES_ZOOM_LEVEL_MAX); this.subsamplingImageView.setDoubleTapZoomDuration(ZOOM_TRANSITION_DURATION); - this.subsamplingImageView.setDoubleTapZoomScale(ZOOM_LEVEL_MID); + this.subsamplingImageView.setDoubleTapZoomScale(LARGE_IMAGES_ZOOM_LEVEL_MID); + this.subsamplingImageView.setMaxScale(LARGE_IMAGES_ZOOM_LEVEL_MAX); this.photoView.setOnClickListener(v -> ZoomingImageView.this.callOnClick()); this.subsamplingImageView.setOnClickListener(v -> ZoomingImageView.this.callOnClick());