Skip to content

Feature/apple music artwork #2467

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
HrishikeshBhandarkar wants to merge 11 commits into
base: dev
Choose a base branch
from
Open

Feature/apple music artwork #2467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
786ca75
feat(core): update core submodule with Apple Music artwork support
HrishikeshBhandarkar Sep 6, 2026
ad2ee60
feat(player): add Apple Music artwork state and loader in SharedViewM…
HrishikeshBhandarkar Sep 6, 2026
167741a
feat(player): support motion video and squircle artwork in Apple Musi…
HrishikeshBhandarkar Sep 6, 2026
3ee306b
feat(album): add Apple Music motion cover and high-res artwork to Alb…
HrishikeshBhandarkar Sep 6, 2026
bdc643e
feat(extension): add toHighQualityArtworkUrl for high resolution albu…
HrishikeshBhandarkar Sep 6, 2026
6c17750
fix(album): preserve static Apple Music artwork and force high qualit…
HrishikeshBhandarkar Sep 6, 2026
8c42686
feat(player): prioritize Apple Music live artwork over Spotify Canvas…
HrishikeshBhandarkar Sep 6, 2026
d732e89
feat(core): update core with 1080p live artwork playback
HrishikeshBhandarkar Sep 6, 2026
dbb1c52
refactor: remove toHighQualityArtworkUrl helper
HrishikeshBhandarkar Sep 6, 2026
6f53806
fix(player): increase Apple Music artwork timeout to 8s and enable ad…
HrishikeshBhandarkar Sep 6, 2026
99949d8
fix(player): initialize cache fields before ViewModel init to avoid NPE
HrishikeshBhandarkar Sep 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
163 changes: 105 additions & 58 deletions composeApp/src/commonMain/kotlin/com/maxrave/simpmusic/ui/screen/other/AlbumScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,11 +201,17 @@ fun AlbumScreen(
mutableStateOf<String?>(null)
}

