diff --git a/app/build.gradle b/app/build.gradle index f2e130499..11e969c2a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -125,7 +125,7 @@ dependencies { implementation 'io.coil-kt:coil-base:2.2.0' implementation 'io.coil-kt:coil-svg:2.1.0' // implementation 'com.davemorrissey.labs:subsampling-scale-image-view-androidx:3.10.0' - implementation 'com.github.KotatsuApp:subsampling-scale-image-view:d3aa1d2beb' + implementation 'com.github.KotatsuApp:subsampling-scale-image-view:2942b797a2' implementation 'com.github.solkin:disk-lru-cache:1.4' implementation 'ch.acra:acra-http:5.9.5' diff --git a/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/standard/PageHolder.kt b/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/standard/PageHolder.kt index a4d60c861..397ce0b4e 100644 --- a/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/standard/PageHolder.kt +++ b/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/standard/PageHolder.kt @@ -69,7 +69,7 @@ open class PageHolder( override fun onImageShowing(zoom: ZoomMode) { binding.ssiv.maxScale = 2f * maxOf( binding.ssiv.width / binding.ssiv.sWidth.toFloat(), - binding.ssiv.height / binding.ssiv.sHeight.toFloat() + binding.ssiv.height / binding.ssiv.sHeight.toFloat(), ) when (zoom) { ZoomMode.FIT_CENTER -> { @@ -81,7 +81,7 @@ open class PageHolder( binding.ssiv.minScale = binding.ssiv.height / binding.ssiv.sHeight.toFloat() binding.ssiv.setScaleAndCenter( binding.ssiv.minScale, - PointF(0f, binding.ssiv.sHeight / 2f) + PointF(0f, binding.ssiv.sHeight / 2f), ) } ZoomMode.FIT_WIDTH -> { @@ -89,14 +89,14 @@ open class PageHolder( binding.ssiv.minScale = binding.ssiv.width / binding.ssiv.sWidth.toFloat() binding.ssiv.setScaleAndCenter( binding.ssiv.minScale, - PointF(binding.ssiv.sWidth / 2f, 0f) + PointF(binding.ssiv.sWidth / 2f, 0f), ) } ZoomMode.KEEP_START -> { binding.ssiv.setMinimumScaleType(SubsamplingScaleImageView.SCALE_TYPE_CENTER_INSIDE) binding.ssiv.setScaleAndCenter( binding.ssiv.maxScale, - PointF(0f, 0f) + PointF(0f, 0f), ) } } @@ -115,9 +115,9 @@ open class PageHolder( override fun onError(e: Throwable) { bindingInfo.textViewError.text = e.getDisplayMessage(context.resources) bindingInfo.buttonRetry.setText( - ExceptionResolver.getResolveStringId(e).ifZero { R.string.try_again } + ExceptionResolver.getResolveStringId(e).ifZero { R.string.try_again }, ) bindingInfo.layoutError.isVisible = true bindingInfo.progressBar.hideCompat() } -} \ No newline at end of file +} diff --git a/app/src/main/res/layout/activity_image.xml b/app/src/main/res/layout/activity_image.xml index 3aa6f1ad3..7d147e770 100644 --- a/app/src/main/res/layout/activity_image.xml +++ b/app/src/main/res/layout/activity_image.xml @@ -1,13 +1,15 @@ + android:layout_height="match_parent" + app:restoreStrategy="deferred" /> - \ No newline at end of file + diff --git a/app/src/main/res/layout/item_page.xml b/app/src/main/res/layout/item_page.xml index ee57ce9ff..3634cf169 100644 --- a/app/src/main/res/layout/item_page.xml +++ b/app/src/main/res/layout/item_page.xml @@ -1,6 +1,7 @@ + android:layout_height="match_parent" + app:restoreStrategy="deferred" /> - \ No newline at end of file +