From 1289bcaa38799d2af2273cf7f10002164322df07 Mon Sep 17 00:00:00 2001 From: Chris Arriola Date: Mon, 6 May 2024 12:49:52 -0700 Subject: [PATCH 1/3] [Jetcaster]: Change alpha of prev/next buttons. --- .../java/com/example/jetcaster/ui/player/PlayerScreen.kt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/player/PlayerScreen.kt b/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/player/PlayerScreen.kt index 33847df1af..4263360521 100644 --- a/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/player/PlayerScreen.kt +++ b/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/player/PlayerScreen.kt @@ -74,6 +74,7 @@ import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.alpha import androidx.compose.ui.draw.clip import androidx.compose.ui.graphics.ColorFilter import androidx.compose.ui.layout.ContentScale @@ -108,8 +109,8 @@ import com.example.jetcaster.util.verticalGradientScrim import com.google.accompanist.adaptive.HorizontalTwoPaneStrategy import com.google.accompanist.adaptive.TwoPane import com.google.accompanist.adaptive.VerticalTwoPaneStrategy -import java.time.Duration import kotlinx.coroutines.launch +import java.time.Duration /** * Stateful version of the Podcast player @@ -712,6 +713,9 @@ private fun PlayerSlider( } } +private fun Modifier.invisibleWhen(predicate: () -> Boolean): Modifier = + Modifier.alpha(if (predicate()) 0f else 1f) then this + @Composable private fun PlayerButtons( hasNext: Boolean, @@ -754,6 +758,7 @@ private fun PlayerButtons( colorFilter = ColorFilter.tint(MaterialTheme.colorScheme.onSurfaceVariant), modifier = sideButtonsModifier .clickable(enabled = isPlaying, onClick = onPrevious) + .alpha(if (isPlaying) 1f else 0.25f) ) Image( imageVector = Icons.Filled.Replay10, @@ -807,6 +812,7 @@ private fun PlayerButtons( colorFilter = ColorFilter.tint(MaterialTheme.colorScheme.onSurfaceVariant), modifier = sideButtonsModifier .clickable(enabled = hasNext, onClick = onNext) + .alpha(if (hasNext) 1f else 0.25f) ) } } From faddc2dfc0a670e9d01c4eda46d8370f00de52bf Mon Sep 17 00:00:00 2001 From: arriolac Date: Mon, 6 May 2024 19:54:01 +0000 Subject: [PATCH 2/3] =?UTF-8?q?=F0=9F=A4=96=20Apply=20Spotless?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/example/jetcaster/ui/player/PlayerScreen.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/player/PlayerScreen.kt b/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/player/PlayerScreen.kt index 4263360521..a66e13f91c 100644 --- a/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/player/PlayerScreen.kt +++ b/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/player/PlayerScreen.kt @@ -109,8 +109,8 @@ import com.example.jetcaster.util.verticalGradientScrim import com.google.accompanist.adaptive.HorizontalTwoPaneStrategy import com.google.accompanist.adaptive.TwoPane import com.google.accompanist.adaptive.VerticalTwoPaneStrategy -import kotlinx.coroutines.launch import java.time.Duration +import kotlinx.coroutines.launch /** * Stateful version of the Podcast player From d2cf6baef783bb1346cf968af3f15353c619e296 Mon Sep 17 00:00:00 2001 From: Chris Arriola Date: Mon, 6 May 2024 15:14:56 -0700 Subject: [PATCH 3/3] PR Feedback. --- .../main/java/com/example/jetcaster/ui/player/PlayerScreen.kt | 3 --- 1 file changed, 3 deletions(-) diff --git a/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/player/PlayerScreen.kt b/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/player/PlayerScreen.kt index a66e13f91c..f633e26b33 100644 --- a/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/player/PlayerScreen.kt +++ b/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/player/PlayerScreen.kt @@ -713,9 +713,6 @@ private fun PlayerSlider( } } -private fun Modifier.invisibleWhen(predicate: () -> Boolean): Modifier = - Modifier.alpha(if (predicate()) 0f else 1f) then this - @Composable private fun PlayerButtons( hasNext: Boolean,