refactor(media): merge heroContent and content into single content lambda

This commit is contained in:
2026-06-06 11:47:48 +00:00
parent ce907cee0c
commit 4ade70a5de
4 changed files with 12 additions and 20 deletions

View File

@@ -35,7 +35,6 @@ fun MediaDetailScaffold(
contentOverlap: Dp = 24.dp,
contentSpacing: Dp = 16.dp,
topBar: @Composable (scrollBehavior: TopAppBarScrollBehavior) -> Unit = {},
heroContent: @Composable ColumnScope.(Modifier) -> Unit,
content: @Composable ColumnScope.(Modifier) -> Unit
) {
val scheme = MaterialTheme.colorScheme
@@ -88,7 +87,6 @@ fun MediaDetailScaffold(
)
}
if (!isHomeMediaTransitionActive) {
heroContent(Modifier.padding(horizontal = 16.dp))
content(Modifier.padding(horizontal = 16.dp))
}
}

View File

@@ -98,13 +98,11 @@ private fun EpisodeScreenInternal(
scrollBehavior = scrollBehavior
)
},
heroContent = { _modifier ->
EpisodeHeroContent(
episode = episode,
modifier = _modifier
)
}
) { _modifier ->
EpisodeHeroContent(
episode = episode,
modifier = _modifier
)
EpisodeDetails(
episode = episode,
downloadState = downloadState,

View File

@@ -82,13 +82,11 @@ private fun MovieScreenInternal(
scrollBehavior = scrollBehavior
)
},
heroContent = { _modifier ->
MovieHeroContent(
movie = movie,
modifier = _modifier
)
}
) { _modifier ->
MovieHeroContent(
movie = movie,
modifier = _modifier
)
MovieDetails(
movie = movie,
downloadState = downloadState,

View File

@@ -153,13 +153,11 @@ private fun SeriesScreenInternal(
scrollBehavior = scrollBehavior
)
},
heroContent = { _modifier ->
SeriesHeroContent(
series = series,
modifier = _modifier
)
}
) { _modifier ->
SeriesHeroContent(
series = series,
modifier = _modifier
)
if (selectedSeason != null) {
SeriesActionButtons(
nextUpEpisode = nextUpEpisode,