From 572ae2d398416141e79f4517b5486b216760d4be Mon Sep 17 00:00:00 2001 From: Jays2Kings Date: Mon, 23 Oct 2023 17:19:40 -0700 Subject: [PATCH] more updates to back progress animation --- .../main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt | 5 +++-- .../java/eu/kanade/tachiyomi/ui/manga/FullCoverDialog.kt | 7 +++++-- .../eu/kanade/tachiyomi/util/view/ControllerExtensions.kt | 4 ++-- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt index 0222b26bbc..26e4de7950 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt @@ -278,8 +278,9 @@ open class MainActivity : BaseActivity() { ) velocityTracker.addMovement(motionEvent) motionEvent.recycle() - velocityTracker.computeCurrentVelocity(2, 5f) - backVelocity = max(1f, abs(velocityTracker.getAxisVelocity(MotionEvent.AXIS_X))) + velocityTracker.computeCurrentVelocity(1, 5f) + backVelocity = + max(0.5f, abs(velocityTracker.getAxisVelocity(MotionEvent.AXIS_X)) * 0.5f) } lastX = 0f lastY = 0f diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/FullCoverDialog.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/FullCoverDialog.kt index 05efc90c3d..4e4acba4fc 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/FullCoverDialog.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/FullCoverDialog.kt @@ -42,6 +42,7 @@ import eu.kanade.tachiyomi.util.system.powerManager import eu.kanade.tachiyomi.util.system.rootWindowInsetsCompat import eu.kanade.tachiyomi.util.view.animateBlur import uy.kohesive.injekt.injectLazy +import kotlin.math.abs import kotlin.math.max import kotlin.math.min @@ -285,8 +286,10 @@ class FullCoverDialog(val controller: MangaDetailsController, drawable: Drawable transitionSet.addTransition(ChangeImageTransform()) transitionSet.duration = shortAnimationDuration if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) { - velocityTracker.computeCurrentVelocity(2, 40f) - transitionSet.interpolator = DecelerateInterpolator(max(1f, velocityTracker.getAxisVelocity(MotionEvent.AXIS_X))) + velocityTracker.computeCurrentVelocity(1, 5f) + val velo = + max(0.5f, abs(velocityTracker.getAxisVelocity(MotionEvent.AXIS_X)) * 0.5f) + transitionSet.interpolator = DecelerateInterpolator(velo) } TransitionManager.beginDelayedTransition(binding.root, transitionSet) diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/view/ControllerExtensions.kt b/app/src/main/java/eu/kanade/tachiyomi/util/view/ControllerExtensions.kt index d5816d0c1d..76b9234fef 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/util/view/ControllerExtensions.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/util/view/ControllerExtensions.kt @@ -812,14 +812,14 @@ fun Controller.withFadeTransaction(): RouterTransaction { if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) { FadeChangeHandler() } else { - CrossFadeChangeHandler(removesFromViewOnPush = isLowRam) + CrossFadeChangeHandler(isLowRam) }, ) .popChangeHandler( if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) { FadeChangeHandler() } else { - CrossFadeChangeHandler(removesFromViewOnPush = isLowRam) + CrossFadeChangeHandler(isLowRam) }, ) }