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.

Player controls: one queue button, a working heart, icon tabs

Lelonio925af0d49be1
diff --git a/.claude/settings.local.json b/.claude/settings.local.json
index 0b28c9f..3fa1f74 100644
--- a/.claude/settings.local.json
+++ b/.claude/settings.local.json
@@ -92,7 +92,8 @@
"Bash(git -c user.name=Emanuele -c [email protected] commit -qm 'Cross-fade the player'\\\\''s middle slot *)",
"Bash(git -c user.name=Emanuele -c [email protected] commit -qm 'Let the page show through the player as it is dragged away *)",
"Bash(git -c user.name=Emanuele -c [email protected] commit -qm 'Contract the player as it collapses *)",
- "Bash(git -c user.name=Emanuele -c [email protected] commit -qm 'Make closing the player the opening reversed *)"
+ "Bash(git -c user.name=Emanuele -c [email protected] commit -qm 'Make closing the player the opening reversed *)",
+ "Bash(git -c user.name=Emanuele -c [email protected] commit -qm 'Player controls: one queue button, a working heart, icon tabs *)"
]
}
}
diff --git a/app/.cxx/RelWithDebInfo/151m4dr6/arm64-v8a/configure_fingerprint.bin b/app/.cxx/RelWithDebInfo/151m4dr6/arm64-v8a/configure_fingerprint.bin
index f8cc063..2089b7d 100644
--- a/app/.cxx/RelWithDebInfo/151m4dr6/arm64-v8a/configure_fingerprint.bin
+++ b/app/.cxx/RelWithDebInfo/151m4dr6/arm64-v8a/configure_fingerprint.bin
@@ -2,27 +2,27 @@ C/C++ Structured Logl
j
h/Users/emanuele/Progetto Spotify/app/.cxx/RelWithDebInfo/151m4dr6/arm64-v8a/additional_project_files.txtC
A
-?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  �����3  ����3i
+?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint  �����3  ����3i
g
-e/Users/emanuele/Progetto Spotify/app/.cxx/RelWithDebInfo/151m4dr6/arm64-v8a/android_gradle_build.json  �����3� ����3n
+e/Users/emanuele/Progetto Spotify/app/.cxx/RelWithDebInfo/151m4dr6/arm64-v8a/android_gradle_build.json  �����3� ����3n
l
-j/Users/emanuele/Progetto Spotify/app/.cxx/RelWithDebInfo/151m4dr6/arm64-v8a/android_gradle_build_mini.json  �����3� �����3[
+j/Users/emanuele/Progetto Spotify/app/.cxx/RelWithDebInfo/151m4dr6/arm64-v8a/android_gradle_build_mini.json  �����3� �����3[
Y
-W/Users/emanuele/Progetto Spotify/app/.cxx/RelWithDebInfo/151m4dr6/arm64-v8a/build.ninja  �����3�� ����3_
+W/Users/emanuele/Progetto Spotify/app/.cxx/RelWithDebInfo/151m4dr6/arm64-v8a/build.ninja  �����3�� ����3_
]
-[/Users/emanuele/Progetto Spotify/app/.cxx/RelWithDebInfo/151m4dr6/arm64-v8a/build.ninja.txt  �����3d
+[/Users/emanuele/Progetto Spotify/app/.cxx/RelWithDebInfo/151m4dr6/arm64-v8a/build.ninja.txt  �����3d
b
-`/Users/emanuele/Progetto Spotify/app/.cxx/RelWithDebInfo/151m4dr6/arm64-v8a/build_file_index.txt  �����3 @ ����3e
+`/Users/emanuele/Progetto Spotify/app/.cxx/RelWithDebInfo/151m4dr6/arm64-v8a/build_file_index.txt  �����3 @ ����3e
c
-a/Users/emanuele/Progetto Spotify/app/.cxx/RelWithDebInfo/151m4dr6/arm64-v8a/compile_commands.json  �����3�� ����3i
+a/Users/emanuele/Progetto Spotify/app/.cxx/RelWithDebInfo/151m4dr6/arm64-v8a/compile_commands.json  �����3�� ����3i
g
-e/Users/emanuele/Progetto Spotify/app/.cxx/RelWithDebInfo/151m4dr6/arm64-v8a/compile_commands.json.bin  �����3 �" ����3o
+e/Users/emanuele/Progetto Spotify/app/.cxx/RelWithDebInfo/151m4dr6/arm64-v8a/compile_commands.json.bin  �����3 �" ����3o
m
-k/Users/emanuele/Progetto Spotify/app/.cxx/RelWithDebInfo/151m4dr6/arm64-v8a/metadata_generation_command.txt  �����3
+k/Users/emanuele/Progetto Spotify/app/.cxx/RelWithDebInfo/151m4dr6/arm64-v8a/metadata_generation_command.txt  �����3
� ����3b
`
-^/Users/emanuele/Progetto Spotify/app/.cxx/RelWithDebInfo/151m4dr6/arm64-v8a/prefab_config.json  �����3  ( ����3g
+^/Users/emanuele/Progetto Spotify/app/.cxx/RelWithDebInfo/151m4dr6/arm64-v8a/prefab_config.json  �����3  ( ����3g
e
-c/Users/emanuele/Progetto Spotify/app/.cxx/RelWithDebInfo/151m4dr6/arm64-v8a/symbol_folder_index.txt  �����3  b ����3D
+c/Users/emanuele/Progetto Spotify/app/.cxx/RelWithDebInfo/151m4dr6/arm64-v8a/symbol_folder_index.txt  �����3  b ����3D
B
-@/Users/emanuele/Progetto Spotify/app/src/main/cpp/CMakeLists.txt  �����3 � �Ȅ��3
\ No newline at end of file
+@/Users/emanuele/Progetto Spotify/app/src/main/cpp/CMakeLists.txt  �����3 � �Ȅ��3
\ No newline at end of file
diff --git a/app/src/main/java/dev/emanuele/spot/data/SpotifyApi.kt b/app/src/main/java/dev/emanuele/spot/data/SpotifyApi.kt
index 66a0382..dda2a00 100644
--- a/app/src/main/java/dev/emanuele/spot/data/SpotifyApi.kt
+++ b/app/src/main/java/dev/emanuele/spot/data/SpotifyApi.kt
@@ -3,6 +3,7 @@ package dev.emanuele.spot.data
import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable
import retrofit2.http.Body
+import retrofit2.http.DELETE
import retrofit2.http.GET
import retrofit2.http.PUT
import retrofit2.http.Path
@@ -99,6 +100,21 @@ interface SpotifyApi {
@PUT("v1/me/player")
suspend fun transferPlayback(@Body request: TransferRequestDto)
+ /**
+ * Whether tracks are in the user's Liked Songs.
+ *
+ * Answers one boolean per id, in the order asked. Needs `user-library-read`.
+ */
+ @GET("v1/me/tracks/contains")
+ suspend fun areSaved(@Query("ids") ids: String): List<Boolean>
+
+ /** Needs `user-library-modify`. */
+ @PUT("v1/me/tracks")
+ suspend fun saveTracks(@Query("ids") ids: String)
+
+ @DELETE("v1/me/tracks")
+ suspend fun removeTracks(@Query("ids") ids: String)
+
@GET("v1/search")
suspend fun search(
@Query("q") query: String,
diff --git a/app/src/main/java/dev/emanuele/spot/ui/MainViewModel.kt b/app/src/main/java/dev/emanuele/spot/ui/MainViewModel.kt
index 109f067..6219c50 100644
--- a/app/src/main/java/dev/emanuele/spot/ui/MainViewModel.kt
+++ b/app/src/main/java/dev/emanuele/spot/ui/MainViewModel.kt
@@ -242,6 +242,58 @@ class MainViewModel(app: Application) : AndroidViewModel(app) {
}
}
+ /**
+ * Whether the playing track is in Liked Songs.
+ *
+ * Null while unknown — no Web API application, the check still in flight, or
+ * it failed. The heart is drawn inert in that case rather than guessing,
+ * because guessing wrong here silently removes something from a library.
+ */
+ private val _liked = MutableStateFlow<Boolean?>(null)
+ val liked: StateFlow<Boolean?> = _liked.asStateFlow()
+ private var likedJob: Job? = null
+ private var likedUri: String? = null
+
+ fun checkLiked(trackUri: String?) {
+ likedJob?.cancel()
+ likedUri = trackUri
+ _liked.value = null
+ val id = trackUri?.takeIf { it.startsWith("spotify:track:") }
+ ?.substringAfterLast(':')
+ ?: return
+ if (!container.webApi.isReady) return
+
+ likedJob = viewModelScope.launch {
+ runCatching { container.api.areSaved(id).firstOrNull() }
+ .onSuccess { _liked.value = it }
+ .onFailure { android.util.Log.w(TAG, "liked check failed: ${describe(it)}") }
+ }
+ }
+
+ /**
+ * Adds or removes the playing track.
+ *
+ * The state is flipped before the call and put back if it fails: a heart
+ * that waits for a round trip feels broken, and one that lies about the
+ * outcome is worse.
+ */
+ fun toggleLiked() {
+ val id = likedUri?.takeIf { it.startsWith("spotify:track:") }
+ ?.substringAfterLast(':')
+ ?: return
+ val wasLiked = _liked.value ?: return
+
+ _liked.value = !wasLiked
+ viewModelScope.launch {
+ runCatching {
+ if (wasLiked) container.api.removeTracks(id) else container.api.saveTracks(id)
+ }.onFailure {
+ android.util.Log.e(TAG, "like failed: ${chain(it)}", it)
+ _liked.value = wasLiked
+ }
+ }
+ }
+
private val _playlist = MutableStateFlow(PlaylistState())
val playlist: StateFlow<PlaylistState> = _playlist.asStateFlow()
@@ -348,6 +400,9 @@ class MainViewModel(app: Application) : AndroidViewModel(app) {
// playback.
"user-read-playback-state",
"user-modify-playback-state",
+ // The heart in the player.
+ "user-library-read",
+ "user-library-modify",
),
)
}
diff --git a/app/src/main/java/dev/emanuele/spot/ui/SpotApp.kt b/app/src/main/java/dev/emanuele/spot/ui/SpotApp.kt
index 1658574..9f7fa09 100644
--- a/app/src/main/java/dev/emanuele/spot/ui/SpotApp.kt
+++ b/app/src/main/java/dev/emanuele/spot/ui/SpotApp.kt
@@ -151,6 +151,7 @@ fun SpotApp(
val feed by viewModel.feed.collectAsStateWithLifecycle()
val playlistOrder by viewModel.playlistOrder.collectAsStateWithLifecycle()
val devices by viewModel.devices.collectAsStateWithLifecycle()
+ val liked by viewModel.liked.collectAsStateWithLifecycle()
// Once, on the first composition that has a usable Web API session. The
// ViewModel keeps what it fetched, so navigating away and back does not
@@ -197,6 +198,8 @@ fun SpotApp(
)
}
+ LaunchedEffect(playback.mediaId) { viewModel.checkLiked(playback.mediaId) }
+
var canvas by remember { mutableStateOf<CanvasClip?>(null) }
// Fetched per track, like the lyrics. Most tracks have none, so a null is an
@@ -450,6 +453,8 @@ fun SpotApp(
onCloseDevices = viewModel::closeDevices,
onRefreshDevices = viewModel::refreshDevices,
onSelectDevice = { viewModel.transferPlayback(it) },
+ liked = liked,
+ onToggleLiked = viewModel::toggleLiked,
)
},
)
diff --git a/app/src/main/java/dev/emanuele/spot/ui/player/PlayerPanel.kt b/app/src/main/java/dev/emanuele/spot/ui/player/PlayerPanel.kt
index 1fc88f3..29ac6a8 100644
--- a/app/src/main/java/dev/emanuele/spot/ui/player/PlayerPanel.kt
+++ b/app/src/main/java/dev/emanuele/spot/ui/player/PlayerPanel.kt
@@ -20,7 +20,10 @@ import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.foundation.verticalScroll
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Add
+import androidx.compose.material.icons.automirrored.filled.QueueMusic
import androidx.compose.material.icons.filled.Close
+import androidx.compose.material.icons.filled.Lyrics
+import androidx.compose.material.icons.filled.Tune
import androidx.compose.material3.AlertDialog
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
@@ -78,13 +81,17 @@ fun PlayerPanelSection(
.padding(top = 18.dp),
horizontalArrangement = Arrangement.Center,
) {
- PanelTab("CODA", panel == PlayerPanel.QUEUE) {
+ PanelTab(
+ Icons.AutoMirrored.Filled.QueueMusic,
+ "Coda",
+ panel == PlayerPanel.QUEUE,
+ ) {
onSelect(if (panel == PlayerPanel.QUEUE) PlayerPanel.NONE else PlayerPanel.QUEUE)
}
- PanelTab("TESTO", panel == PlayerPanel.LYRICS) {
+ PanelTab(Icons.Filled.Lyrics, "Testo", panel == PlayerPanel.LYRICS) {
onSelect(if (panel == PlayerPanel.LYRICS) PlayerPanel.NONE else PlayerPanel.LYRICS)
}
- PanelTab("EFFETTI", panel == PlayerPanel.EFFECTS) {
+ PanelTab(Icons.Filled.Tune, "Effetti", panel == PlayerPanel.EFFECTS) {
onSelect(
if (panel == PlayerPanel.EFFECTS) PlayerPanel.NONE else PlayerPanel.EFFECTS,
)
@@ -131,16 +138,29 @@ fun PlayerPanelSection(
}
}
+/**
+ * Icons rather than the words they replaced.
+ *
+ * Everything else on this screen is a glyph, and three words set in caps read as
+ * a different control from the ones around them. The label survives as the
+ * content description, which is what a screen reader wants anyway.
+ */
@Composable
-private fun PanelTab(label: String, selected: Boolean, onClick: () -> Unit) {
- Text(
- text = label,
- style = MaterialTheme.typography.labelLarge,
- color = if (selected) GlassInk else GlassInkDim,
+private fun PanelTab(
+ icon: androidx.compose.ui.graphics.vector.ImageVector,
+ label: String,
+ selected: Boolean,
+ onClick: () -> Unit,
+) {
+ Icon(
+ imageVector = icon,
+ contentDescription = label,
+ tint = if (selected) GlassInk else GlassInkDim,
modifier = Modifier
.clip(RoundedCornerShape(50))
.clickable(onClick = onClick)
- .padding(horizontal = 18.dp, vertical = 8.dp),
+ .padding(horizontal = 20.dp, vertical = 8.dp)
+ .size(22.dp),
)
}
diff --git a/app/src/main/java/dev/emanuele/spot/ui/player/PlayerScreen.kt b/app/src/main/java/dev/emanuele/spot/ui/player/PlayerScreen.kt
index a8b7c7b..503aa92 100644
--- a/app/src/main/java/dev/emanuele/spot/ui/player/PlayerScreen.kt
+++ b/app/src/main/java/dev/emanuele/spot/ui/player/PlayerScreen.kt
@@ -43,6 +43,7 @@ import androidx.compose.material.icons.filled.RepeatOne
import androidx.compose.material.icons.filled.Shuffle
import androidx.compose.material.icons.filled.SkipNext
import androidx.compose.material.icons.filled.SkipPrevious
+import androidx.compose.material.icons.filled.Favorite
import androidx.compose.material.icons.outlined.FavoriteBorder
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
@@ -136,6 +137,9 @@ fun PlayerScreen(
onCloseDevices: () -> Unit,
onRefreshDevices: () -> Unit,
onSelectDevice: (String) -> Unit,
+ /** Null while unknown; see MainViewModel.liked. */
+ liked: Boolean?,
+ onToggleLiked: () -> Unit,
) {
var panel by remember { mutableStateOf(PlayerPanel.NONE) }
@@ -221,16 +225,8 @@ fun PlayerScreen(
) {
TopBar(
backdrop = glassBackdrop,
- queueOpen = panel == PlayerPanel.QUEUE,
onCollapse = onCollapse,
onOpenDevices = onOpenDevices,
- onToggleQueue = {
- panel = if (panel == PlayerPanel.QUEUE) {
- PlayerPanel.NONE
- } else {
- PlayerPanel.QUEUE
- }
- },
)
// Everything sits at the bottom, as in the reference: the
@@ -322,28 +318,36 @@ fun PlayerScreen(
verticalAlignment = Alignment.CenterVertically,
) {
TitleBlock(state, Modifier.weight(1f))
+ // The queue used to have a button here as well
+ // as one in the top bar and its own tab below —
+ // three controls for one panel. The tab is the
+ // one that stayed: it is where the other panels
+ // are.
RoundGlassButton(
backdrop = glassBackdrop,
size = 40.dp,
- onClick = {
- panel = if (panel == PlayerPanel.QUEUE) {
- PlayerPanel.NONE
- } else {
- PlayerPanel.QUEUE
- }
- },
+ // Inert until the check has answered:
+ // guessing wrong here silently removes
+ // something from a library.
+ enabled = liked != null,
+ onClick = onToggleLiked,
) {
Icon(
- Icons.Filled.QueueMusic,
- contentDescription = "Coda",
- modifier = Modifier.size(20.dp),
- )
- }
- Spacer(Modifier.size(8.dp))
- RoundGlassButton(backdrop = glassBackdrop, size = 40.dp, onClick = {}) {
- Icon(
- Icons.Outlined.FavoriteBorder,
- contentDescription = null,
+ if (liked == true) {
+ Icons.Filled.Favorite
+ } else {
+ Icons.Outlined.FavoriteBorder
+ },
+ contentDescription = if (liked == true) {
+ "Togli dai brani salvati"
+ } else {
+ "Salva"
+ },
+ tint = if (liked == true) {
+ MaterialTheme.colorScheme.primary
+ } else {
+ GlassInk
+ },
modifier = Modifier.size(20.dp),
)
}
@@ -421,10 +425,8 @@ fun PlayerScreen(
@Composable
private fun TopBar(
backdrop: Backdrop,
- queueOpen: Boolean,
onCollapse: () -> Unit,
onOpenDevices: () -> Unit,
- onToggleQueue: () -> Unit,
) {
Row(
Modifier
@@ -451,14 +453,7 @@ private fun TopBar(
tint = GlassInk,
)
}
- Spacer(Modifier.size(8.dp))
- GlassButton(backdrop, onClick = onToggleQueue) {
- Icon(
- Icons.Filled.MoreHoriz,
- contentDescription = "Altro",
- tint = if (queueOpen) GlassInk else GlassInkDim,
- )
- }
+
}
}