Merge pull request #4095 from twistios/fix_scrolling_long_text

Fixes scrolling of long text
fast4x · Oct 23, 2024 · 5526136 · 5526136
2 parents db79188 + a9495d7
commit 5526136
Show file tree

Hide file tree

Showing 52 changed files with 706 additions and 401 deletions.
diff --git a/...seApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/components/themed/AlbumsItemGridMenu.kt b/...seApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/components/themed/AlbumsItemGridMenu.kt
@@ -74,7 +74,7 @@ fun AlbumsItemGridMenu(
     onPlayNext: (() -> Unit)? = null,
     onEnqueue: (() -> Unit)? = null,
     onAddToPlaylist: ((PlaylistPreview) -> Unit)? = null,
-
+    disableScrollingText: Boolean
 ) {
     val density = LocalDensity.current
 
@@ -260,7 +260,8 @@ fun AlbumsItemGridMenu(
                             album = album,
                             thumbnailSizePx = thumbnailSizePx,
                             thumbnailSizeDp = thumbnailSizeDp,
-                            yearCentered = false
+                            yearCentered = false,
+                            disableScrollingText = disableScrollingText
                         )
                     }
                 ) {

diff --git a/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/components/themed/AlbumsItemMenu.kt b/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/components/themed/AlbumsItemMenu.kt
@@ -77,6 +77,7 @@ fun AlbumsItemMenu(
     onPlayNext: (() -> Unit)? = null,
     onEnqueue: (() -> Unit)? = null,
     onAddToPlaylist: ((PlaylistPreview) -> Unit)? = null,
+    disableScrollingText: Boolean
 ) {
     val density = LocalDensity.current
 
@@ -104,7 +105,8 @@ fun AlbumsItemMenu(
             onDownloadAlbumCover = onDownloadAlbumCover,
             onPlayNext = onPlayNext,
             onEnqueue = onEnqueue,
-            onAddToPlaylist = onAddToPlaylist
+            onAddToPlaylist = onAddToPlaylist,
+            disableScrollingText = disableScrollingText
         )
     } else {
         AnimatedContent(
@@ -278,7 +280,8 @@ fun AlbumsItemMenu(
                             album = album,
                             thumbnailSizePx = thumbnailSizePx,
                             thumbnailSizeDp = thumbnailSizeDp,
-                            yearCentered = false
+                            yearCentered = false,
+                            disableScrollingText = disableScrollingText
                         )
 
                         /*

diff --git a/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/components/themed/Header.kt b/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/components/themed/Header.kt
@@ -5,6 +5,7 @@ import android.annotation.SuppressLint
 import androidx.annotation.DrawableRes
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
+import androidx.compose.foundation.basicMarquee
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Row
@@ -34,6 +35,7 @@ import it.fast4x.rimusic.enums.UiType
 import it.fast4x.rimusic.ui.styling.Dimensions
 import it.fast4x.rimusic.ui.styling.shimmer
 import it.fast4x.rimusic.utils.bold
+import it.fast4x.rimusic.utils.conditional
 import it.fast4x.rimusic.utils.medium
 import it.fast4x.rimusic.utils.semiBold
 import me.knighthat.colorPalette
@@ -45,6 +47,7 @@ fun Header(
     title: String,
     modifier: Modifier = Modifier,
     actionsContent: @Composable RowScope.() -> Unit = {},
+    disableScrollingText: Boolean
 ) {
     Header(
         modifier = modifier,
@@ -53,7 +56,8 @@ fun Header(
                 text = title,
                 style = typography().xxl.medium,
                 maxLines = 1,
-                overflow = TextOverflow.Ellipsis
+                overflow = TextOverflow.Ellipsis,
+                modifier = Modifier.conditional(!disableScrollingText) { basicMarquee(iterations = Int.MAX_VALUE) }
             )
         },
         actionsContent = actionsContent

diff --git a/...oseApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/components/themed/MediaItemGridMenu.kt b/...oseApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/components/themed/MediaItemGridMenu.kt
@@ -105,6 +105,7 @@ fun NonQueuedMediaItemGridMenu(
     onHideFromDatabase: (() -> Unit)? = null,
     onRemoveFromQuickPicks: (() -> Unit)? = null,
     onDownload: (() -> Unit)? = null,
+    disableScrollingText: Boolean
 ) {
     val binder = LocalPlayerServiceBinder.current
     val context = LocalContext.current
@@ -129,7 +130,8 @@ fun NonQueuedMediaItemGridMenu(
         onRemoveFromPlaylist = onRemoveFromPlaylist,
         onHideFromDatabase = onHideFromDatabase,
         onRemoveFromQuickPicks = onRemoveFromQuickPicks,
-        modifier = modifier
+        modifier = modifier,
+        disableScrollingText = disableScrollingText
     )
 }
 
@@ -153,6 +155,7 @@ fun BaseMediaItemGridMenu(
     onClosePlayer: (() -> Unit)? = null,
     onGoToPlaylist: ((Long) -> Unit)? = null,
     onAddToPreferites: (() -> Unit)? = null,
+    disableScrollingText: Boolean
 ) {
     //val context = LocalContext.current
 
@@ -213,7 +216,8 @@ fun BaseMediaItemGridMenu(
         onGoToPlaylist = {
             navController.navigate(route = "${NavRoutes.localPlaylist.name}/$it")
         },
-        modifier = modifier
+        modifier = modifier,
+        disableScrollingText = disableScrollingText
     )
 }
 
@@ -224,8 +228,8 @@ fun MiniMediaItemGridMenu(
     mediaItem: MediaItem,
     onGoToPlaylist: ((Long) -> Unit)? = null,
     onAddToPreferites: (() -> Unit)? = null,
-
     modifier: Modifier = Modifier,
+    disableScrollingText: Boolean
 ) {
 
     MediaItemGridMenu(
@@ -252,7 +256,8 @@ fun MiniMediaItemGridMenu(
             }
         },
         onAddToPreferites = onAddToPreferites,
-        modifier = modifier
+        modifier = modifier,
+        disableScrollingText = disableScrollingText
     )
 }
 
@@ -279,7 +284,8 @@ fun MediaItemGridMenu (
     onGoToAlbum: ((String) -> Unit)? = null,
     onGoToArtist: ((String) -> Unit)? = null,
     onRemoveFromQuickPicks: (() -> Unit)? = null,
-    onGoToPlaylist: ((Long) -> Unit)?
+    onGoToPlaylist: ((Long) -> Unit)?,
+    disableScrollingText: Boolean
 ) {
     val binder = LocalPlayerServiceBinder.current
     val uriHandler = LocalUriHandler.current
@@ -424,7 +430,8 @@ fun MediaItemGridMenu (
                 thumbnailSizeDp = thumbnailSizeDp,
                 modifier = Modifier
                     .weight(1f),
-                mediaId = mediaItem.mediaId
+                mediaId = mediaItem.mediaId,
+                disableScrollingText = disableScrollingText
             )
 
 

diff --git a/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/components/themed/MediaItemMenu.kt b/composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/components/themed/MediaItemMenu.kt
@@ -90,6 +90,7 @@ import it.fast4x.rimusic.utils.addNext
 import it.fast4x.rimusic.utils.addToPipedPlaylist
 import it.fast4x.rimusic.utils.asMediaItem
 import it.fast4x.rimusic.cleanPrefix
+import it.fast4x.rimusic.utils.disableScrollingTextKey
 import it.fast4x.rimusic.utils.downloadedStateMedia
 import it.fast4x.rimusic.utils.enqueue
 import it.fast4x.rimusic.utils.forcePlay
@@ -129,7 +130,8 @@ fun InHistoryMediaItemMenu(
     song: Song,
     onHideFromDatabase: (() -> Unit)? = {},
     onDeleteFromDatabase: (() -> Unit)? = {},
-    modifier: Modifier = Modifier
+    modifier: Modifier = Modifier,
+    disableScrollingText: Boolean
 ) {
     //val binder = LocalPlayerServiceBinder.current
 
@@ -165,7 +167,8 @@ fun InHistoryMediaItemMenu(
                 Database.like(song.id, System.currentTimeMillis())
             }
         },
-        modifier = modifier
+        modifier = modifier,
+        disableScrollingText = disableScrollingText
     )
 }
 
@@ -180,7 +183,8 @@ fun InPlaylistMediaItemMenu(
     playlistId: Long,
     positionInPlaylist: Int,
     song: Song,
-    modifier: Modifier = Modifier
+    modifier: Modifier = Modifier,
+    disableScrollingText: Boolean
 ) {
     val isPipedEnabled by rememberPreference(isPipedEnabledKey, false)
     val coroutineScope = rememberCoroutineScope()
@@ -213,7 +217,8 @@ fun InPlaylistMediaItemMenu(
                 Database.like(song.id, System.currentTimeMillis())
             }
         },
-        modifier = modifier
+        modifier = modifier,
+        disableScrollingText = disableScrollingText
     )
 }
 
@@ -229,6 +234,7 @@ fun NonQueuedMediaItemMenuLibrary(
     onRemoveFromPlaylist: (() -> Unit)? = null,
     onRemoveFromQuickPicks: (() -> Unit)? = null,
     onDownload: (() -> Unit)? = null,
+    disableScrollingText: Boolean
 ) {
     val binder = LocalPlayerServiceBinder.current
     val context = LocalContext.current
@@ -289,7 +295,8 @@ fun NonQueuedMediaItemMenuLibrary(
                     )
                 }
             },
-            modifier = modifier
+            modifier = modifier,
+            disableScrollingText = disableScrollingText
         )
     } else {
 
@@ -321,7 +328,8 @@ fun NonQueuedMediaItemMenuLibrary(
                     )
                 }
             },
-            modifier = modifier
+            modifier = modifier,
+            disableScrollingText = disableScrollingText
         )
     }
 }
@@ -340,7 +348,8 @@ fun NonQueuedMediaItemMenu(
     onDeleteFromDatabase: (() -> Unit)? = null,
     onRemoveFromQuickPicks: (() -> Unit)? = null,
     onDownload: (() -> Unit)? = null,
-    onAddToPreferites: (() -> Unit)? = null
+    onAddToPreferites: (() -> Unit)? = null,
+    disableScrollingText: Boolean
 ) {
     val binder = LocalPlayerServiceBinder.current
     val context = LocalContext.current
@@ -375,7 +384,8 @@ fun NonQueuedMediaItemMenu(
             onDeleteFromDatabase = onDeleteFromDatabase,
             onRemoveFromQuickPicks = onRemoveFromQuickPicks,
             onAddToPreferites = onAddToPreferites,
-            modifier = modifier
+            modifier = modifier,
+            disableScrollingText = disableScrollingText
         )
     } else {
 
@@ -401,7 +411,8 @@ fun NonQueuedMediaItemMenu(
             onDeleteFromDatabase = onDeleteFromDatabase,
             onRemoveFromQuickPicks = onRemoveFromQuickPicks,
             onAddToPreferites = onAddToPreferites,
-            modifier = modifier
+            modifier = modifier,
+            disableScrollingText = disableScrollingText
         )
     }
 }
@@ -416,7 +427,8 @@ fun QueuedMediaItemMenu(
     onDownload: (() -> Unit)?,
     mediaItem: MediaItem,
     indexInQueue: Int?,
-    modifier: Modifier = Modifier
+    modifier: Modifier = Modifier,
+    disableScrollingText: Boolean
 ) {
     val binder = LocalPlayerServiceBinder.current
     val context = LocalContext.current
@@ -458,6 +470,7 @@ fun QueuedMediaItemMenu(
                     )
                 }
             },
+            disableScrollingText = disableScrollingText
         )
     } else {
         BaseMediaItemMenu(
@@ -491,6 +504,7 @@ fun QueuedMediaItemMenu(
                     )
                 }
             },
+            disableScrollingText = disableScrollingText
         )
     }
 }
@@ -517,7 +531,8 @@ fun BaseMediaItemMenu(
     onRemoveFromQuickPicks: (() -> Unit)? = null,
     onClosePlayer: (() -> Unit)? = null,
     onGoToPlaylist: ((Long) -> Unit)? = null,
-    onAddToPreferites: (() -> Unit)?
+    onAddToPreferites: (() -> Unit)?,
+    disableScrollingText: Boolean
 ) {
     val context = LocalContext.current
 
@@ -596,7 +611,8 @@ fun BaseMediaItemMenu(
         onGoToPlaylist = {
             navController.navigate(route = "${NavRoutes.localPlaylist.name}/$it")
         },
-        modifier = modifier
+        modifier = modifier,
+        disableScrollingText = disableScrollingText
     )
 }
 
@@ -611,6 +627,7 @@ fun MiniMediaItemMenu(
     onGoToPlaylist: ((Long) -> Unit)? = null,
     onAddToPreferites: (() -> Unit)?,
     modifier: Modifier = Modifier,
+    disableScrollingText: Boolean
 ) {
     val context = LocalContext.current
 
@@ -650,7 +667,8 @@ fun MiniMediaItemMenu(
             context.startActivity(Intent.createChooser(sendIntent, null))
         },
         onAddToPreferites = onAddToPreferites,
-        modifier = modifier
+        modifier = modifier,
+        disableScrollingText = disableScrollingText
     )
 }
 
@@ -662,6 +680,7 @@ fun FolderItemMenu(
     thumbnailSizeDp: Dp,
     onDismiss: () -> Unit,
     onEnqueue: () -> Unit,
+    disableScrollingText: Boolean
 ) {
     val density = LocalDensity.current
 
@@ -691,7 +710,7 @@ fun FolderItemMenu(
             modifier = Modifier
                 .padding(end = 12.dp)
         ) {
-            FolderItem(folder, thumbnailSizeDp)
+            FolderItem(folder, thumbnailSizeDp, disableScrollingText = disableScrollingText)
 
         }
 
@@ -737,7 +756,8 @@ fun MediaItemMenu(
     onGoToArtist: ((String) -> Unit)? = null,
     onRemoveFromQuickPicks: (() -> Unit)? = null,
     onShare: () -> Unit,
-    onGoToPlaylist: ((Long) -> Unit)? = null
+    onGoToPlaylist: ((Long) -> Unit)? = null,
+    disableScrollingText: Boolean
 ) {
     val density = LocalDensity.current
 
@@ -1109,7 +1129,8 @@ fun MediaItemMenu(
                         thumbnailSizeDp = thumbnailSizeDp,
                         modifier = Modifier
                             .weight(1f),
-                        mediaId = mediaItem.mediaId
+                        mediaId = mediaItem.mediaId,
+                        disableScrollingText = disableScrollingText
                     )