diff --git a/app/build.gradle b/app/build.gradle index 40ed7965c..37ebe515f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -75,7 +75,7 @@ dependencies { implementation 'com.squareup.picasso:picasso:2.71828' implementation 'com.caverock:androidsvg-aar:1.3' implementation 'com.github.tibbi:gestureviews:985ba285fb' - implementation 'com.github.tibbi:subsampling-scale-image-view:89c16d24c5' + implementation 'com.github.tibbi:subsampling-scale-image-view:40dc6ee2b1' kapt 'com.github.bumptech.glide:compiler:4.8.0' // keep it here too, not just in Commons, else loading SVGs wont work kapt 'androidx.room:room-compiler:2.0.0' diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/SettingsActivity.kt index 169528978..fd581e8ef 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/SettingsActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/SettingsActivity.kt @@ -70,7 +70,6 @@ class SettingsActivity : SimpleActivity() { setupEnablePullToRefresh() setupAllowZoomingImages() setupShowHighestQuality() - setupOneFingerZoom() setupAllowOneToOneZoom() setupAllowInstantChange() setupShowExtendedDetails() @@ -402,7 +401,6 @@ class SettingsActivity : SimpleActivity() { } private fun updateDeepZoomToggleButtons() { - settings_one_finger_zoom_holder.beVisibleIf(config.allowZoomingImages) settings_show_highest_quality_holder.beVisibleIf(config.allowZoomingImages) settings_allow_one_to_one_zoom_holder.beVisibleIf(config.allowZoomingImages) } @@ -415,14 +413,6 @@ class SettingsActivity : SimpleActivity() { } } - private fun setupOneFingerZoom() { - settings_one_finger_zoom.isChecked = config.oneFingerZoom - settings_one_finger_zoom_holder.setOnClickListener { - settings_one_finger_zoom.toggle() - config.oneFingerZoom = settings_one_finger_zoom.isChecked - } - } - private fun setupAllowOneToOneZoom() { settings_allow_one_to_one_zoom.isChecked = config.allowOneToOneZoom settings_allow_one_to_one_zoom_holder.setOnClickListener { @@ -612,7 +602,6 @@ class SettingsActivity : SimpleActivity() { put(SCREEN_ROTATION, config.screenRotation) put(ALLOW_ZOOMING_IMAGES, config.allowZoomingImages) put(SHOW_HIGHEST_QUALITY, config.showHighestQuality) - put(ONE_FINGER_ZOOM, config.oneFingerZoom) put(ALLOW_ONE_TO_ONE_ZOOM, config.allowOneToOneZoom) put(SHOW_EXTENDED_DETAILS, config.showExtendedDetails) put(HIDE_EXTENDED_DETAILS, config.hideExtendedDetails) @@ -733,7 +722,6 @@ class SettingsActivity : SimpleActivity() { SCREEN_ROTATION -> config.screenRotation = value.toInt() ALLOW_ZOOMING_IMAGES -> config.allowZoomingImages = value.toBoolean() SHOW_HIGHEST_QUALITY -> config.showHighestQuality = value.toBoolean() - ONE_FINGER_ZOOM -> config.oneFingerZoom = value.toBoolean() ALLOW_ONE_TO_ONE_ZOOM -> config.allowOneToOneZoom = value.toBoolean() SHOW_EXTENDED_DETAILS -> config.showExtendedDetails = value.toBoolean() HIDE_EXTENDED_DETAILS -> config.hideExtendedDetails = value.toBoolean() diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/fragments/PhotoFragment.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/fragments/PhotoFragment.kt index 90ed11a08..678688f88 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/fragments/PhotoFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/fragments/PhotoFragment.kt @@ -80,7 +80,6 @@ class PhotoFragment : ViewPagerFragment() { private var mStoredHideExtendedDetails = false private var mStoredAllowDeepZoomableImages = false private var mStoredShowHighestQuality = false - private var mStoredAllowOneFingerZoom = false private var mStoredExtendedDetails = 0 private lateinit var mView: ViewGroup @@ -199,8 +198,7 @@ class PhotoFragment : ViewPagerFragment() { } if (mWasInit) { - if (config.allowZoomingImages != mStoredAllowDeepZoomableImages || config.showHighestQuality != mStoredShowHighestQuality || - config.oneFingerZoom != mStoredAllowOneFingerZoom) { + if (config.allowZoomingImages != mStoredAllowDeepZoomableImages || config.showHighestQuality != mStoredShowHighestQuality) { mIsSubsamplingVisible = false mView.subsampling_view.beGone() loadImage() @@ -272,7 +270,6 @@ class PhotoFragment : ViewPagerFragment() { mStoredHideExtendedDetails = hideExtendedDetails mStoredAllowDeepZoomableImages = allowZoomingImages mStoredShowHighestQuality = showHighestQuality - mStoredAllowOneFingerZoom = oneFingerZoom mStoredExtendedDetails = extendedDetails } } @@ -456,7 +453,6 @@ class PhotoFragment : ViewPagerFragment() { regionDecoderFactory = regionDecoder maxScale = 10f beVisible() - isQuickScaleEnabled = config.oneFingerZoom isOneToOneZoomEnabled = config.allowOneToOneZoom orientation = rotation + mCurrentRotationDegrees setImage(path) diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/Config.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/Config.kt index f7d14e261..f715686b4 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/Config.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/Config.kt @@ -206,10 +206,6 @@ class Config(context: Context) : BaseConfig(context) { get() = prefs.getInt(getDirectoryColumnsField(), getDefaultDirectoryColumnCount()) set(dirColumnCnt) = prefs.edit().putInt(getDirectoryColumnsField(), dirColumnCnt).apply() - var oneFingerZoom: Boolean - get() = prefs.getBoolean(ONE_FINGER_ZOOM, false) - set(oneFingerZoom) = prefs.edit().putBoolean(ONE_FINGER_ZOOM, oneFingerZoom).apply() - var allowInstantChange: Boolean get() = prefs.getBoolean(ALLOW_INSTANT_CHANGE, false) set(allowInstantChange) = prefs.edit().putBoolean(ALLOW_INSTANT_CHANGE, allowInstantChange).apply() diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/Constants.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/Constants.kt index 706a3bb93..d3f5588a8 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/Constants.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/Constants.kt @@ -47,7 +47,6 @@ const val VIEW_TYPE_FILES = "view_type_files" const val SHOW_EXTENDED_DETAILS = "show_extended_details" const val EXTENDED_DETAILS = "extended_details" const val HIDE_EXTENDED_DETAILS = "hide_extended_details" -const val ONE_FINGER_ZOOM = "one_finger_zoom" const val ALLOW_INSTANT_CHANGE = "allow_instant_change" const val DO_EXTRA_CHECK = "do_extra_check" const val WAS_NEW_APP_SHOWN = "was_new_app_shown_clock" diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index 280ea6978..bf10bce55 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -819,30 +819,6 @@ - - - - - -