From 0b63c145a30dbedc2639045c9d9b0f63542eab06 Mon Sep 17 00:00:00 2001 From: Simone Summo <32291826+Zoo-M0@users.noreply.github.com> Date: Fri, 17 Nov 2023 10:10:14 +0100 Subject: [PATCH] update transitions if order for better readability --- .../libretube/ui/fragments/PlayerFragment.kt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/com/github/libretube/ui/fragments/PlayerFragment.kt b/app/src/main/java/com/github/libretube/ui/fragments/PlayerFragment.kt index 7d44ecacc..608015361 100644 --- a/app/src/main/java/com/github/libretube/ui/fragments/PlayerFragment.kt +++ b/app/src/main/java/com/github/libretube/ui/fragments/PlayerFragment.kt @@ -445,7 +445,15 @@ class PlayerFragment : Fragment(), OnlinePlayerOptions { override fun onTransitionCompleted(motionLayout: MotionLayout?, currentId: Int) { if (_binding == null) return - if (currentId == transitionEndId) { + if (currentId == transitionStartId) { + viewModel.isMiniPlayerVisible.value = false + // re-enable captions + updateCurrentSubtitle(currentSubtitle) + binding.player.useController = true + commentsViewModel.setCommentSheetExpand(true) + mainMotionLayout.progress = 0F + changeOrientationMode() + } else if (currentId == transitionEndId) { viewModel.isMiniPlayerVisible.value = true // disable captions temporarily updateCurrentSubtitle(null) @@ -454,14 +462,6 @@ class PlayerFragment : Fragment(), OnlinePlayerOptions { binding.sbSkipBtn.isGone = true mainMotionLayout.progress = 1F (activity as MainActivity).requestOrientationChange() - } else if (currentId == transitionStartId) { - viewModel.isMiniPlayerVisible.value = false - // re-enable captions - updateCurrentSubtitle(currentSubtitle) - binding.player.useController = true - commentsViewModel.setCommentSheetExpand(true) - mainMotionLayout.progress = 0F - changeOrientationMode() } } })