Merge pull request #30 from lm41/fix/ghost-clicks-on-chapter-select

Fix ghost clicks on chapter and stream select

Author: theScrabi

new-player/src/main/java/net/newpipe/newplayer/ui/selection_ui/ChapterSelectUI.kt

@@ -50,7 +50,7 @@ import net.newpipe.newplayer.ui.common.getInsets
 internal fun ChapterSelectUI(
     viewModel: InternalNewPlayerViewModel,
     uiState: NewPlayerUIState,
-    shownInAudioPlayer: Boolean
+    shownInAudioPlayer: Boolean,
 ) {
     val insets = getInsets()
 
@@ -60,10 +60,11 @@ internal fun ChapterSelectUI(
         modifier = Modifier
             .fillMaxSize()
             .windowInsetsPadding(insets),
-        containerColor = if (shownInAudioPlayer)
+        containerColor = if (shownInAudioPlayer) {
             MaterialTheme.colorScheme.background
-        else
-            Color.Transparent,
+        } else {
+            Color.Transparent
+        },
         topBar = {
             ChapterSelectTopBar(
                 onClose = {
@@ -90,12 +91,16 @@ internal fun ChapterSelectUI(
                         chapterStartInMs = chapter.chapterStartInMs,
                         thumbnail = chapter.thumbnail,
                         onClicked = {
+                            if (!uiState.uiMode.isChapterSelect) {
+                                // We don't select the chapter when we are not in chapter select mode
+                                return@ChapterItem
+                            }
                             viewModel.chapterSelected(chapterIndex)
                         },
                         isCurrentChapter = isActiveChapter(
-                            chapterIndex,
+                            chapterId = chapterIndex,
                             uiState.chapters,
-                            uiState.playbackPositionInMs
+                            playbackPosition = uiState.playbackPositionInMs
                         )
                     )
                 }
@@ -118,4 +123,4 @@ private fun VideoPlayerChannelSelectUIPreview() {
             )
         }
     }
-}
+}

new-player/src/main/java/net/newpipe/newplayer/ui/selection_ui/StreamSelectUI.kt

@@ -120,7 +120,13 @@ internal fun ReorderableStreamItemsList(
             ) { isDragging ->
                 StreamItem(
                     playlistItem = playlistItem,
-                    onClicked = { viewModel.streamSelected(index) },
+                    onClicked = {
+                        if (!uiState.uiMode.isStreamSelect) {
+                            // We don't select the stream when we are not in stream select mode
+                            return@StreamItem
+                        }
+                        viewModel.streamSelected(index)
+                    },
                     reorderableScope = this@ReorderableItem,
                     haptic = haptic,
                     onDragFinished = viewModel::onStreamItemDragFinished,
@@ -148,4 +154,4 @@ private fun VideoPlayerStreamSelectUIPreview() {
             )
         }
     }
-}
+}

new-player/src/main/java/net/newpipe/newplayer/ui/videoplayer/VideoPlayerUI.kt

@@ -22,6 +22,8 @@ package net.newpipe.newplayer.ui.videoplayer
 
 import android.os.Build
 import androidx.annotation.OptIn
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.aspectRatio
 import androidx.compose.foundation.layout.fillMaxSize
@@ -129,9 +131,7 @@ internal fun VideoPlayerUi(viewModel: InternalNewPlayerViewModel, uiState: NewPl
             viewModel, uiState = uiState
         )
 
-        // Disable this animation as it induces ghost tabs
-        //AnimatedVisibility(visible = uiState.uiMode.isStreamSelect) {
-        if (uiState.uiMode.isStreamSelect) {
+        AnimatedVisibility(visible = uiState.uiMode.isStreamSelect) {
             Surface(
                 modifier = Modifier.fillMaxSize(),
                 color = STREAMSELECT_UI_BACKGROUND_COLOR
@@ -144,9 +144,7 @@ internal fun VideoPlayerUi(viewModel: InternalNewPlayerViewModel, uiState: NewPl
             }
         }
 
-        // Disable this animation as it induces ghost tabs
-        //AnimatedVisibility(visible = uiState.uiMode.isChapterSelect) {
-        if (uiState.uiMode.isChapterSelect) {
+        AnimatedVisibility(visible = uiState.uiMode.isChapterSelect) {
             Surface(
                 modifier = Modifier.fillMaxSize(),
                 color = STREAMSELECT_UI_BACKGROUND_COLOR