Skip to content

Unofficial YouTube Music / Spotify Premium client for Android, built in Liquid Glass. Audio effects, Spotify Connect, listening history, 8 languages. Rust core on librespot.

The queue keeps the songs already heard

Lelonio9f8cd4759ded
diff --git a/app/src/main/java/dev/lelonio/square/ui/player/PlayerPanel.kt b/app/src/main/java/dev/lelonio/square/ui/player/PlayerPanel.kt
index 96438e8..ce3a08b 100644
--- a/app/src/main/java/dev/lelonio/square/ui/player/PlayerPanel.kt
+++ b/app/src/main/java/dev/lelonio/square/ui/player/PlayerPanel.kt
@@ -253,6 +253,8 @@ data class QueueEntry(
val title: String,
val artist: String,
val isCurrent: Boolean,
+ /** Already heard: shown above the playing track, dimmed. */
+ val played: Boolean = false,
)
@Composable
@@ -267,7 +269,30 @@ internal fun QueueList(
return
}
- LazyColumn(Modifier.padding(vertical = 8.dp)) {
+ // Opens on the playing track, with what was heard above it out of view:
+ // history for whoever scrolls up, and the next songs where they always
+ // were for everyone else. Back to it on every change of song, as the list
+ // used to start there by having nothing before it.
+ val heard = queue.count { it.played }
+ val listState = rememberLazyListState(
+ initialFirstVisibleItemIndex = if (heard > 0) heard + 1 else 0,
+ )
+ val playingUri = queue.firstOrNull { it.isCurrent }?.uri
+ LaunchedEffect(playingUri, heard) {
+ listState.scrollToItem(if (heard > 0) heard + 1 else 0)
+ }
+
+ LazyColumn(Modifier.padding(vertical = 8.dp), state = listState) {
+ if (heard > 0) {
+ item(key = "history-heading") {
+ Text(
+ stringResource(R.string.queue_history),
+ style = MaterialTheme.typography.labelLarge,
+ color = GlassInkDim,
+ modifier = Modifier.padding(start = 18.dp, top = 6.dp, bottom = 4.dp),
+ )
+ }
+ }
// Keyed on the track, not on where it sits.
//
// With the index as the key, taking one out renumbered every row below
@@ -291,7 +316,11 @@ internal fun QueueList(
Text(
entry.title,
style = MaterialTheme.typography.titleMedium,
- color = if (entry.isCurrent) GlassInk else GlassInk.copy(alpha = 0.85f),
+ color = when {
+ entry.isCurrent -> GlassInk
+ entry.played -> GlassInk.copy(alpha = 0.45f)
+ else -> GlassInk.copy(alpha = 0.85f)
+ },
maxLines = 1,
overflow = TextOverflow.Ellipsis,
)
@@ -306,7 +335,7 @@ internal fun QueueList(
// Not on the track being played: taking that one out is a
// different act — it is a skip — and it already has a button.
- if (!entry.isCurrent) {
+ if (!entry.isCurrent && !entry.played) {
Icon(
PhosphorIcons.Regular.X,
contentDescription = stringResource(R.string.remove_from_queue),
diff --git a/app/src/main/java/dev/lelonio/square/ui/player/PlayerState.kt b/app/src/main/java/dev/lelonio/square/ui/player/PlayerState.kt
index 8d40742..0bb0278 100644
--- a/app/src/main/java/dev/lelonio/square/ui/player/PlayerState.kt
+++ b/app/src/main/java/dev/lelonio/square/ui/player/PlayerState.kt
@@ -291,10 +291,15 @@ fun rememberQueue(player: Player?): State<List<QueueEntry>> {
fun rebuild() {
val current = player.currentMediaItemIndex
- // From the playing track onwards. What has already been heard is
- // not a queue — it is history, and it pushed what comes next off
- // the bottom of the panel on any list longer than a screen.
- queue.value = (current until player.mediaItemCount).map { index ->
+ // The last few heard as well as what comes next.
+ //
+ // They were left out once because they pushed the upcoming tracks
+ // off the bottom of the panel; the panel now opens on the playing
+ // track instead, with these above it for whoever scrolls up. A song
+ // that had ended simply vanished from the list, which read as the
+ // app throwing it away (#30).
+ val from = (current - QUEUE_HISTORY).coerceAtLeast(0)
+ queue.value = (from until player.mediaItemCount).map { index ->
val metadata = player.getMediaItemAt(index).mediaMetadata
QueueEntry(
index = index,
@@ -302,6 +307,7 @@ fun rememberQueue(player: Player?): State<List<QueueEntry>> {
title = metadata.title?.toString().orEmpty(),
artist = metadata.artist?.toString().orEmpty(),
isCurrent = index == current,
+ played = index < current,
)
}
}
@@ -354,3 +360,6 @@ fun rememberPositionMs(player: Player?, isPlaying: Boolean): State<Long> {
return position
}
+
+/** How many of the tracks already heard the queue panel keeps above the playing one. */
+private const val QUEUE_HISTORY = 20
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 303681b..37e3f70 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -128,6 +128,7 @@
<string name="play_on">Abspielen auf</string>
<string name="no_devices">Keine Geräte verfügbar</string>
<string name="queue_empty">Die Warteschlange ist leer</string>
+ <string name="queue_history">Bereits gehört</string>
<string name="no_lyrics">Kein Songtext für diesen Titel</string>
<string name="speed">Tempo</string>
<string name="pitch">Tonhöhe</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index c1d6671..9743f3d 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -128,6 +128,7 @@
<string name="play_on">Reproducir en</string>
<string name="no_devices">Ningún dispositivo disponible</string>
<string name="queue_empty">La cola está vacía</string>
+ <string name="queue_history">Ya escuchadas</string>
<string name="no_lyrics">Sin letra para esta canción</string>
<string name="speed">Velocidad</string>
<string name="pitch">Tono</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 44a8a6f..a31be80 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -128,6 +128,7 @@
<string name="play_on">Lire sur</string>
<string name="no_devices">Aucun appareil disponible</string>
<string name="queue_empty">La file est vide</string>
+ <string name="queue_history">Déjà écoutés</string>
<string name="no_lyrics">Pas de paroles pour ce titre</string>
<string name="speed">Vitesse</string>
<string name="pitch">Hauteur</string>
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index 500db66..47d71ca 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -138,6 +138,7 @@
<string name="play_on">यहाँ चलाएँ</string>
<string name="no_devices">कोई डिवाइस उपलब्ध नहीं</string>
<string name="queue_empty">कतार खाली है</string>
+ <string name="queue_history">सुने जा चुके</string>
<string name="no_lyrics">इस गाने के बोल नहीं हैं</string>
<string name="speed">गति</string>
<string name="pitch">पिच</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 29b96da..94ef6a2 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -129,6 +129,7 @@
<string name="play_on">Riproduci su</string>
<string name="no_devices">Nessun dispositivo disponibile</string>
<string name="queue_empty">La coda è vuota</string>
+ <string name="queue_history">Già ascoltati</string>
<string name="no_lyrics">Nessun testo per questo brano</string>
<string name="speed">Velocità</string>
<string name="pitch">Tonalità</string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 3f5aef3..6cddb2f 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -128,6 +128,7 @@
<string name="play_on">Tocar em</string>
<string name="no_devices">Nenhum dispositivo disponível</string>
<string name="queue_empty">A fila está vazia</string>
+ <string name="queue_history">Já ouvidas</string>
<string name="no_lyrics">Sem letra para esta faixa</string>
<string name="speed">Velocidade</string>
<string name="pitch">Tom</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 8ee2c2a..f92f3fc 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -140,6 +140,7 @@
<string name="play_on">Играть на</string>
<string name="no_devices">Устройств нет</string>
<string name="queue_empty">Очередь пуста</string>
+ <string name="queue_history">Уже прослушано</string>
<string name="no_lyrics">Для этого трека текста нет</string>
<string name="speed">Скорость</string>
<string name="pitch">Тон</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 26cfd17..606d7b2 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -138,6 +138,7 @@
<string name="play_on">Şurada çal</string>
<string name="no_devices">Kullanılabilir cihaz yok</string>
<string name="queue_empty">Sıra boş</string>
+ <string name="queue_history">Dinlenenler</string>
<string name="no_lyrics">Bu şarkının sözleri yok</string>
<string name="speed">Hız</string>
<string name="pitch">Perde</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2af5df6..f4ce915 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -144,6 +144,7 @@
<string name="play_on">Play on</string>
<string name="no_devices">No devices available</string>
<string name="queue_empty">The queue is empty</string>
+ <string name="queue_history">Played</string>
<string name="no_lyrics">No lyrics for this song</string>
<string name="speed">Speed</string>
<string name="pitch">Pitch</string>