refactor: mini player text marquee setting (#379)

zyrouge · Dec 28, 2023 · 5594687 · 5594687
1 parent 0675ab2
commit 5594687
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 1 deletion.
diff --git a/.phrasey/schema.toml b/.phrasey/schema.toml
@@ -612,3 +612,5 @@ parameters = ["x"]
 name = "CopiedXToClipboard"
 parameters = ["x"]
 
+[[keys]]
+name = "MiniPlayerTextMarquee"
diff --git a/app/src/main/java/io/github/zyrouge/symphony/services/Settings.kt b/app/src/main/java/io/github/zyrouge/symphony/services/Settings.kt
@@ -81,6 +81,7 @@ object SettingsKeys {
     const val nowPlayingLyricsLayout = "now_playing_lyrics_layout"
     const val artistTagSeparators = "artist_tag_separators"
     const val genreTagSeparators = "genre_tag_separators"
+    const val miniPlayerTextMarquee = "mini_player_text_marquee"
 }
 
 object SettingsDefaults {
@@ -135,6 +136,7 @@ object SettingsDefaults {
     val nowPlayingLyricsLayout = NowPlayingLyricsLayout.ReplaceArtwork
     val artistTagSeparators = setOf(";", "/", ",", "+")
     val genreTagSeparators = setOf(";", "/", ",", "+", " ")
+    const val miniPlayerTextMarquee = true
 }
 
 @Suppress("MemberVisibilityCanBePrivate")
@@ -252,6 +254,8 @@ class SettingsManager(private val symphony: Symphony) {
     val artistTagSeparators = _artistTagSeparators.asStateFlow()
     private val _genreTagSeparators = MutableStateFlow(getGenreTagSeparators())
     val genreTagSeparators = _genreTagSeparators.asStateFlow()
+    private val _miniPlayerTextMarquee = MutableStateFlow(getMiniPlayerTextMarquee())
+    val miniPlayerTextMarquee = _miniPlayerTextMarquee.asStateFlow()
 
     fun getThemeMode() = getSharedPreferences().getString(SettingsKeys.themeMode, null)
         ?.let { ThemeMode.valueOf(it) }
@@ -876,6 +880,18 @@ class SettingsManager(private val symphony: Symphony) {
         _genreTagSeparators.updateUsingValue(getGenreTagSeparators())
     }
 
+    fun getMiniPlayerTextMarquee() = getSharedPreferences().getBoolean(
+        SettingsKeys.miniPlayerTextMarquee,
+        SettingsDefaults.miniPlayerTextMarquee,
+    )
+
+    fun setMiniPlayerTextMarquee(value: Boolean) {
+        getSharedPreferences().edit {
+            putBoolean(SettingsKeys.miniPlayerTextMarquee, value)
+        }
+        _miniPlayerTextMarquee.updateUsingValue(getMiniPlayerTextMarquee())
+    }
+
     private fun getSharedPreferences() = symphony.applicationContext.getSharedPreferences(
         SettingsKeys.identifier,
         Context.MODE_PRIVATE,

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
@@ -62,6 +62,7 @@ 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
@@ -71,6 +72,7 @@ import io.github.zyrouge.symphony.ui.helpers.Routes
 import io.github.zyrouge.symphony.ui.helpers.TransitionDurations
 import io.github.zyrouge.symphony.ui.helpers.ViewContext
 import io.github.zyrouge.symphony.ui.helpers.navigate
+import io.github.zyrouge.symphony.utils.runIfOrThis
 import kotlin.math.absoluteValue
 
 @OptIn(ExperimentalMaterial3Api::class)
@@ -289,11 +291,13 @@ private fun NowPlayingBottomBarContent(context: ViewContext, song: Song) {
         ) {
             Column(modifier = Modifier.fillMaxWidth()) {
                 NowPlayingBottomBarContentText(
+                    context,
                     song.title,
                     style = MaterialTheme.typography.bodyMedium,
                 )
                 if (song.artists.isNotEmpty()) {
                     NowPlayingBottomBarContentText(
+                        context,
                         song.artists.joinToString(),
                         style = MaterialTheme.typography.bodySmall,
                     )
@@ -306,18 +310,26 @@ private fun NowPlayingBottomBarContent(context: ViewContext, song: Song) {
 @OptIn(ExperimentalFoundationApi::class)
 @Composable
 private fun NowPlayingBottomBarContentText(
+    context: ViewContext,
     text: String,
     style: TextStyle,
 ) {
+    val textMarquee by context.symphony.settings.miniPlayerTextMarquee.collectAsState()
     var showOverlay by remember { mutableStateOf(false) }
 
     Box {
         Text(
             text,
             style = style,
             maxLines = 1,
+            overflow = when {
+                textMarquee -> TextOverflow.Clip
+                else -> TextOverflow.Ellipsis
+            },
             modifier = Modifier
-                .basicMarquee(iterations = Int.MAX_VALUE)
+                .runIfOrThis<Modifier>(textMarquee) {
+                    basicMarquee(iterations = Int.MAX_VALUE)
+                }
                 .onGloballyPositioned {
                     val offsetX = it.boundsInParent().centerLeft.x
                     showOverlay = offsetX.absoluteValue != 0f

diff --git a/app/src/main/java/io/github/zyrouge/symphony/ui/view/Settings.kt b/app/src/main/java/io/github/zyrouge/symphony/ui/view/Settings.kt
@@ -35,6 +35,7 @@ import androidx.compose.material.icons.filled.GraphicEq
 import androidx.compose.material.icons.filled.Headset
 import androidx.compose.material.icons.filled.HeadsetOff
 import androidx.compose.material.icons.filled.Home
+import androidx.compose.material.icons.filled.KeyboardDoubleArrowRight
 import androidx.compose.material.icons.filled.Language
 import androidx.compose.material.icons.filled.MusicNote
 import androidx.compose.material.icons.filled.Palette
@@ -125,6 +126,7 @@ fun SettingsView(context: ViewContext) {
     val seekForwardDuration by context.symphony.settings.seekForwardDuration.collectAsState()
     val miniPlayerTrackControls by context.symphony.settings.miniPlayerTrackControls.collectAsState()
     val miniPlayerSeekControls by context.symphony.settings.miniPlayerSeekControls.collectAsState()
+    val miniPlayerTextMarquee by context.symphony.settings.miniPlayerTextMarquee.collectAsState()
     val nowPlayingControlsLayout by context.symphony.settings.nowPlayingControlsLayout.collectAsState()
     val nowPlayingAdditionalInfo by context.symphony.settings.nowPlayingAdditionalInfo.collectAsState()
     val nowPlayingSeekControls by context.symphony.settings.nowPlayingSeekControls.collectAsState()
@@ -576,6 +578,18 @@ fun SettingsView(context: ViewContext) {
                             context.symphony.settings.setMiniPlayerSeekControls(value)
                         }
                     )
+                    SettingsSwitchTile(
+                        icon = {
+                            Icon(Icons.Filled.KeyboardDoubleArrowRight, null)
+                        },
+                        title = {
+                            Text(context.symphony.t.MiniPlayerTextMarquee)
+                        },
+                        value = miniPlayerTextMarquee,
+                        onChange = { value ->
+                            context.symphony.settings.setMiniPlayerTextMarquee(value)
+                        }
+                    )
                     HorizontalDivider()
                     SettingsSideHeading(context.symphony.t.NowPlaying)
                     SettingsOptionTile(

diff --git a/i18n/en.toml b/i18n/en.toml
@@ -205,3 +205,4 @@ ReplaceArtwork = "Replace artwork"
 SeparatePage = "Separate page"
 UnknownAlbumX = "Unknown album ({x})"
 CopiedXToClipboard = "Copied '{x}' to clipboard"
+MiniPlayerTextMarquee = "Mini-player text marquee"