LaunchedEffect(bitmap) {
val hasAmMotion = uiState.amArtworkData?.hasMotion == true && uiState.amArtworkData?.bestMotionUrl != null
val currentArtworkUrl = uiState.amArtworkData?.staticArtworkUrl ?: uiState.thumbnail
var resolvedArtworkUrl by remember(currentArtworkUrl) {
mutableStateOf(currentArtworkUrl)
}

LaunchedEffect(bitmap, resolvedArtworkUrl) {
val bm = bitmap
if (bm != null && paletteGeneratedFor != uiState.thumbnail) {
if (bm != null && paletteGeneratedFor != resolvedArtworkUrl) {
paletteState.generate(bm)
paletteGeneratedFor = uiState.thumbnail
paletteGeneratedFor = resolvedArtworkUrl
}
}

Expand Down Expand Up @@ -255,50 +261,72 @@ fun AlbumScreen(
horizontalAlignment = Alignment.Start,
) {
if (isPortrait) {
// Apple Music-style: edge-to-edge artwork (taller than square,
// ~half screen height) with title overlay + liquid glass buttons.
// Glass buttons MUST be siblings of the backdrop source (not children)
// to avoid render feedback loop / RuntimeShader crash.
// Apple Music-style: edge-to-edge artwork with title overlay + liquid glass buttons.
// When animated artwork is present, header is sized 10% less than full motion height
// so that the bottom edge of the video is covered and fades into the dominant page background.
val amArtwork = uiState.amArtworkData
val hasAmMotion = amArtwork?.hasMotion == true && amArtwork.bestMotionUrl != null
val motionArtworkHeight = screenInfo.wDP * (4f / 3f)
val headerHeight = if (hasAmMotion) (motionArtworkHeight * 0.90f).dp else (screenInfo.hDP / 2).dp
val artworkHeight = if (hasAmMotion) motionArtworkHeight.dp else (screenInfo.hDP / 2).dp

val artworkBackdrop = rememberBackdrop(Color.Black)
Box(
modifier =
Modifier
.fillMaxWidth()
.height((screenInfo.hDP / 2).dp),
.height(headerHeight),
) {
// Inner Box — backdrop SOURCE (artwork + overlays only, NO glass)
Box(modifier = Modifier.fillMaxSize().layerBackdrop(artworkBackdrop)) {
AsyncImage(
model =
ImageRequest
.Builder(LocalPlatformContext.current)
.data(uiState.thumbnail)
.diskCachePolicy(CachePolicy.ENABLED)
.memoryCachePolicy(CachePolicy.ENABLED)
.diskCacheKey(uiState.thumbnail)
.memoryCacheKey(uiState.thumbnail)
.crossfade(false)
.build(),
placeholder = rememberHolderPainter(),
error = rememberHolderPainter(),
contentDescription = null,
contentScale = ContentScale.Crop,
onSuccess = {
bitmap = it.result.image.toImageBitmap()
},
modifier = Modifier.fillMaxSize(),
)
// Subtle bottom gradient — keeps artwork visible behind
// the title text and blends artwork edge seamlessly into
// the muted palette page background (Apple Music style).
// Spans 70% of the artwork (not a fixed 200dp): the shorter
// the ramp, the steeper the alpha, and a steep ramp is what
// makes the fade read as an edge.
Box(
modifier =
Modifier
.fillMaxWidth()
.height((screenInfo.hDP * 0.35f).dp)
.height(artworkHeight)
.align(Alignment.TopCenter),
) {
AsyncImage(
model =
ImageRequest
.Builder(LocalPlatformContext.current)
.data(resolvedArtworkUrl)
.diskCachePolicy(CachePolicy.ENABLED)
.memoryCachePolicy(CachePolicy.ENABLED)
.diskCacheKey(resolvedArtworkUrl)
.memoryCacheKey(resolvedArtworkUrl)
.crossfade(false)
.build(),
placeholder = rememberHolderPainter(),
error = rememberHolderPainter(),
contentDescription = null,
contentScale = ContentScale.Crop,
onError = {
val fallback = resolvedArtworkUrl?.replace("maxresdefault", "hqdefault")
if (fallback != null && fallback != resolvedArtworkUrl) {
resolvedArtworkUrl = fallback
}
},
onSuccess = {
bitmap = it.result.image.toImageBitmap()
},
modifier = Modifier.fillMaxSize(),
)

if (hasAmMotion) {
com.maxrave.simpmusic.expect.ui.MediaPlayerView(
url = amArtwork!!.bestMotionUrl!!,
cropToBounds = true,
modifier = Modifier.fillMaxSize()
)
}
}
// Bottom gradient — melts artwork edge seamlessly into the dominant palette background
Box(
modifier =
Modifier
.fillMaxWidth()
.height(if (hasAmMotion) (motionArtworkHeight * 0.40f).dp else (screenInfo.hDP * 0.35f).dp)
.align(Alignment.BottomCenter)
.background(artworkScrimBrush(mutedPaletteBg)),
)
Expand Down Expand Up @@ -424,29 +452,48 @@ fun AlbumScreen(
horizontalArrangement = Arrangement.spacedBy(24.dp),
verticalAlignment = Alignment.Top,
) {
AsyncImage(
model =
ImageRequest
.Builder(LocalPlatformContext.current)
.data(uiState.thumbnail)
.diskCachePolicy(CachePolicy.ENABLED)
.memoryCachePolicy(CachePolicy.ENABLED)
.diskCacheKey(uiState.thumbnail)
.memoryCacheKey(uiState.thumbnail)
.crossfade(false)
.build(),
placeholder = rememberHolderPainter(),
error = rememberHolderPainter(),
contentDescription = null,
contentScale = ContentScale.Crop,
onSuccess = {
bitmap = it.result.image.toImageBitmap()
},
modifier =
Modifier
.size(280.dp)
.clip(RoundedCornerShape(8.dp)),
)
Box(
modifier = Modifier
.size(280.dp)
.clip(RoundedCornerShape(8.dp))
) {
AsyncImage(
model =
ImageRequest
.Builder(LocalPlatformContext.current)
.data(resolvedArtworkUrl)
.diskCachePolicy(CachePolicy.ENABLED)
.memoryCachePolicy(CachePolicy.ENABLED)
.diskCacheKey(resolvedArtworkUrl)
.memoryCacheKey(resolvedArtworkUrl)
.crossfade(false)
.build(),
placeholder = rememberHolderPainter(),
error = rememberHolderPainter(),
contentDescription = null,
contentScale = ContentScale.Crop,
onError = {
val fallback = resolvedArtworkUrl?.replace("maxresdefault", "hqdefault")
if (fallback != null && fallback != resolvedArtworkUrl) {
resolvedArtworkUrl = fallback
}
},
onSuccess = {
bitmap = it.result.image.toImageBitmap()
},
modifier = Modifier.fillMaxSize(),
)

val amArtwork = uiState.amArtworkData
val hasAmMotion = amArtwork?.hasMotion == true && amArtwork.bestMotionUrl != null
if (hasAmMotion) {
com.maxrave.simpmusic.expect.ui.MediaPlayerView(
url = amArtwork!!.bestMotionUrl!!,
cropToBounds = true,
modifier = Modifier.fillMaxSize()
)
}
}
Column(
modifier = Modifier.weight(1f),
) {
Expand Down
Loading
Loading