Skip to content
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

BannerLayout #125

Merged
merged 6 commits into from
Feb 7, 2024
Merged

BannerLayout #125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9f2b379
Created `BannerLayout`
imashnake0 Feb 5, 2024
09d513b
Add top padding
imashnake0 Feb 5, 2024
902ab9a
`MediaDetails` dictates baseline
imashnake0 Feb 5, 2024
d34f6fb
Not squishy animation (bounds)
imashnake0 Feb 5, 2024
2ab2ab0
Documentation and reorder params
imashnake0 Feb 5, 2024
8ce814d
`bannerHeight` is never used
imashnake0 Feb 5, 2024
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
134 changes: 61 additions & 73 deletions app/src/main/java/com/imashnake/animite/features/home/HomeScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
Expand Down Expand Up @@ -61,6 +60,7 @@ import com.ramcosta.composedestinations.annotation.Destination
import com.ramcosta.composedestinations.navigation.DestinationsNavigator
import com.imashnake.animite.R
import com.imashnake.animite.core.ui.LocalPaddings
import com.imashnake.animite.core.ui.layouts.BannerLayout

@Destination
@Composable
Expand All @@ -87,88 +87,72 @@ fun HomeScreen(
when {
rows.all { it.first is Resource.Success } -> {
val scrollState = rememberScrollState()
TranslucentStatusBarLayout(
scrollState = scrollState,
distanceUntilAnimated = dimensionResource(R.dimen.banner_height)
) {
TranslucentStatusBarLayout(scrollState) {
Box(
modifier = Modifier
.verticalScroll(scrollState)
.navigationBarsPadding()
) {
Box {
Image(
painter = painterResource(R.drawable.background),
contentDescription = null,
modifier = Modifier
.fillMaxWidth()
.height(dimensionResource(R.dimen.banner_height))
.bannerParallax(scrollState),
contentScale = ContentScale.Crop,
alignment = Alignment.TopCenter
)
BannerLayout(
banner = { bannerModifier ->
Box {
Image(
painter = painterResource(R.drawable.background),
contentDescription = null,
modifier = bannerModifier.bannerParallax(scrollState),
contentScale = ContentScale.Crop,
alignment = Alignment.TopCenter
)

Box(
modifier = Modifier
.background(
Brush.verticalGradient(
listOf(
Color.Transparent,
MaterialTheme.colorScheme.secondaryContainer.copy(
alpha = 0.5f
Box(
modifier = bannerModifier
.background(
Brush.verticalGradient(
listOf(
Color.Transparent,
MaterialTheme.colorScheme.secondaryContainer.copy(
alpha = 0.5f
)
)
)
)
)
)
.fillMaxWidth()
.height(dimensionResource(R.dimen.banner_height))
) { }
) { }

Row(
modifier = Modifier
.fillMaxWidth()
.align(Alignment.BottomCenter),
horizontalArrangement = Arrangement.SpaceBetween,
verticalAlignment = Alignment.CenterVertically
) {
Text(
text = stringResource(R.string.okaeri),
color = MaterialTheme.colorScheme.onSecondaryContainer,
style = MaterialTheme.typography.displayMedium,
modifier = Modifier
.padding(
start = LocalPaddings.current.large,
bottom = LocalPaddings.current.medium
Row(
modifier = Modifier
.fillMaxWidth()
.align(Alignment.BottomCenter),
horizontalArrangement = Arrangement.SpaceBetween,
verticalAlignment = Alignment.CenterVertically
) {
Text(
text = stringResource(R.string.okaeri),
color = MaterialTheme.colorScheme.onSecondaryContainer,
style = MaterialTheme.typography.displayMedium,
modifier = Modifier
.padding(
start = LocalPaddings.current.large,
bottom = LocalPaddings.current.medium
)
.landscapeCutoutPadding()
.weight(1f, fill = false),
maxLines = 1
)
.landscapeCutoutPadding()
.weight(1f, fill = false),
maxLines = 1
)

MediaTypeSelector(
modifier = Modifier
.padding(
end = LocalPaddings.current.large,
bottom = LocalPaddings.current.medium
MediaTypeSelector(
modifier = Modifier
.padding(
end = LocalPaddings.current.large,
bottom = LocalPaddings.current.medium
)
.landscapeCutoutPadding(),
selectedOption = homeMediaType,
viewModel = viewModel
)
.landscapeCutoutPadding(),
selectedOption = homeMediaType,
viewModel = viewModel
)
}
}

Column {
Spacer(Modifier.size(dimensionResource(R.dimen.banner_height)))

Column(
modifier = Modifier
.background(MaterialTheme.colorScheme.background)
.padding(vertical = LocalPaddings.current.large)
// TODO: Move this one out of Home when we can pass modifiers in.
.padding(bottom = dimensionResource(R.dimen.navigation_bar_height)),
verticalArrangement = Arrangement.spacedBy(LocalPaddings.current.large)
) {
}
}
},
content = {
rows.fastForEach { row ->
HomeRow(
list = row.first.data.orEmpty(),
Expand All @@ -187,8 +171,12 @@ fun HomeScreen(
}
)
}
}
}
},
contentModifier = Modifier.padding(
top = LocalPaddings.current.large,
bottom = dimensionResource(R.dimen.navigation_bar_height)
)
)
}
}
}
Expand Down
Loading
Loading