mirror of
https://github.com/austinried/subtracks.git
synced 2026-11-11 15:29:15 +01:00
use rounded on variants for the shuffle and repeat icons
This commit is contained in:
@@ -22,8 +22,10 @@ import androidx.compose.material.icons.rounded.MoreHoriz
|
|||||||
import androidx.compose.material.icons.rounded.PauseCircle
|
import androidx.compose.material.icons.rounded.PauseCircle
|
||||||
import androidx.compose.material.icons.rounded.PlayCircle
|
import androidx.compose.material.icons.rounded.PlayCircle
|
||||||
import androidx.compose.material.icons.rounded.Repeat
|
import androidx.compose.material.icons.rounded.Repeat
|
||||||
import androidx.compose.material.icons.rounded.RepeatOne
|
import androidx.compose.material.icons.rounded.RepeatOn
|
||||||
|
import androidx.compose.material.icons.rounded.RepeatOneOn
|
||||||
import androidx.compose.material.icons.rounded.Shuffle
|
import androidx.compose.material.icons.rounded.Shuffle
|
||||||
|
import androidx.compose.material.icons.rounded.ShuffleOn
|
||||||
import androidx.compose.material.icons.rounded.SkipNext
|
import androidx.compose.material.icons.rounded.SkipNext
|
||||||
import androidx.compose.material.icons.rounded.SkipPrevious
|
import androidx.compose.material.icons.rounded.SkipPrevious
|
||||||
import androidx.compose.material3.CircularProgressIndicator
|
import androidx.compose.material3.CircularProgressIndicator
|
||||||
@@ -286,7 +288,12 @@ fun NowPlayingScreen(
|
|||||||
) {
|
) {
|
||||||
IconButton(onClick = onRepeat, modifier = Modifier.size(48.dp)) {
|
IconButton(onClick = onRepeat, modifier = Modifier.size(48.dp)) {
|
||||||
Icon(
|
Icon(
|
||||||
imageVector = if (state.repeat == RepeatMode.One) Icons.Rounded.RepeatOne else Icons.Rounded.Repeat,
|
imageVector =
|
||||||
|
when (state.repeat) {
|
||||||
|
RepeatMode.Off -> Icons.Rounded.Repeat
|
||||||
|
RepeatMode.All -> Icons.Rounded.RepeatOn
|
||||||
|
RepeatMode.One -> Icons.Rounded.RepeatOneOn
|
||||||
|
},
|
||||||
contentDescription =
|
contentDescription =
|
||||||
when (state.repeat) {
|
when (state.repeat) {
|
||||||
RepeatMode.Off -> "Repeat off"
|
RepeatMode.Off -> "Repeat off"
|
||||||
@@ -341,7 +348,7 @@ fun NowPlayingScreen(
|
|||||||
}
|
}
|
||||||
IconButton(onClick = onShuffle, modifier = Modifier.size(48.dp)) {
|
IconButton(onClick = onShuffle, modifier = Modifier.size(48.dp)) {
|
||||||
Icon(
|
Icon(
|
||||||
imageVector = Icons.Rounded.Shuffle,
|
imageVector = if (state.shuffle) Icons.Rounded.ShuffleOn else Icons.Rounded.Shuffle,
|
||||||
contentDescription = "Shuffle",
|
contentDescription = "Shuffle",
|
||||||
tint =
|
tint =
|
||||||
if (state.shuffle) {
|
if (state.shuffle) {
|
||||||
|
|||||||
@@ -36,6 +36,7 @@ import com.subtracks.data.model.SongListItem
|
|||||||
import com.subtracks.data.model.Source
|
import com.subtracks.data.model.Source
|
||||||
import com.subtracks.playback.PlaybackState
|
import com.subtracks.playback.PlaybackState
|
||||||
import com.subtracks.playback.QueueItem
|
import com.subtracks.playback.QueueItem
|
||||||
|
import com.subtracks.playback.RepeatMode
|
||||||
import com.subtracks.ui.library.ALBUM_COVER_TAG
|
import com.subtracks.ui.library.ALBUM_COVER_TAG
|
||||||
import com.subtracks.ui.library.AlbumDetailScreen
|
import com.subtracks.ui.library.AlbumDetailScreen
|
||||||
import com.subtracks.ui.library.ArtistDetailScreen
|
import com.subtracks.ui.library.ArtistDetailScreen
|
||||||
@@ -277,6 +278,28 @@ class AppScreenshotTest {
|
|||||||
composeRule.onRoot().captureRoboImage("src/test/screenshots/now_playing.png")
|
composeRule.onRoot().captureRoboImage("src/test/screenshots/now_playing.png")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun nowPlayingModes() {
|
||||||
|
composeRule.setContent {
|
||||||
|
SubtracksTheme {
|
||||||
|
NowPlayingScreen(
|
||||||
|
state = Fixtures.playbackState().copy(shuffle = true, repeat = RepeatMode.One),
|
||||||
|
coverArt = CoverArtRef("art-al-kid-a", "test:art-al-kid-a"),
|
||||||
|
artwork = artworkColorsFromSeed(Color.rgb(120, 80, 200)),
|
||||||
|
onBack = {},
|
||||||
|
onQueue = {},
|
||||||
|
onPlayPause = {},
|
||||||
|
onNext = {},
|
||||||
|
onPrevious = {},
|
||||||
|
onSeek = {},
|
||||||
|
modifier = Modifier.fillMaxSize(),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
awaitText("Everything In Its Right Place")
|
||||||
|
composeRule.onRoot().captureRoboImage("src/test/screenshots/now_playing_modes.png")
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
fun queue() {
|
fun queue() {
|
||||||
composeRule.setContent {
|
composeRule.setContent {
|
||||||
|
|||||||
Reference in New Issue
Block a user