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.

Blur the sheet harder than the page; stop reverb on pause

Leloniodf9a638ddbf6
diff --git a/.claude/settings.local.json b/.claude/settings.local.json
index e3f2975..342b0a0 100644
--- a/.claude/settings.local.json
+++ b/.claude/settings.local.json
@@ -119,7 +119,8 @@
"Bash(git commit -q -m 'Menus that refract the page, and a hero that collapses into a bar *)",
"Bash(git commit -q -m 'A hero that actually collapses, and a menu nothing covers *)",
"Bash(git commit -q -m 'Relink playlist tracks to this market; icon-only track menu *)",
- "Bash(git commit -q -m 'A modal track sheet, and reverb that stops with playback *)"
+ "Bash(git commit -q -m 'A modal track sheet, and reverb that stops with playback *)",
+ "Bash(git commit -q -m 'Blur the sheet harder than the page; stop reverb on pause *)"
]
}
}
diff --git a/app/.cxx/RelWithDebInfo/151m4dr6/arm64-v8a/configure_fingerprint.bin b/app/.cxx/RelWithDebInfo/151m4dr6/arm64-v8a/configure_fingerprint.bin
index 13f34a9..0a681c7 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/playback/AudioOutput.kt b/app/src/main/java/dev/emanuele/spot/playback/AudioOutput.kt
index e3a6b94..17867b7 100644
--- a/app/src/main/java/dev/emanuele/spot/playback/AudioOutput.kt
+++ b/app/src/main/java/dev/emanuele/spot/playback/AudioOutput.kt
@@ -249,6 +249,20 @@ class AudioOutput {
* the tail of the last few seconds ringing on after the pause, and every
* system sound afterwards arriving through it.
*/
+ /**
+ * Called by the player on pause and on resume.
+ *
+ * The sink's own [start]/[stop] are not enough: librespot keeps the sink
+ * open across a pause, so nothing here would run and the reverb would sit on
+ * the output mix ringing out and colouring every other sound the phone
+ * makes. This is the pause the *player* knows about.
+ */
+ fun setPlaybackActive(active: Boolean) {
+ synchronized(this) {
+ if (active) applyReverb() else suspendReverb()
+ }
+ }
+
private fun suspendReverb() {
track?.runCatching {
setAuxEffectSendLevel(0f)
diff --git a/app/src/main/java/dev/emanuele/spot/playback/LibrespotPlayer.kt b/app/src/main/java/dev/emanuele/spot/playback/LibrespotPlayer.kt
index 671f0b0..ee61e87 100644
--- a/app/src/main/java/dev/emanuele/spot/playback/LibrespotPlayer.kt
+++ b/app/src/main/java/dev/emanuele/spot/playback/LibrespotPlayer.kt
@@ -45,6 +45,13 @@ class LibrespotPlayer(
*/
private val fadeOutThen: (() -> Unit) -> Unit,
private val fadeIn: () -> Unit,
+ /**
+ * Told when playback starts and stops.
+ *
+ * The output needs this because the reverb sits on the global mix; see
+ * AudioOutput.setPlaybackActive.
+ */
+ private val onPlaybackActive: (Boolean) -> Unit,
) : SimpleBasePlayer(looper), NativeEvents {
/**
@@ -207,9 +214,11 @@ class LibrespotPlayer(
// Refusing focus means something else owns the output — starting
// anyway would talk over it.
if (!focus.requestFocus()) return Futures.immediateVoidFuture()
+ onPlaybackActive(true)
NativeBridge.play()
} else {
NativeBridge.pause()
+ onPlaybackActive(false)
focus.abandonFocus()
}
// Do not update local state here: the engine confirms via onEvent, and
diff --git a/app/src/main/java/dev/emanuele/spot/playback/PlaybackService.kt b/app/src/main/java/dev/emanuele/spot/playback/PlaybackService.kt
index 5b710fe..0dfe58f 100644
--- a/app/src/main/java/dev/emanuele/spot/playback/PlaybackService.kt
+++ b/app/src/main/java/dev/emanuele/spot/playback/PlaybackService.kt
@@ -58,6 +58,7 @@ class PlaybackService : MediaSessionService() {
audioOutput::setSpeedAndPitch,
audioOutput::fadeOutThen,
audioOutput::fadeIn,
+ audioOutput::setPlaybackActive,
)
session = MediaSession.Builder(this, player)
.setCallback(MediaItemsCallback)
diff --git a/app/src/main/java/dev/emanuele/spot/ui/components/TrackSheet.kt b/app/src/main/java/dev/emanuele/spot/ui/components/TrackSheet.kt
index f34d421..ca0543a 100644
--- a/app/src/main/java/dev/emanuele/spot/ui/components/TrackSheet.kt
+++ b/app/src/main/java/dev/emanuele/spot/ui/components/TrackSheet.kt
@@ -97,6 +97,11 @@ fun BoxScope.TrackSheet(
backdrop = backdrop,
shape = shape,
surfaceColor = SheetFilm,
+ // Heavier than the page behind it, on purpose. The panel samples the
+ // *unblurred* layer, so at the usual 8dp the rows underneath came
+ // through sharper inside the sheet than outside it — the one thing
+ // that reads as a mistake rather than as a material.
+ blurRadius = 46.dp,
modifier = Modifier
.padding(horizontal = 28.dp)
.fillMaxWidth()
@@ -182,4 +187,4 @@ fun TrackSheetAction(
}
/** Light: the page behind is already blurred, so this only has to be a surface. */
-private val SheetFilm = Color.White.copy(alpha = 0.13f)
+private val SheetFilm = Color.White.copy(alpha = 0.16f)