diff --git a/app/src/main/kotlin/com/subtracks/ui/playback/NowPlayingScreen.kt b/app/src/main/kotlin/com/subtracks/ui/playback/NowPlayingScreen.kt index 9655844c..83541725 100644 --- a/app/src/main/kotlin/com/subtracks/ui/playback/NowPlayingScreen.kt +++ b/app/src/main/kotlin/com/subtracks/ui/playback/NowPlayingScreen.kt @@ -293,8 +293,13 @@ fun NowPlayingScreen( verticalArrangement = Arrangement.spacedBy(6.dp), modifier = Modifier + .fillMaxWidth() .padding(top = 12.dp) - .height(titleHeight + 6.dp + subtitleHeight), + .height(titleHeight + 6.dp + subtitleHeight) + .clickable( + enabled = onArtistClick != null, + onClickLabel = "Open artist", + ) { onArtistClick?.invoke() }, ) { Box(Modifier.height(titleHeight), contentAlignment = Alignment.Center) { Text( @@ -304,17 +309,7 @@ fun NowPlayingScreen( modifier = Modifier.basicMarquee(), ) } - Box( - modifier = - Modifier - .fillMaxWidth() - .height(subtitleHeight) - .clickable( - enabled = onArtistClick != null, - onClickLabel = "Open artist", - ) { onArtistClick?.invoke() }, - contentAlignment = Alignment.Center, - ) { + Box(Modifier.height(subtitleHeight), contentAlignment = Alignment.Center) { Text( text = state.item?.artist.orEmpty(), style = subtitleStyle, diff --git a/app/src/test/kotlin/com/subtracks/ui/playback/NowPlayingTapsTest.kt b/app/src/test/kotlin/com/subtracks/ui/playback/NowPlayingTapsTest.kt index d7714969..c9998ee1 100644 --- a/app/src/test/kotlin/com/subtracks/ui/playback/NowPlayingTapsTest.kt +++ b/app/src/test/kotlin/com/subtracks/ui/playback/NowPlayingTapsTest.kt @@ -1,11 +1,14 @@ package com.subtracks.ui.playback import androidx.activity.ComponentActivity +import androidx.compose.ui.test.assertHeightIsAtLeast import androidx.compose.ui.test.assertIsNotEnabled +import androidx.compose.ui.test.assertWidthIsAtLeast import androidx.compose.ui.test.junit4.v2.createAndroidComposeRule import androidx.compose.ui.test.onNodeWithTag import androidx.compose.ui.test.onNodeWithText import androidx.compose.ui.test.performClick +import androidx.compose.ui.unit.dp import androidx.test.ext.junit.runners.AndroidJUnit4 import com.subtracks.data.model.CoverArtRef import com.subtracks.playback.PlaybackState @@ -85,6 +88,14 @@ class NowPlayingTapsTest { assertTrue("the artist name should open the artist", opened) } + @Test + fun theArtistTargetIsAtLeastTheMinimumTouchSize() { + render(onArtistClick = {}) + + composeRule.onNodeWithText("Radiohead").assertHeightIsAtLeast(48.dp) + composeRule.onNodeWithText("Radiohead").assertWidthIsAtLeast(48.dp) + } + @Test fun theTapTargetsStayInertWithoutADestination() { render()