Fixes to tabs in toolbar animation

This commit is contained in:
Jays2Kings 2022-04-27 00:38:34 -04:00
parent 828670d789
commit c505bdd3c4
2 changed files with 5 additions and 3 deletions

View file

@ -1170,7 +1170,7 @@ open class MainActivity : BaseActivity<MainActivityBinding>(), DownloadServiceLi
}
}
)
tA.duration = 200
tA.duration = 100
tabAnimation = tA
tA.start()
} else {

View file

@ -39,6 +39,7 @@ import eu.kanade.tachiyomi.data.library.LibraryUpdateService
import eu.kanade.tachiyomi.data.notification.NotificationReceiver
import eu.kanade.tachiyomi.data.notification.Notifications
import eu.kanade.tachiyomi.databinding.RecentsControllerBinding
import eu.kanade.tachiyomi.ui.base.SmallToolbarInterface
import eu.kanade.tachiyomi.ui.base.controller.BaseCoroutineController
import eu.kanade.tachiyomi.ui.base.controller.DialogController
import eu.kanade.tachiyomi.ui.main.BottomSheetController
@ -782,8 +783,9 @@ class RecentsController(bundle: Bundle? = null) :
}
} else {
if (type == ControllerChangeType.POP_EXIT) presenter.onDestroy()
if (router.backstack.lastOrNull()?.controller !is DialogController) {
(activity as? MainActivity)?.showTabBar(false)
val lastController = router.backstack.lastOrNull()?.controller
if (lastController !is DialogController) {
(activity as? MainActivity)?.showTabBar(show = false, animate = lastController !is SmallToolbarInterface)
}
snack?.dismiss()
}