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
Give the detail screen's glass something to refract
Lelonio656df743bb99
diff --git a/app/.cxx/Debug/286k5v33/arm64-v8a/configure_fingerprint.bin b/app/.cxx/Debug/286k5v33/arm64-v8a/configure_fingerprint.binindex 5e31699..d4e8332 100644--- a/app/.cxx/Debug/286k5v33/arm64-v8a/configure_fingerprint.bin+++ b/app/.cxx/Debug/286k5v33/arm64-v8a/configure_fingerprint.bin@@ -2,27 +2,27 @@ C/C++ Structured Logca_/Users/emanuele/Progetto Spotify/app/.cxx/Debug/286k5v33/arm64-v8a/additional_project_files.txtCA-?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint �����3 ��߈�3`+?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint ��ŋ�3 ��߈�3`^-\/Users/emanuele/Progetto Spotify/app/.cxx/Debug/286k5v33/arm64-v8a/android_gradle_build.json �����3� ��߈�3e+\/Users/emanuele/Progetto Spotify/app/.cxx/Debug/286k5v33/arm64-v8a/android_gradle_build.json ��ŋ�3� ��߈�3ec-a/Users/emanuele/Progetto Spotify/app/.cxx/Debug/286k5v33/arm64-v8a/android_gradle_build_mini.json �����3� ��߈�3R+a/Users/emanuele/Progetto Spotify/app/.cxx/Debug/286k5v33/arm64-v8a/android_gradle_build_mini.json ��ŋ�3� ��߈�3RP-N/Users/emanuele/Progetto Spotify/app/.cxx/Debug/286k5v33/arm64-v8a/build.ninja �����3� ��߈�3V+N/Users/emanuele/Progetto Spotify/app/.cxx/Debug/286k5v33/arm64-v8a/build.ninja ��ŋ�3� ��߈�3VT-R/Users/emanuele/Progetto Spotify/app/.cxx/Debug/286k5v33/arm64-v8a/build.ninja.txt �����3[+R/Users/emanuele/Progetto Spotify/app/.cxx/Debug/286k5v33/arm64-v8a/build.ninja.txt ��ŋ�3[Y-W/Users/emanuele/Progetto Spotify/app/.cxx/Debug/286k5v33/arm64-v8a/build_file_index.txt �����3 @ ��߈�3\+W/Users/emanuele/Progetto Spotify/app/.cxx/Debug/286k5v33/arm64-v8a/build_file_index.txt ��ŋ�3 @ ��߈�3\Z-X/Users/emanuele/Progetto Spotify/app/.cxx/Debug/286k5v33/arm64-v8a/compile_commands.json �����3֚ ��߈�3`+X/Users/emanuele/Progetto Spotify/app/.cxx/Debug/286k5v33/arm64-v8a/compile_commands.json ��ŋ�3֚ ��߈�3`^-\/Users/emanuele/Progetto Spotify/app/.cxx/Debug/286k5v33/arm64-v8a/compile_commands.json.bin �����3 �" ��߈�3f+\/Users/emanuele/Progetto Spotify/app/.cxx/Debug/286k5v33/arm64-v8a/compile_commands.json.bin ��ŋ�3 �" ��߈�3fd-b/Users/emanuele/Progetto Spotify/app/.cxx/Debug/286k5v33/arm64-v8a/metadata_generation_command.txt �����3+b/Users/emanuele/Progetto Spotify/app/.cxx/Debug/286k5v33/arm64-v8a/metadata_generation_command.txt ��ŋ�3� ��߈�3YW-U/Users/emanuele/Progetto Spotify/app/.cxx/Debug/286k5v33/arm64-v8a/prefab_config.json �����3 ( ��߈�3^+U/Users/emanuele/Progetto Spotify/app/.cxx/Debug/286k5v33/arm64-v8a/prefab_config.json ��ŋ�3 ( ��߈�3^\-Z/Users/emanuele/Progetto Spotify/app/.cxx/Debug/286k5v33/arm64-v8a/symbol_folder_index.txt �����3 Y ��߈�3D+Z/Users/emanuele/Progetto Spotify/app/.cxx/Debug/286k5v33/arm64-v8a/symbol_folder_index.txt ��ŋ�3 Y ��߈�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/src/main/java/dev/emanuele/spot/ui/library/PlaylistScreen.kt b/app/src/main/java/dev/emanuele/spot/ui/library/PlaylistScreen.ktindex 1e93301..d85163f 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@@ -204,13 +204,22 @@ fun PlaylistScreen(}}+ val heroPx = with(density) { HERO_HEIGHT.roundToPx() }+ val collapsedPx = with(density) { collapsedHeight.roundToPx() }+Box(Modifier.fillMaxSize()) {- // The page colour, and only the page colour.+ // The page, without the things that sample it.//- // The layer has to hold nothing that samples it. Recording the whole- // screen — content included — put the glass buttons inside the layer- // those same buttons draw from, and the render tree recursed until it- // overflowed the stack. Every one of them lives above this box.+ // The layer must hold nothing that draws from it: recording the whole+ // screen put the glass buttons inside the layer those same buttons read,+ // and the render tree recursed until it overflowed the stack.+ //+ // It cannot hold *only* the page colour either, which is what it did+ // until now. A flat fill refracts to a flat fill, so the buttons came+ // out as plain translucent discs — the glass had nothing to bend. The+ // cover behind them is the thing worth bending, so it lives here, below+ // the layer boundary, and the header above draws only the text and the+ // controls over it.Box(Modifier.fillMaxSize()@@ -229,16 +238,23 @@ fun PlaylistScreen(),).layerBackdrop(pageBackdrop),- )+ ) {+ HeroArt(+ artworkUrl = state.artworkUrl,+ name = state.name,+ pageColor = pageColor,+ heroPx = heroPx,+ collapsedPx = collapsedPx,+ collapse = collapseFraction,+ )+ }Column(Modifier.fillMaxSize()) {DetailHeader(name = state.name,- artworkUrl = state.artworkUrl,kind = state.kind,trackCount = state.tracks.size,totalMs = state.tracks.sumOf { it.durationMs },- pageColor = pageColor,backdrop = pageBackdrop,collapse = collapseFraction,collapsedHeight = collapsedHeight,@@ -459,11 +475,9 @@ private fun IntOffset.leftOf(density: androidx.compose.ui.unit.Density): IntOffs@Composableprivate fun DetailHeader(name: String,- artworkUrl: String?,kind: MainViewModel.DetailKind,trackCount: Int,totalMs: Long,- pageColor: Color,backdrop: Backdrop,/** 0 fully open, 1 collapsed into the bar. A lambda, so reading it costs a* re-layout rather than a recomposition of the header on every frame. */@@ -483,47 +497,10 @@ private fun DetailHeader(Box(Modifier.fillMaxWidth()- // The header genuinely shrinks. Everything inside keeps its full- // size and is clipped by it, which is what makes the cover look like- // it is being rolled up rather than moved off.- .layout { measurable, constraints ->- val height = androidx.compose.ui.util.lerp(heroPx, collapsedPx, collapse())- val placeable = measurable.measure(- constraints.copy(minHeight = heroPx, maxHeight = heroPx),- )- layout(constraints.maxWidth, height) {- // Anchored to the bottom of the picture, so what stays- // visible as it closes is the part the title sits on.- placeable.place(0, height - heroPx)- }- }- .clipToBounds(),+ .heroCollapse(heroPx, collapsedPx, collapse),) {- Artwork(- url = artworkUrl,- title = name,- modifier = Modifier.fillMaxSize(),- corner = 0.dp,- )-- // The bottom stops fade to the page colour itself, not to black. That is- // what makes the cover run into the page instead of ending on an edge:- // the last row of the image and the first row of the background are the- // same colour. Fading to black over a page that is not black just moves- // the seam and adds a dark band.- Box(- Modifier- .fillMaxSize()- .background(- Brush.verticalGradient(- 0f to Color.Black.copy(alpha = 0.35f),- 0.28f to Color.Transparent,- 0.58f to pageColor.copy(alpha = 0.55f),- 0.82f to pageColor.copy(alpha = 0.94f),- 1f to pageColor,- ),- ),- )+ // No cover here: it is drawn below, inside the layer these controls+ // refract. See the note where that layer is recorded.Column(Modifier@@ -655,6 +632,76 @@ private fun DetailHeader(}}+/**+ * The cover at the top of the page, and the fade that ends it.+ *+ * Drawn below the header rather than in it, because the header holds the glass+ * controls and glass cannot sample a layer it is part of. Both use+ * [heroCollapse], so the picture and the title it sits under close together.+ */+@Composable+private fun HeroArt(+ artworkUrl: String?,+ name: String,+ pageColor: Color,+ heroPx: Int,+ collapsedPx: Int,+ collapse: () -> Float,+) {+ Box(+ Modifier+ .fillMaxWidth()+ .heroCollapse(heroPx, collapsedPx, collapse),+ ) {+ Artwork(+ url = artworkUrl,+ title = name,+ modifier = Modifier.fillMaxSize(),+ corner = 0.dp,+ )++ // The bottom stops fade to the page colour itself, not to black. That is+ // what makes the cover run into the page instead of ending on an edge:+ // the last row of the image and the first row of the background are the+ // same colour. Fading to black over a page that is not black just moves+ // the seam and adds a dark band.+ Box(+ Modifier+ .fillMaxSize()+ .background(+ Brush.verticalGradient(+ 0f to Color.Black.copy(alpha = 0.35f),+ 0.28f to Color.Transparent,+ 0.58f to pageColor.copy(alpha = 0.55f),+ 0.82f to pageColor.copy(alpha = 0.94f),+ 1f to pageColor,+ ),+ ),+ )+ }+}++/**+ * The header genuinely shrinks: the content keeps its full size and is clipped+ * by the box around it, which is what makes the cover look like it is being+ * rolled up rather than moved off.+ */+private fun Modifier.heroCollapse(+ heroPx: Int,+ collapsedPx: Int,+ collapse: () -> Float,+): Modifier = layout { measurable, constraints ->+ val height = androidx.compose.ui.util.lerp(heroPx, collapsedPx, collapse())+ val placeable = measurable.measure(+ constraints.copy(minHeight = heroPx, maxHeight = heroPx),+ )+ layout(constraints.maxWidth, height) {+ // Anchored to the bottom of the picture, so what stays visible as it+ // closes is the part the title sits on.+ placeable.place(0, height - heroPx)+ }+}.clipToBounds()+@Composableprivate fun CircleAction(icon: androidx.compose.ui.graphics.vector.ImageVector,