mirror of
https://github.com/bbara04/Purefin.git
synced 2026-07-24 03:36:51 +00:00
refactor(media): merge heroContent and content into single content lambda
This commit is contained in:
@@ -35,7 +35,6 @@ fun MediaDetailScaffold(
|
|||||||
contentOverlap: Dp = 24.dp,
|
contentOverlap: Dp = 24.dp,
|
||||||
contentSpacing: Dp = 16.dp,
|
contentSpacing: Dp = 16.dp,
|
||||||
topBar: @Composable (scrollBehavior: TopAppBarScrollBehavior) -> Unit = {},
|
topBar: @Composable (scrollBehavior: TopAppBarScrollBehavior) -> Unit = {},
|
||||||
heroContent: @Composable ColumnScope.(Modifier) -> Unit,
|
|
||||||
content: @Composable ColumnScope.(Modifier) -> Unit
|
content: @Composable ColumnScope.(Modifier) -> Unit
|
||||||
) {
|
) {
|
||||||
val scheme = MaterialTheme.colorScheme
|
val scheme = MaterialTheme.colorScheme
|
||||||
@@ -88,7 +87,6 @@ fun MediaDetailScaffold(
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
if (!isHomeMediaTransitionActive) {
|
if (!isHomeMediaTransitionActive) {
|
||||||
heroContent(Modifier.padding(horizontal = 16.dp))
|
|
||||||
content(Modifier.padding(horizontal = 16.dp))
|
content(Modifier.padding(horizontal = 16.dp))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -98,13 +98,11 @@ private fun EpisodeScreenInternal(
|
|||||||
scrollBehavior = scrollBehavior
|
scrollBehavior = scrollBehavior
|
||||||
)
|
)
|
||||||
},
|
},
|
||||||
heroContent = { _modifier ->
|
|
||||||
EpisodeHeroContent(
|
|
||||||
episode = episode,
|
|
||||||
modifier = _modifier
|
|
||||||
)
|
|
||||||
}
|
|
||||||
) { _modifier ->
|
) { _modifier ->
|
||||||
|
EpisodeHeroContent(
|
||||||
|
episode = episode,
|
||||||
|
modifier = _modifier
|
||||||
|
)
|
||||||
EpisodeDetails(
|
EpisodeDetails(
|
||||||
episode = episode,
|
episode = episode,
|
||||||
downloadState = downloadState,
|
downloadState = downloadState,
|
||||||
|
|||||||
@@ -82,13 +82,11 @@ private fun MovieScreenInternal(
|
|||||||
scrollBehavior = scrollBehavior
|
scrollBehavior = scrollBehavior
|
||||||
)
|
)
|
||||||
},
|
},
|
||||||
heroContent = { _modifier ->
|
|
||||||
MovieHeroContent(
|
|
||||||
movie = movie,
|
|
||||||
modifier = _modifier
|
|
||||||
)
|
|
||||||
}
|
|
||||||
) { _modifier ->
|
) { _modifier ->
|
||||||
|
MovieHeroContent(
|
||||||
|
movie = movie,
|
||||||
|
modifier = _modifier
|
||||||
|
)
|
||||||
MovieDetails(
|
MovieDetails(
|
||||||
movie = movie,
|
movie = movie,
|
||||||
downloadState = downloadState,
|
downloadState = downloadState,
|
||||||
|
|||||||
@@ -153,13 +153,11 @@ private fun SeriesScreenInternal(
|
|||||||
scrollBehavior = scrollBehavior
|
scrollBehavior = scrollBehavior
|
||||||
)
|
)
|
||||||
},
|
},
|
||||||
heroContent = { _modifier ->
|
|
||||||
SeriesHeroContent(
|
|
||||||
series = series,
|
|
||||||
modifier = _modifier
|
|
||||||
)
|
|
||||||
}
|
|
||||||
) { _modifier ->
|
) { _modifier ->
|
||||||
|
SeriesHeroContent(
|
||||||
|
series = series,
|
||||||
|
modifier = _modifier
|
||||||
|
)
|
||||||
if (selectedSeason != null) {
|
if (selectedSeason != null) {
|
||||||
SeriesActionButtons(
|
SeriesActionButtons(
|
||||||
nextUpEpisode = nextUpEpisode,
|
nextUpEpisode = nextUpEpisode,
|
||||||
|
|||||||
Reference in New Issue
Block a user