Skip to content

Commit 47afccd

Browse files
authored
Merge pull request libre-tube#7437 from Bnyro/master
fix: comments sheet not dismissed when next video starts
2 parents 40361ee + f2ce7fd commit 47afccd

1 file changed

Lines changed: 10 additions & 3 deletions

File tree

app/src/main/java/com/github/libretube/ui/fragments/PlayerFragment.kt

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,6 @@ class PlayerFragment : Fragment(R.layout.fragment_player), OnlinePlayerOptions {
315315
maybeStreams?.let { streams ->
316316
this@PlayerFragment.streams = streams
317317
viewModel.segments.postValue(emptyList())
318-
setPlayerDefaults()
319318
updatePlayerView()
320319
}
321320
}
@@ -1072,14 +1071,22 @@ class PlayerFragment : Fragment(R.layout.fragment_player), OnlinePlayerOptions {
10721071
AbstractPlayerService.runPlayerActionCommand,
10731072
bundleOf(PlayerCommand.PLAY_VIDEO_BY_ID.name to nextId)
10741073
)
1074+
}
10751075

1076+
private fun dismissCommentsSheet() {
10761077
// close comment bottom sheet if opened for next video
1077-
activity?.supportFragmentManager?.fragments?.filterIsInstance<CommentsSheet>()
1078-
?.firstOrNull()?.dismiss()
1078+
childFragmentManager.fragments
1079+
.filterIsInstance<CommentsSheet>()
1080+
.firstOrNull()
1081+
?.dismiss()
10791082
}
10801083

10811084
@SuppressLint("SetTextI18n")
10821085
private fun updatePlayerView() {
1086+
dismissCommentsSheet()
1087+
1088+
setPlayerDefaults()
1089+
10831090
if (PreferenceHelper.getBoolean(PreferenceKeys.AUTO_FULLSCREEN_SHORTS, false) &&
10841091
isShort && binding.playerMotionLayout.progress == 0f
10851092
) {

0 commit comments

Comments
 (0)