Skip to content

chore: land the seek bar, lyrics, sync, crossfade, downloads and immersive lyrics fixes - #2159

Merged
A-EDev merged 24 commits into
mainfrom
merge/issues-2150-1278
Nov 16, 2026
Merged

A-EDev merged 24 commits into
mainfrom
merge/issues-2150-1278

Conversation

@A-EDev

@A-EDev A-EDev commented Nov 16, 2026 •

Copy link
Copy Markdown
Collaborator

Summary

Twelve changes on their own branches, merged here unchanged so they land with one CI run.

  • Wavy seek bar (fix/wavy-seek-thumb): the played wave is measured from the same centre the M3 slider puts its thumb on, stops before the thumb, and grows in over its first wavelength. Nothing pokes out past the thumb at the start of a song.
  • Lyric lines (fix/lyric-press-box): no press highlight box on lyric lines; tapping still plays from that line.
  • Repeated lines (feat/lyric-repeat-count): the mini player and lock screen line shows ×2, ×3 after consecutive identical lines (LyricsRepeats.kt).
  • Sync OOM (fix/sync-streamed-hash): collection hashes are computed line by line with one MessageDigest instead of joining the whole collection into one string, and only when read. Same hash bytes; golden vectors unchanged.
  • Sync apply (perf/sync-received-key-hash): received collections no longer get a whole-collection hash the server sync never reads.
  • Crossfade split (refactor/crossfade-skip-split): the skip hold moves from MusicCrossfader.kt to CrossfadeSkip.kt, no behaviour change.
  • Preload (perf/music-preload-next): the music session player preloads 10 s of the next song through Media3 PreloadConfiguration, off with Data Saver or the Data saver buffer profile.
  • Skip fade (fix/crossfade-skip-fade-while-loading): if the next song isn't playing 1 s after the hand-off, the old song fades out anyway and the late song comes in with a 400 ms fade. A slow tail no longer jumps the new song to full volume, and tracks without a duration use the player's own.
  • Downloads prompt (fix/downloads-no-all-files-prompt): the first download no longer opens the All files access page; the Settings row stays.
  • Picked folder (feat/downloads-find-in-picked-folder): when the saved download folder lost its access (after a reinstall), Downloads asks to choose it again, and Find earlier downloads also lists that folder through DocumentsContract.
  • Player slots split (refactor/now-playing-slots): slot builders move out of FullMusicPlayerContent.kt into NowPlayingSlotContent.kt, same pixels.
  • Immersive lyrics (feat/immersive-lyrics-in-place): new switch "Lyrics on the cover" in Player Appearance, off by default and shown with the Immersive background. When on, the lyrics button on phones shows the lyrics in the player over the dimmed cover, with a full-screen button for the sheet. When off, the lyrics button opens the sheet as before.

Related issue

Closes #2150
Closes #2148
Closes #2147
Closes #2145
Closes #2076
Closes #1255
Closes #1278

Change type

  • Bug fix
  • Feature
  • Refactor or maintenance
  • Build, packaging, or CI
  • Documentation

Validation

  • ./gradlew :app:assembleGithubDebug on this exact combination
  • ./gradlew :app:testGithubDebugUnitTest on this combination: 6242 tests, 0 failed; also on each branch, 0 failed
  • I ran any additional flavor-specific build or test tasks affected by this change. ktlintCheck and :app:compileFossDebugKotlin on each branch and on this combination; nightly_notes.py --check.
  • I manually tested the affected behavior on an Android device or emulator. Wavy and Squiggly seek bars at the start of a song, holding a lyric line, ×2 in the mini player, lyrics over the Immersive cover (toggle, collapse, frames while collapsed unchanged; tested before the switch was added), five skips with a 5 s fade.

Test device and Android version: Xiaomi 2311DRK48G, Android 16

Screenshots or recordings

Risk and compatibility

No Room schema change, no new permissions, no new dependencies. Sync wire format and record bytes are unchanged. Preload fetches up to 10 s of the next song through the existing data source and music cache.

  • The change does not introduce secrets, private data, or unexpected telemetry.
  • New user-facing text uses Android string resources.
  • Dependency and lockfile changes are intentional and limited to this PR.
  • Room schema changes include the required version bump and migration, or this PR does not change the Room schema.
  • Breaking changes and upgrade steps are clearly documented.

@github-actions github-actions Bot added documentation Improvements or additions to documentation player Video and audio playback ui Compose UI, theming, or Material 3 surfaces sync Device-to-device sync labels Nov 16, 2026
@A-EDev
A-EDev merged commit 83d7941 into main Nov 16, 2026
19 of 21 checks passed
@A-EDev
A-EDev deleted the merge/issues-2150-1278 branch November 16, 2026 13:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

documentation Improvements or additions to documentation player Video and audio playback sync Device-to-device sync ui Compose UI, theming, or Material 3 surfaces

Projects

None yet

1 participant