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.

Seat the sheet on the measured tab bar

Lelonio722790683c37
diff --git a/.claude/settings.local.json b/.claude/settings.local.json
index d112ae0..cc44246 100644
--- a/.claude/settings.local.json
+++ b/.claude/settings.local.json
@@ -78,7 +78,8 @@
"Bash(git revert *)",
"Bash(git stash *)",
"Bash(git reset *)",
- "Bash(git -c user.name=Emanuele -c [email protected] commit -qm 'Make the player one surface with the now-playing bar *)"
+ "Bash(git -c user.name=Emanuele -c [email protected] commit -qm 'Make the player one surface with the now-playing bar *)",
+ "Bash(git -c user.name=Emanuele -c [email protected] commit -qm 'Seat the sheet on the measured tab bar *)"
]
}
}
diff --git a/app/.cxx/RelWithDebInfo/151m4dr6/arm64-v8a/configure_fingerprint.bin b/app/.cxx/RelWithDebInfo/151m4dr6/arm64-v8a/configure_fingerprint.bin
index 5d80051..3723d1c 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/ui/SpotApp.kt b/app/src/main/java/dev/emanuele/spot/ui/SpotApp.kt
index fbd2dbb..8d5d35d 100644
--- a/app/src/main/java/dev/emanuele/spot/ui/SpotApp.kt
+++ b/app/src/main/java/dev/emanuele/spot/ui/SpotApp.kt
@@ -44,6 +44,8 @@ import androidx.compose.runtime.rememberUpdatedState
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
+import androidx.compose.ui.layout.onSizeChanged
+import androidx.compose.ui.platform.LocalDensity
import androidx.compose.ui.draw.blur
import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.Brush
@@ -159,6 +161,12 @@ fun SpotApp(
val expand = remember { Animatable(0f) }
val scope = rememberCoroutineScope()
+ // Measured rather than assumed. The constant this replaced was 62dp while
+ // the bar is a 64dp capsule with padding around it and the navigation inset
+ // under that, so the sheet sat about twenty over it.
+ var barHeight by remember { mutableStateOf(BottomBarHeight) }
+ val density = LocalDensity.current
+
// Recorded here rather than at the tap: this fires for auto-advance and for
// controls outside the app too, so the history matches what was actually
// heard instead of only what was tapped.
@@ -218,8 +226,7 @@ fun SpotApp(
// scrolling behind them.
val listPadding = PaddingValues(
top = statusBar,
- bottom = navBar + BottomBarHeight +
- if (playback.hasItem) MiniPlayerHeight else 0.dp,
+ bottom = barHeight + if (playback.hasItem) MiniPlayerHeight else 0.dp,
)
// The screens are recorded into the backdrop layer along with
@@ -347,7 +354,8 @@ fun SpotApp(
// before it covers it: a tab bar under a full-screen
// player still swallows the taps meant for the
// transport.
- .graphicsLayer { alpha = (1f - expand.value * 3f).coerceIn(0f, 1f) },
+ .graphicsLayer { alpha = (1f - expand.value * 3f).coerceIn(0f, 1f) }
+ .onSizeChanged { barHeight = with(density) { it.height.toDp() } },
) {
BottomBar(
route = route,
@@ -360,7 +368,9 @@ fun SpotApp(
if (playback.hasItem) {
NowPlayingSheet(
progress = expand,
- bottomInset = navBar + BottomBarHeight,
+ // The measured bar already carries the navigation
+ // inset; the gap is what keeps the two from touching.
+ bottomInset = barHeight + 6.dp,
collapsedContent = {
MiniPlayer(
state = playback,