Makussu/subtracks
1
0
Fork 0
mirror of https://github.com/austinried/subtracks.git synced 2026-11-15 00:42:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

queue: suppress shuffled context removal

Browse Source
This commit is contained in:
austinried
2026-11-14 12:03:42 +00:00
parent 04dba5ef76
commit ddc6811c34
2 changed files with 115 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/kotlin/com/subtracks/ui/playback/QueueScreen.kt
+18 -11
View File
@@ -490,10 +490,15 @@ fun QueueScreen(
)
},
onClick = { onPlay(row.position) },
onRemove = {
onRemove(row.position)
showUndo(queueRemoved)
},
onRemove =
if (enabled) {
{
onRemove(row.position)
showUndo(queueRemoved)
}
} else {
null
},
)
}
}
@@ -579,7 +584,7 @@ private fun QueueRowItem(
coverArt: (String?, Boolean) -> CoverArtRef?,
dragHandle: Modifier?,
onClick: () -> Unit,
onRemove: () -> Unit,
onRemove: (() -> Unit)?,
) {
SongRow(
song = row.song.song,
@@ -588,12 +593,14 @@ private fun QueueRowItem(
isPlaying = isPlaying,
trailingContent = {
Row(verticalAlignment = Alignment.CenterVertically) {
IconButton(onClick = onRemove) {
Icon(
imageVector = Icons.Rounded.Close,
contentDescription = stringResource(R.string.queue_remove),
modifier = Modifier.size(20.dp),
)
if (onRemove != null) {
IconButton(onClick = onRemove) {
Icon(
imageVector = Icons.Rounded.Close,
contentDescription = stringResource(R.string.queue_remove),
modifier = Modifier.size(20.dp),
)
}
}
if (dragHandle != null) {
Box(modifier = Modifier.size(40.dp).then(dragHandle), contentAlignment = Alignment.Center) {
app/src/test/kotlin/com/subtracks/ui/playback/QueueScreenTest.kt
+97
View File
@@ -0,0 +1,97 @@
package com.subtracks.ui.playback
import androidx.activity.ComponentActivity
import androidx.compose.ui.test.assertIsDisplayed
import androidx.compose.ui.test.junit4.v2.createAndroidComposeRule
import androidx.compose.ui.test.onNodeWithContentDescription
import androidx.compose.ui.test.onNodeWithText
import androidx.compose.ui.test.performClick
import androidx.test.ext.junit.runners.AndroidJUnit4
import com.subtracks.data.model.AlbumSongItem
import com.subtracks.data.model.Song
import com.subtracks.ui.theme.SubtracksTheme
import org.junit.Assert.assertEquals
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
import org.robolectric.annotation.GraphicsMode
@RunWith(AndroidJUnit4::class)
@GraphicsMode(GraphicsMode.Mode.NATIVE)
class QueueScreenTest {
@get:Rule
val composeRule = createAndroidComposeRule<ComponentActivity>()
@Test
fun shuffledContextRowsDoNotExposeRemoval() {
render(row(upNext = false), shuffle = true)
composeRule.onNodeWithContentDescription("Remove from queue").assertDoesNotExist()
composeRule.onNodeWithText("Removed from queue").assertDoesNotExist()
}
@Test
fun shuffledUpNextRowsStillRemoveAndShowUndo() {
var removed: Long? = null
render(row(upNext = true), shuffle = true, onRemove = { removed = it })
composeRule.onNodeWithContentDescription("Remove from queue").performClick()
assertEquals(0L, removed)
composeRule.onNodeWithText("Removed from queue").assertIsDisplayed()
composeRule.onNodeWithText("Undo").assertIsDisplayed()
}
private fun render(
row: QueueRow,
shuffle: Boolean,
onRemove: (Long) -> Unit = {},
) {
composeRule.setContent {
SubtracksTheme {
QueueScreen(
rows = listOf(row),
ready = true,
currentPosition = null,
currentSongId = null,
shuffle = shuffle,
coverArt = { _, _ -> null },
onBack = {},
onPlay = {},
onRemove = onRemove,
onReorder = { _, _ -> },
onMove = { _, _ -> false },
onLoadOlder = {},
onLoadNewer = {},
onUndo = {},
)
}
}
}
private fun row(upNext: Boolean) =
QueueRow(
id = 0,
position = 0,
song =
AlbumSongItem(
song =
Song(
sourceId = 1,
id = "s1",
albumId = "al1",
artistId = "ar1",
title = "Song",
album = "Album",
artist = "Artist",
duration = 100,
track = 1,
disc = 1,
starred = null,
genre = null,
),
coverArt = null,
),
upNext = upNext,
)
}