Unofficial YouTube Music / Spotify Premium client for Android, built in Liquid Glass. Audio effects, Spotify Connect, listening history, 8 languages. Rust core on librespot.
Kotlin alternativeandroidandroid-applicationclientglassmorphisminnertubelibrespotliquid-glassspotifyspotify-connectspotifyapiyoutube-musicyoutube-playerytdlnis
Swap every icon to Phosphor
Leloniof8ee709f2cf4
diff --git a/.claude/settings.local.json b/.claude/settings.local.jsonindex 4439382..6b048b9 100644--- a/.claude/settings.local.json+++ b/.claude/settings.local.json@@ -95,7 +95,13 @@"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 *)","Bash(git -c user.name=Emanuele -c [email protected] commit -qm 'Switch the player'\\\\''s views with the segmented control *)",- "Bash(git -c user.name=Emanuele -c [email protected] commit -qm 'Panels share the lyrics'\\\\'' space; slimmer switch *)"+ "Bash(git -c user.name=Emanuele -c [email protected] commit -qm 'Panels share the lyrics'\\\\'' space; slimmer switch *)",+ "WebFetch(domain:central.sonatype.com)",+ "Bash(grep -iE \"^x$|^xcircle|^xsquare\" regular.props)",+ "Bash(javap -classpath . com.adamglin.phosphoricons.__FillKt)",+ "Bash(xargs -0 sed -i '' -e s/Magnifyingglass/MagnifyingGlass/g -e s/Musicnotes/MusicNotes/g -e s/Skipback/SkipBack/g -e s/Skipforward/SkipForward/g -e s/Arrowclockwise/ArrowClockwise/g -e s/Arrowleft/ArrowLeft/g -e s/Arrowsdownup/ArrowsDownUp/g -e s/Caretdown/CaretDown/g -e s/Devicemobile/DeviceMobile/g -e s/Dotsthree/DotsThree/g -e s/Listbullets/ListBullets/g -e s/Slidershorizontal/SlidersHorizontal/g -e s/Speakerhifi/SpeakerHifi/g -e s/Squaresfour/SquaresFour/g -e s/Textalignleft/TextAlignLeft/g -e s/Vinylrecord/VinylRecord/g -e s/RepeatOne/RepeatOnce/g)",+ "Bash(./gradlew :app:assembleDev -q)",+ "Bash(git commit -q -m 'Swap every icon to Phosphor *)"]}}diff --git a/app/.cxx/RelWithDebInfo/151m4dr6/arm64-v8a/configure_fingerprint.bin b/app/.cxx/RelWithDebInfo/151m4dr6/arm64-v8a/configure_fingerprint.binindex 54dfd8b..fd4053a 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 Logljh/Users/emanuele/Progetto Spotify/app/.cxx/RelWithDebInfo/151m4dr6/arm64-v8a/additional_project_files.txtCA-?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint �����3 ����3i+?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint �����3 ����3ig-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� ����3nl-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 �����3db-`/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 @ ����3ec-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�� ����3ig-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 �" ����3om-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 ( ����3ge-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 ����3DB-@/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 filediff --git a/app/build.gradle.kts b/app/build.gradle.ktsindex 4201041..862af81 100644--- a/app/build.gradle.kts+++ b/app/build.gradle.kts@@ -156,6 +156,7 @@ dependencies {implementation(libs.androidx.navigation.compose)implementation(libs.backdrop)implementation(libs.kyant.shapes)+ implementation(libs.phosphor)}/** Pinned so a build is not at the mercy of upstream's next commit. */diff --git a/app/src/main/java/dev/emanuele/spot/ui/SpotApp.kt b/app/src/main/java/dev/emanuele/spot/ui/SpotApp.ktindex 9f7fa09..b051e48 100644--- a/app/src/main/java/dev/emanuele/spot/ui/SpotApp.kt+++ b/app/src/main/java/dev/emanuele/spot/ui/SpotApp.kt@@ -22,13 +22,6 @@ import androidx.compose.foundation.layout.sizeimport androidx.compose.foundation.layout.statusBarsimport androidx.compose.foundation.layout.widthimport androidx.compose.foundation.shape.RoundedCornerShape-import androidx.compose.material.icons.Icons-import androidx.compose.material.icons.filled.Home-import androidx.compose.material.icons.filled.LibraryMusic-import androidx.compose.material.icons.filled.Search-import androidx.compose.material.icons.outlined.Home-import androidx.compose.material.icons.outlined.LibraryMusic-import androidx.compose.material.icons.outlined.Searchimport androidx.compose.material3.Iconimport androidx.compose.material3.LocalContentColorimport androidx.compose.material3.MaterialTheme@@ -99,6 +92,15 @@ import dev.emanuele.spot.ui.theme.Inkimport dev.emanuele.spot.ui.theme.SpotThemeimport dev.emanuele.spot.ui.theme.rememberArtworkColorimport kotlinx.coroutines.launch+import com.adamglin.PhosphorIcons+import com.adamglin.phosphoricons.Fill+import com.adamglin.phosphoricons.Regular+import com.adamglin.phosphoricons.fill.House+import com.adamglin.phosphoricons.fill.MagnifyingGlass+import com.adamglin.phosphoricons.fill.MusicNotes+import com.adamglin.phosphoricons.regular.House+import com.adamglin.phosphoricons.regular.MagnifyingGlass+import com.adamglin.phosphoricons.regular.MusicNotesobject Routes {const val HOME = "home"@@ -593,13 +595,13 @@ private fun BottomBar(accentColor = Ink,containerColor = GlassFilm,) {- BottomItem("Home", Icons.Filled.Home, Icons.Outlined.Home, selected == 0) {+ BottomItem("Home", PhosphorIcons.Fill.House, PhosphorIcons.Regular.House, selected == 0) {onSelect(Routes.HOME)}BottomItem("Libreria",- Icons.Filled.LibraryMusic,- Icons.Outlined.LibraryMusic,+ PhosphorIcons.Fill.MusicNotes,+ PhosphorIcons.Regular.MusicNotes,selected == 1,) { onSelect(Routes.LIBRARY) }}@@ -621,7 +623,7 @@ private fun BottomBar(surfaceColor = GlassFilm,) {Icon(- imageVector = if (searching) Icons.Filled.Search else Icons.Outlined.Search,+ imageVector = if (searching) PhosphorIcons.Fill.MagnifyingGlass else PhosphorIcons.Regular.MagnifyingGlass,contentDescription = "Cerca",tint = Ink,modifier = Modifier.size(24.dp),diff --git a/app/src/main/java/dev/emanuele/spot/ui/components/SwipeToQueue.kt b/app/src/main/java/dev/emanuele/spot/ui/components/SwipeToQueue.ktindex 9b20917..3d6bc7d 100644--- a/app/src/main/java/dev/emanuele/spot/ui/components/SwipeToQueue.kt+++ b/app/src/main/java/dev/emanuele/spot/ui/components/SwipeToQueue.kt@@ -11,8 +11,6 @@ import androidx.compose.foundation.layout.fillMaxSizeimport androidx.compose.foundation.layout.fillMaxWidthimport androidx.compose.foundation.layout.paddingimport androidx.compose.foundation.layout.size-import androidx.compose.material.icons.Icons-import androidx.compose.material.icons.filled.PlaylistAddimport androidx.compose.material3.Iconimport androidx.compose.material3.MaterialThemeimport androidx.compose.material3.Text@@ -30,6 +28,9 @@ import androidx.compose.ui.unit.dpimport kotlinx.coroutines.launchimport kotlin.math.absimport kotlin.math.roundToInt+import com.adamglin.PhosphorIcons+import com.adamglin.phosphoricons.Regular+import com.adamglin.phosphoricons.regular.Queue/*** Wraps a row so dragging it to the left queues the track.@@ -73,7 +74,7 @@ fun SwipeToQueue(verticalAlignment = Alignment.CenterVertically,) {Icon(- Icons.Filled.PlaylistAdd,+ PhosphorIcons.Regular.Queue,contentDescription = null,tint = MaterialTheme.colorScheme.primary,modifier = Modifier.size(20.dp),diff --git a/app/src/main/java/dev/emanuele/spot/ui/library/LibraryScreen.kt b/app/src/main/java/dev/emanuele/spot/ui/library/LibraryScreen.ktindex d4235ca..9ed4088 100644--- a/app/src/main/java/dev/emanuele/spot/ui/library/LibraryScreen.kt+++ b/app/src/main/java/dev/emanuele/spot/ui/library/LibraryScreen.kt@@ -17,9 +17,6 @@ import androidx.compose.foundation.lazy.grid.itemsimport androidx.compose.foundation.lazy.LazyColumnimport androidx.compose.foundation.lazy.itemsimport androidx.compose.foundation.shape.RoundedCornerShape-import androidx.compose.material.icons.Icons-import androidx.compose.material.icons.automirrored.filled.List-import androidx.compose.material.icons.filled.GridViewimport androidx.compose.material3.CircularProgressIndicatorimport androidx.compose.material3.Iconimport androidx.compose.material3.MaterialTheme@@ -47,6 +44,10 @@ import dev.emanuele.spot.ui.player.GlassFilmimport dev.emanuele.spot.ui.theme.Inkimport dev.emanuele.spot.ui.theme.InkDimimport dev.emanuele.spot.ui.theme.softShadow+import com.adamglin.PhosphorIcons+import com.adamglin.phosphoricons.Regular+import com.adamglin.phosphoricons.regular.ListBullets+import com.adamglin.phosphoricons.regular.SquaresFour/** How the playlists are arranged. */private enum class Layout { GRID, LIST }@@ -215,8 +216,8 @@ private fun Header(surfaceColor = GlassFilm,) {Icon(- if (layout == Layout.GRID) Icons.AutoMirrored.Filled.List- else Icons.Filled.GridView,+ if (layout == Layout.GRID) PhosphorIcons.Regular.ListBullets+ else PhosphorIcons.Regular.SquaresFour,contentDescription = "Cambia disposizione",tint = Ink,modifier = Modifier.size(20.dp),diff --git a/app/src/main/java/dev/emanuele/spot/ui/library/PlaylistScreen.kt b/app/src/main/java/dev/emanuele/spot/ui/library/PlaylistScreen.ktindex b392e04..2eba7e9 100644--- a/app/src/main/java/dev/emanuele/spot/ui/library/PlaylistScreen.kt+++ b/app/src/main/java/dev/emanuele/spot/ui/library/PlaylistScreen.kt@@ -22,16 +22,6 @@ import androidx.compose.foundation.lazy.itemsimport androidx.compose.foundation.lazy.itemsIndexedimport androidx.compose.foundation.shape.CircleShapeimport androidx.compose.foundation.shape.RoundedCornerShape-import androidx.compose.material.icons.Icons-import androidx.compose.material.icons.automirrored.filled.ArrowBack-import androidx.compose.material.icons.filled.Check-import androidx.compose.material.icons.filled.Close-import androidx.compose.material.icons.filled.Equalizer-import androidx.compose.material.icons.filled.MoreHoriz-import androidx.compose.material.icons.filled.PlayArrow-import androidx.compose.material.icons.filled.Search-import androidx.compose.material.icons.filled.Shuffle-import androidx.compose.material.icons.filled.SwapVertimport androidx.compose.material3.CircularProgressIndicatorimport androidx.compose.material3.DropdownMenuimport androidx.compose.material3.DropdownMenuItem@@ -65,6 +55,18 @@ import dev.emanuele.spot.ui.theme.rememberArtworkColorimport dev.emanuele.spot.ui.theme.softShadowimport java.util.Localeimport java.util.concurrent.TimeUnit+import com.adamglin.PhosphorIcons+import com.adamglin.phosphoricons.Fill+import com.adamglin.phosphoricons.Regular+import com.adamglin.phosphoricons.fill.MagnifyingGlass+import com.adamglin.phosphoricons.fill.Play+import com.adamglin.phosphoricons.fill.Waveform+import com.adamglin.phosphoricons.regular.ArrowLeft+import com.adamglin.phosphoricons.regular.ArrowsDownUp+import com.adamglin.phosphoricons.regular.Check+import com.adamglin.phosphoricons.regular.DotsThree+import com.adamglin.phosphoricons.regular.Shuffle+import com.adamglin.phosphoricons.regular.X/** How the track list is ordered. */enum class TrackSort(val label: String) {@@ -176,11 +178,11 @@ fun PlaylistScreen(onValueChange = { query = it },placeholder = { Text("Cerca fra i brani") },singleLine = true,- leadingIcon = { Icon(Icons.Filled.Search, contentDescription = null) },+ leadingIcon = { Icon(PhosphorIcons.Fill.MagnifyingGlass, contentDescription = null) },trailingIcon = {if (query.isNotEmpty()) {IconButton(onClick = { query = "" }) {- Icon(Icons.Filled.Close, contentDescription = "Cancella")+ Icon(PhosphorIcons.Regular.X, contentDescription = "Cancella")}}},@@ -252,7 +254,7 @@ fun PlaylistScreen(blurRadius = 8.dp,) {Icon(- Icons.AutoMirrored.Filled.ArrowBack,+ PhosphorIcons.Regular.ArrowLeft,contentDescription = "Indietro",tint = Color.White,modifier = Modifier.size(20.dp),@@ -350,7 +352,7 @@ private fun DetailHeader(verticalAlignment = Alignment.CenterVertically,) {CircleAction(- icon = Icons.Filled.Shuffle,+ icon = PhosphorIcons.Regular.Shuffle,description = "Casuale",size = 46.dp,backdrop = backdrop,@@ -369,14 +371,14 @@ private fun DetailHeader(contentAlignment = Alignment.Center,) {Icon(- Icons.Filled.PlayArrow,+ PhosphorIcons.Fill.Play,contentDescription = "Riproduci",tint = Color.Black,modifier = Modifier.size(34.dp),)}CircleAction(- icon = if (searching) Icons.Filled.Close else Icons.Filled.Search,+ icon = if (searching) PhosphorIcons.Regular.X else PhosphorIcons.Fill.MagnifyingGlass,description = "Cerca fra i brani",size = 46.dp,backdrop = backdrop,@@ -482,7 +484,7 @@ private fun SectionHeader(Box {IconButton(onClick = { onSortOpen(true) }) {Icon(- Icons.Filled.SwapVert,+ PhosphorIcons.Regular.ArrowsDownUp,contentDescription = "Ordina",tint = if (sort == TrackSort.ORIGINAL) {MaterialTheme.colorScheme.onSurfaceVariant@@ -497,7 +499,7 @@ private fun SectionHeader(DropdownMenuItem(text = { Text(option.label) },trailingIcon = {- if (option == sort) Icon(Icons.Filled.Check, contentDescription = null)+ if (option == sort) Icon(PhosphorIcons.Regular.Check, contentDescription = null)},onClick = {onSort(option)@@ -568,7 +570,7 @@ private fun TrackRow(Box(Modifier.width(30.dp), contentAlignment = Alignment.CenterStart) {if (isCurrent) {Icon(- Icons.Filled.Equalizer,+ PhosphorIcons.Fill.Waveform,contentDescription = "In riproduzione",tint = MaterialTheme.colorScheme.primary,modifier = Modifier.size(18.dp),@@ -609,7 +611,7 @@ private fun TrackRow(}Icon(- Icons.Filled.MoreHoriz,+ PhosphorIcons.Regular.DotsThree,contentDescription = null,tint = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.6f),modifier = Modifierdiff --git a/app/src/main/java/dev/emanuele/spot/ui/player/DevicePicker.kt b/app/src/main/java/dev/emanuele/spot/ui/player/DevicePicker.ktindex abdf96f..c28c88a 100644--- a/app/src/main/java/dev/emanuele/spot/ui/player/DevicePicker.kt+++ b/app/src/main/java/dev/emanuele/spot/ui/player/DevicePicker.kt@@ -14,12 +14,6 @@ import androidx.compose.foundation.layout.sizeimport androidx.compose.foundation.rememberScrollStateimport androidx.compose.foundation.shape.RoundedCornerShapeimport androidx.compose.foundation.verticalScroll-import androidx.compose.material.icons.Icons-import androidx.compose.material.icons.filled.Computer-import androidx.compose.material.icons.filled.Refresh-import androidx.compose.material.icons.filled.Smartphone-import androidx.compose.material.icons.filled.Speaker-import androidx.compose.material.icons.filled.Tvimport androidx.compose.material3.CircularProgressIndicatorimport androidx.compose.material3.Iconimport androidx.compose.material3.MaterialTheme@@ -34,6 +28,13 @@ import androidx.compose.ui.text.style.TextOverflowimport androidx.compose.ui.unit.dpimport com.kyant.backdrop.Backdropimport dev.emanuele.spot.ui.MainViewModel+import com.adamglin.PhosphorIcons+import com.adamglin.phosphoricons.Regular+import com.adamglin.phosphoricons.regular.ArrowClockwise+import com.adamglin.phosphoricons.regular.Desktop+import com.adamglin.phosphoricons.regular.DeviceMobile+import com.adamglin.phosphoricons.regular.SpeakerHifi+import com.adamglin.phosphoricons.regular.Television/*** The Spotify Connect device list.@@ -96,7 +97,7 @@ fun DevicePicker(contentAlignment = Alignment.Center,) {Icon(- Icons.Filled.Refresh,+ PhosphorIcons.Regular.ArrowClockwise,contentDescription = "Aggiorna",tint = GlassInkDim,modifier = Modifier.size(20.dp),@@ -185,8 +186,8 @@ private fun DeviceRow(device: MainViewModel.SpotifyDevice, onClick: () -> Unit)/** Spotify's device types, as far as they map onto icons worth telling apart. */private fun iconFor(type: String): ImageVector = when (type.lowercase()) {- "computer" -> Icons.Filled.Computer- "smartphone", "tablet" -> Icons.Filled.Smartphone- "tv", "castvideo" -> Icons.Filled.Tv- else -> Icons.Filled.Speaker+ "computer" -> PhosphorIcons.Regular.Desktop+ "smartphone", "tablet" -> PhosphorIcons.Regular.DeviceMobile+ "tv", "castvideo" -> PhosphorIcons.Regular.Television+ else -> PhosphorIcons.Regular.SpeakerHifi}diff --git a/app/src/main/java/dev/emanuele/spot/ui/player/MiniPlayer.kt b/app/src/main/java/dev/emanuele/spot/ui/player/MiniPlayer.ktindex cd0e8d6..cda3b65 100644--- a/app/src/main/java/dev/emanuele/spot/ui/player/MiniPlayer.kt+++ b/app/src/main/java/dev/emanuele/spot/ui/player/MiniPlayer.kt@@ -21,10 +21,6 @@ import androidx.compose.foundation.layout.paddingimport androidx.compose.foundation.layout.sizeimport androidx.compose.foundation.shape.CircleShapeimport androidx.compose.foundation.shape.RoundedCornerShape-import androidx.compose.material.icons.Icons-import androidx.compose.material.icons.filled.Pause-import androidx.compose.material.icons.filled.PlayArrow-import androidx.compose.material.icons.filled.SkipNextimport androidx.compose.material3.Iconimport androidx.compose.material3.IconButtonimport androidx.compose.material3.LinearProgressIndicator@@ -41,6 +37,11 @@ import com.kyant.backdrop.Backdropimport dev.emanuele.spot.ui.components.Artworkimport dev.emanuele.spot.ui.glass.LiquidButtonimport dev.emanuele.spot.ui.theme.softShadow+import com.adamglin.PhosphorIcons+import com.adamglin.phosphoricons.Fill+import com.adamglin.phosphoricons.fill.Pause+import com.adamglin.phosphoricons.fill.Play+import com.adamglin.phosphoricons.fill.SkipForward/** Persistent bar above the bottom edge; tapping it opens the full player. *//**@@ -195,7 +196,7 @@ fun MiniPlayer(IconButton(onClick = onNext, enabled = state.hasNext) {Icon(- Icons.Filled.SkipNext,+ PhosphorIcons.Fill.SkipForward,contentDescription = "Successivo",tint = MiniPlayerInkDim,)@@ -218,7 +219,7 @@ fun MiniPlayer(label = "playPause",) { playing ->Icon(- imageVector = if (playing) Icons.Filled.Pause else Icons.Filled.PlayArrow,+ imageVector = if (playing) PhosphorIcons.Fill.Pause else PhosphorIcons.Fill.Play,contentDescription = if (playing) "Pausa" else "Riproduci",tint = MiniPlayerInk,modifier = Modifier.size(20.dp),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.ktindex 2b13695..6469ca6 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@@ -18,12 +18,6 @@ import androidx.compose.foundation.layout.sizeimport androidx.compose.foundation.rememberScrollStateimport androidx.compose.foundation.shape.RoundedCornerShapeimport androidx.compose.foundation.verticalScroll-import androidx.compose.material.icons.Icons-import androidx.compose.material.icons.filled.Add-import androidx.compose.material.icons.filled.Album-import androidx.compose.material.icons.filled.Close-import androidx.compose.material.icons.filled.Lyrics-import androidx.compose.material.icons.filled.Tuneimport androidx.compose.material3.AlertDialogimport androidx.compose.material3.Iconimport androidx.compose.material3.MaterialTheme@@ -51,6 +45,13 @@ import dev.emanuele.spot.ui.glass.LiquidBottomTabsimport dev.emanuele.spot.ui.glass.LiquidSliderimport kotlin.math.lnimport kotlin.math.roundToInt+import com.adamglin.PhosphorIcons+import com.adamglin.phosphoricons.Regular+import com.adamglin.phosphoricons.regular.Plus+import com.adamglin.phosphoricons.regular.SlidersHorizontal+import com.adamglin.phosphoricons.regular.TextAlignLeft+import com.adamglin.phosphoricons.regular.VinylRecord+import com.adamglin.phosphoricons.regular.X/** Which panel is open below the transport controls. */enum class PlayerPanel { NONE, QUEUE, LYRICS, EFFECTS }@@ -112,11 +113,11 @@ fun PlayerPanelSection(.fillMaxWidth(0.72f).padding(top = 14.dp),) {- PanelTab(Icons.Filled.Album, "Copertina", selected == 0) { onSelect(PlayerPanel.NONE) }- PanelTab(Icons.Filled.Lyrics, "Testo", selected == 1) {+ PanelTab(PhosphorIcons.Regular.VinylRecord, "Copertina", selected == 0) { onSelect(PlayerPanel.NONE) }+ PanelTab(PhosphorIcons.Regular.TextAlignLeft, "Testo", selected == 1) {onSelect(PlayerPanel.LYRICS)}- PanelTab(Icons.Filled.Tune, "Effetti", selected == 2) {+ PanelTab(PhosphorIcons.Regular.SlidersHorizontal, "Effetti", selected == 2) {onSelect(PlayerPanel.EFFECTS)}}@@ -323,7 +324,7 @@ private fun PresetRow()if (selected && !preset.builtIn) {Icon(- Icons.Filled.Close,+ PhosphorIcons.Regular.X,contentDescription = "Elimina ${preset.name}",tint = MaterialTheme.colorScheme.onPrimary,modifier = Modifier@@ -344,7 +345,7 @@ private fun PresetRow(verticalAlignment = Alignment.CenterVertically,) {Icon(- Icons.Filled.Add,+ PhosphorIcons.Regular.Plus,contentDescription = null,tint = MaterialTheme.colorScheme.primary,modifier = Modifier.size(16.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.ktindex 8797f1b..d47f2bf 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@@ -31,20 +31,6 @@ import androidx.compose.foundation.layout.sizeimport androidx.compose.foundation.layout.systemBarsPaddingimport androidx.compose.foundation.shape.CircleShapeimport androidx.compose.foundation.shape.RoundedCornerShape-import androidx.compose.material.icons.Icons-import androidx.compose.material.icons.filled.Devices-import androidx.compose.material.icons.filled.KeyboardArrowDown-import androidx.compose.material.icons.filled.MoreHoriz-import androidx.compose.material.icons.filled.Pause-import androidx.compose.material.icons.filled.PlayArrow-import androidx.compose.material.icons.automirrored.filled.QueueMusic-import androidx.compose.material.icons.filled.Repeat-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.FavoriteBorderimport androidx.compose.material3.Iconimport androidx.compose.material3.IconButtonimport androidx.compose.material3.LocalContentColor@@ -80,6 +66,21 @@ import dev.emanuele.spot.ui.components.Artworkimport dev.emanuele.spot.ui.glass.LiquidButtonimport dev.emanuele.spot.ui.library.formatDurationimport dev.emanuele.spot.ui.theme.softShadow+import com.adamglin.PhosphorIcons+import com.adamglin.phosphoricons.Fill+import com.adamglin.phosphoricons.Regular+import com.adamglin.phosphoricons.fill.Heart+import com.adamglin.phosphoricons.fill.Pause+import com.adamglin.phosphoricons.fill.Play+import com.adamglin.phosphoricons.fill.SkipBack+import com.adamglin.phosphoricons.fill.SkipForward+import com.adamglin.phosphoricons.regular.CaretDown+import com.adamglin.phosphoricons.regular.Devices+import com.adamglin.phosphoricons.regular.Heart+import com.adamglin.phosphoricons.regular.Queue+import com.adamglin.phosphoricons.regular.Repeat+import com.adamglin.phosphoricons.regular.RepeatOnce+import com.adamglin.phosphoricons.regular.Shuffle/*** The player, as a liquid-glass prototype.@@ -367,7 +368,7 @@ fun PlayerScreen(},) {Icon(- Icons.AutoMirrored.Filled.QueueMusic,+ PhosphorIcons.Regular.Queue,contentDescription = "Coda",tint = if (panel == PlayerPanel.QUEUE) {MaterialTheme.colorScheme.primary@@ -389,9 +390,9 @@ fun PlayerScreen() {Icon(if (liked == true) {- Icons.Filled.Favorite+ PhosphorIcons.Fill.Heart} else {- Icons.Outlined.FavoriteBorder+ PhosphorIcons.Regular.Heart},contentDescription = if (liked == true) {"Togli dai brani salvati"@@ -490,7 +491,7 @@ private fun TopBar(verticalAlignment = Alignment.CenterVertically,) {GlassButton(backdrop, onClick = onCollapse) {- Icon(Icons.Filled.KeyboardArrowDown, contentDescription = "Chiudi")+ Icon(PhosphorIcons.Regular.CaretDown, contentDescription = "Chiudi")}Text("In riproduzione",@@ -503,7 +504,7 @@ private fun TopBar(// the player is open, and the queue already has its own tab below.GlassButton(backdrop, onClick = onOpenDevices) {Icon(- Icons.Filled.Devices,+ PhosphorIcons.Regular.Devices,contentDescription = "Dispositivi",tint = GlassInk,)@@ -649,7 +650,7 @@ private fun Controls(horizontalArrangement = Arrangement.SpaceEvenly,) {ToggleIcon(- icon = Icons.Filled.Shuffle,+ icon = PhosphorIcons.Regular.Shuffle,description = "Riproduzione casuale",active = state.shuffleEnabled,onClick = onToggleShuffle,@@ -666,7 +667,7 @@ private fun Controls(onClick = onPrevious,) {Icon(- Icons.Filled.SkipPrevious,+ PhosphorIcons.Fill.SkipBack,contentDescription = "Precedente",modifier = Modifier.size(30.dp),)@@ -679,7 +680,7 @@ private fun Controls(label = "playPause",) { playing ->Icon(- imageVector = if (playing) Icons.Filled.Pause else Icons.Filled.PlayArrow,+ imageVector = if (playing) PhosphorIcons.Fill.Pause else PhosphorIcons.Fill.Play,contentDescription = if (playing) "Pausa" else "Riproduci",modifier = Modifier.size(34.dp),)@@ -693,7 +694,7 @@ private fun Controls(onClick = onNext,) {Icon(- Icons.Filled.SkipNext,+ PhosphorIcons.Fill.SkipForward,contentDescription = "Successivo",modifier = Modifier.size(30.dp),)@@ -701,9 +702,9 @@ private fun Controls(ToggleIcon(icon = if (state.repeatMode == Player.REPEAT_MODE_ONE) {- Icons.Filled.RepeatOne+ PhosphorIcons.Regular.RepeatOnce} else {- Icons.Filled.Repeat+ PhosphorIcons.Regular.Repeat},description = "Ripeti",active = state.repeatMode != Player.REPEAT_MODE_OFF,diff --git a/app/src/main/java/dev/emanuele/spot/ui/search/SearchScreen.kt b/app/src/main/java/dev/emanuele/spot/ui/search/SearchScreen.ktindex 14b5468..375f573 100644--- a/app/src/main/java/dev/emanuele/spot/ui/search/SearchScreen.kt+++ b/app/src/main/java/dev/emanuele/spot/ui/search/SearchScreen.kt@@ -14,9 +14,6 @@ import androidx.compose.foundation.lazy.LazyColumnimport androidx.compose.foundation.lazy.LazyListScopeimport androidx.compose.foundation.lazy.itemsimport androidx.compose.foundation.shape.RoundedCornerShape-import androidx.compose.material.icons.Icons-import androidx.compose.material.icons.filled.Close-import androidx.compose.material.icons.filled.Searchimport androidx.compose.material3.CircularProgressIndicatorimport androidx.compose.material3.Iconimport androidx.compose.material3.IconButton@@ -39,6 +36,11 @@ import dev.emanuele.spot.ui.components.Artworkimport com.kyant.backdrop.Backdropimport dev.emanuele.spot.ui.components.SwipeToQueueimport dev.emanuele.spot.ui.glass.LiquidButton+import com.adamglin.PhosphorIcons+import com.adamglin.phosphoricons.Fill+import com.adamglin.phosphoricons.Regular+import com.adamglin.phosphoricons.fill.MagnifyingGlass+import com.adamglin.phosphoricons.regular.X/*** Search across tracks, artists, albums and playlists.@@ -71,11 +73,11 @@ fun SearchScreen(onValueChange = onQueryChange,placeholder = { Text("Brani, artisti, album, playlist") },singleLine = true,- leadingIcon = { Icon(Icons.Filled.Search, contentDescription = null) },+ leadingIcon = { Icon(PhosphorIcons.Fill.MagnifyingGlass, contentDescription = null) },trailingIcon = {if (state.query.isNotEmpty()) {IconButton(onClick = { onQueryChange("") }) {- Icon(Icons.Filled.Close, contentDescription = "Cancella")+ Icon(PhosphorIcons.Regular.X, contentDescription = "Cancella")}}},diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.tomlindex a5ed921..794c66b 100644--- a/gradle/libs.versions.toml+++ b/gradle/libs.versions.toml@@ -48,6 +48,10 @@ androidx-navigation-compose = { module = "androidx.navigation:navigation-composebackdrop = { module = "io.github.kyant0:backdrop", version = "2.0.0" }# Capsule and friends, used by the vendored Liquid* components.kyant-shapes = { module = "io.github.kyant0:shapes", version = "1.2.0" }+# Phosphor (MIT). Apple's SF Symbols are licensed for Apple platforms only, so+# they cannot be used here; Phosphor is the closest set that can, and it carries+# the outline/fill pair this UI already relies on for selected states.+phosphor = { module = "com.adamglin:phosphor-icon", version = "1.0.0" }[plugins]android-application = { id = "com.android.application", version.ref = "agp" }