chore: lint

zyrouge · Apr 20, 2024 · 1b42dfb · 1b42dfb
1 parent 6bc7447
commit 1b42dfb
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 24 deletions.
diff --git a/app/src/main/java/io/github/zyrouge/symphony/services/radio/Radio.kt b/app/src/main/java/io/github/zyrouge/symphony/services/radio/Radio.kt
@@ -127,7 +127,11 @@ class Radio(private val symphony: Symphony) : SymphonyHooks {
             }
             onUpdate.dispatch(RadioEvents.SongStaged)
             player!!.prepare {
-                seek(options.startPosition ?: 0L)
+                options.startPosition?.let {
+                    if (it > 0L) {
+                        seek(it)
+                    }
+                }
                 setSpeed(persistedSpeed, true)
                 setPitch(persistedPitch, true)
                 if (options.autostart) {

diff --git a/app/src/main/java/io/github/zyrouge/symphony/services/radio/RadioPlayer.kt b/app/src/main/java/io/github/zyrouge/symphony/services/radio/RadioPlayer.kt
@@ -5,6 +5,7 @@ import android.media.PlaybackParams
 import android.net.Uri
 import io.github.zyrouge.symphony.Symphony
 import io.github.zyrouge.symphony.utils.Logger
+import kotlinx.coroutines.launch
 import java.util.Timer
 
 data class PlaybackPosition(
@@ -93,9 +94,12 @@ class RadioPlayer(val symphony: Symphony, uri: Uri) {
     fun stop() {
         usable = false
         destroyDurationTimer()
-        unsafeMediaPlayer.stop()
-        unsafeMediaPlayer.reset()
-        unsafeMediaPlayer.release()
+        symphony.groove.coroutineScope.launch {
+            unsafeMediaPlayer?.let {
+                it.stop()
+                it.release()
+            }
+        }
     }
 
     fun start() = mediaPlayer?.let {

diff --git a/app/src/main/java/io/github/zyrouge/symphony/ui/components/ContentDrawScopeScrollBar.kt b/app/src/main/java/io/github/zyrouge/symphony/ui/components/ContentDrawScopeScrollBar.kt
@@ -31,7 +31,7 @@ fun ContentDrawScope.drawScrollBar(
                     rect = Rect(
                         offset = Offset(
                             size.width - scrollPointerWidth,
-                            scrollPointerOffsetY
+                            scrollPointerOffsetY,
                         ),
                         size = Size(scrollPointerWidth, scrollPointerHeight),
                     ),

diff --git a/app/src/main/java/io/github/zyrouge/symphony/ui/components/GenericGrooveBanner.kt b/app/src/main/java/io/github/zyrouge/symphony/ui/components/GenericGrooveBanner.kt
@@ -56,9 +56,7 @@ fun GenericGrooveBanner(
                 .background(
                     brush = Brush.verticalGradient(
                         0f to Color.Transparent,
-                        1f to MaterialTheme.colorScheme.surface.copy(
-                            alpha = 0.7f
-                        )
+                        1f to MaterialTheme.colorScheme.surface.copy(alpha = 0.7f)
                     )
                 )
                 .align(Alignment.BottomStart)

diff --git a/app/src/main/java/io/github/zyrouge/symphony/ui/components/NowPlayingBottomBar.kt b/app/src/main/java/io/github/zyrouge/symphony/ui/components/NowPlayingBottomBar.kt
@@ -4,7 +4,6 @@ import androidx.compose.animation.AnimatedContent
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.core.MutableTransitionState
 import androidx.compose.animation.core.animateFloatAsState
-import androidx.compose.animation.core.animateIntAsState
 import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
 import androidx.compose.animation.slideInVertically
@@ -18,7 +17,6 @@ import androidx.compose.foundation.layout.BoxWithConstraints
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.absoluteOffset
 import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
@@ -51,17 +49,17 @@ import androidx.compose.runtime.remember
 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.draw.clipToBounds
 import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.RectangleShape
+import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.input.pointer.pointerInput
 import androidx.compose.ui.layout.boundsInParent
 import androidx.compose.ui.layout.onGloballyPositioned
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.unit.IntOffset
 import androidx.compose.ui.unit.dp
 import coil.compose.AsyncImage
 import io.github.zyrouge.symphony.services.groove.Song
@@ -192,10 +190,10 @@ fun NowPlayingBottomBar(context: ViewContext, insetPadding: Boolean = true) {
                             transitionSpec = {
                                 val from = fadeIn(
                                     animationSpec = TransitionDurations.Normal.asTween(
-                                        delayMillis = TransitionDurations.Fast.milliseconds,
+                                        delayMillis = TransitionDurations.Normal.milliseconds,
                                     ),
                                 )
-                                val to = fadeOut(animationSpec = TransitionDurations.Fast.asTween())
+                                val to = fadeOut(TransitionDurations.Normal.asTween())
                                 from togetherWith to
                             },
                         ) { song ->
@@ -260,24 +258,21 @@ fun NowPlayingBottomBar(context: ViewContext, insetPadding: Boolean = true) {
 
 @Composable
 private fun NowPlayingBottomBarContent(context: ViewContext, song: Song) {
-    BoxWithConstraints {
+    BoxWithConstraints(modifier = Modifier.clipToBounds()) {
         val cardWidthPx = constraints.maxWidth
         var offsetX by remember { mutableFloatStateOf(0f) }
-        val cardOffsetX = animateIntAsState(
-            offsetX.toInt(),
+        val cardOffsetX by animateFloatAsState(
+            offsetX / 2,
             label = "c-now-playing-card-offset-x",
         )
-        val cardOpacity = animateFloatAsState(
+        val cardOpacity by animateFloatAsState(
             if (offsetX != 0f) 0.7f else 1f,
             label = "c-now-playing-card-opacity",
         )
 
         Box(
             modifier = Modifier
-                .alpha(cardOpacity.value)
-                .absoluteOffset {
-                    IntOffset(cardOffsetX.value.div(2), 0)
-                }
+                .graphicsLayer(alpha = cardOpacity, translationX = cardOffsetX)
                 .pointerInput(Unit) {
                     detectHorizontalDragGestures(
                         onDragEnd = {

diff --git a/app/src/main/java/io/github/zyrouge/symphony/ui/components/SongExplorerList.kt b/app/src/main/java/io/github/zyrouge/symphony/ui/components/SongExplorerList.kt
@@ -144,7 +144,7 @@ fun SongExplorerList(
                                 "/",
                                 modifier = Modifier
                                     .padding(4.dp, 0.dp)
-                                    .alpha(0.3f)
+                                    .alpha(0.3f),
                             )
                         }
                     }

diff --git a/app/src/main/java/io/github/zyrouge/symphony/ui/view/settings/MultiFolderTile.kt b/app/src/main/java/io/github/zyrouge/symphony/ui/view/settings/MultiFolderTile.kt
@@ -232,7 +232,7 @@ private fun SettingsFolderTilePickerDialog(
                             "/",
                             modifier = Modifier
                                 .padding(4.dp, 0.dp)
-                                .alpha(0.3f)
+                                .alpha(0.3f),
                         )
                     }
                 }