fix: fix select also showing menu

DD3Boh · Jan 3, 2025 · 267e1eb · 267e1eb
1 parent 5626fbe
commit 267e1eb
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 15 deletions.
diff --git a/app/src/main/java/com/dd3boh/outertune/ui/component/Items.kt b/app/src/main/java/com/dd3boh/outertune/ui/component/Items.kt
@@ -356,7 +356,7 @@ fun SongListItem(
     song: Song,
     onPlay: () -> Unit,
     onSelectedChange: (Boolean) -> Unit,
-    inSelectMode: Boolean,
+    inSelectMode: Boolean?,
     isSelected: Boolean,
     navController: NavController,
     modifier: Modifier = Modifier,
@@ -420,7 +420,7 @@ fun SongListItem(
             },
             trailingContent = {
                 if (available) {
-                    if (inSelectMode) {
+                    if (inSelectMode == true) {
                         Checkbox(
                             checked = isSelected,
                             onCheckedChange = onSelectedChange
@@ -462,13 +462,13 @@ fun SongListItem(
                     }
                 }
             },
-            isSelected = inSelectMode && isSelected,
+            isSelected = inSelectMode == true && isSelected,
             isActive = isActive,
             available = available,
             modifier = modifier.combinedClickable(
                 onClick = {
                     if (available) {
-                        if (inSelectMode) {
+                        if (inSelectMode == true) {
                             onSelectedChange(!isSelected)
                         } else if (song.id == mediaMetadata?.id) {
                             playerConnection.player.togglePlayPause()
@@ -479,14 +479,16 @@ fun SongListItem(
                 },
                 onLongClick = {
                     if (available) {
-                        menuState.show {
-                            SongMenu(
-                                originalSong = song,
-                                navController = navController,
-                                onDismiss = menuState::dismiss
-                            )
+                        if (inSelectMode == null){
+                            menuState.show {
+                                SongMenu(
+                                    originalSong = song,
+                                    navController = navController,
+                                    onDismiss = menuState::dismiss
+                                )
+                            }
                         }
-                        if (!inSelectMode) {
+                        else if (!inSelectMode) {
                             haptic.performHapticFeedback(HapticFeedbackType.LongPress)
                             onSelectedChange(true)
                         }

diff --git a/app/src/main/java/com/dd3boh/outertune/ui/screens/HomeScreen.kt b/app/src/main/java/com/dd3boh/outertune/ui/screens/HomeScreen.kt
@@ -475,7 +475,7 @@ fun HomeScreen(
                                     playerConnection.playQueue(YouTubeQueue.radio(song!!.toMediaMetadata()))
                                 },
                                 onSelectedChange = {},
-                                inSelectMode = false,
+                                inSelectMode = null,
                                 isSelected = false,
                                 navController = navController,
                                 modifier = Modifier.width(horizontalLazyGridItemWidth)
@@ -509,7 +509,7 @@ fun HomeScreen(
                                         playerConnection.playQueue(YouTubeQueue.radio(song!!.toMediaMetadata()))
                                     },
                                     onSelectedChange = {},
-                                    inSelectMode = false,
+                                    inSelectMode = null,
                                     isSelected = false,
                                     navController = navController,
                                     modifier = Modifier.width(horizontalLazyGridItemWidth)
@@ -642,7 +642,7 @@ fun HomeScreen(
                                     playerConnection.playQueue(YouTubeQueue.radio(song!!.toMediaMetadata()))
                                 },
                                 onSelectedChange = {},
-                                inSelectMode = false,
+                                inSelectMode = null,
                                 isSelected = false,
                                 navController = navController,
                                 modifier = Modifier.width(horizontalLazyGridItemWidth)

diff --git a/app/src/main/java/com/dd3boh/outertune/ui/screens/SetupWizzard.kt b/app/src/main/java/com/dd3boh/outertune/ui/screens/SetupWizzard.kt
@@ -596,7 +596,7 @@ fun SetupWizard(
                                         song = song,
                                         onPlay = {},
                                         onSelectedChange = {},
-                                        inSelectMode = false,
+                                        inSelectMode = null,
                                         isSelected = false,
                                         navController = navController,
                                         enableSwipeToQueue = false,