From 51fcfc70e66917639f0e1c7dac7a948d2b0f7931 Mon Sep 17 00:00:00 2001 From: Jays2Kings Date: Wed, 18 Oct 2023 15:37:27 -0700 Subject: [PATCH] maybe fix small glitch when back is progressing --- app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt | 1 + .../java/eu/kanade/tachiyomi/util/view/ControllerExtensions.kt | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) 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 b5708f4f73..6c20f15a58 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 @@ -555,6 +555,7 @@ open class MainActivity : BaseActivity() { container: ViewGroup, handler: ControllerChangeHandler, ) { + to?.view?.x = 0f nav.translationY = 0f showDLQueueTutorial() if (!(from is DialogController || to is DialogController) && from != null) { 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 cd314fbf9d..6077dc6ce2 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 @@ -882,7 +882,7 @@ interface BackHandlerControllerInterface { @CallSuper fun handleOnBackProgressed(backEvent: BackEventCompat) { if (this !is Controller) return - if (router.backstackSize > 1) { + if (router.backstackSize > 1 && isControllerVisible) { val progress = ((backEvent.progress.takeIf { it > 0.001f } ?: 0f) * 0.5f).pow(0.6f) view?.let { view -> view.alpha = 1f - progress