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.

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

Home Screen Animations #131

Merged
merged 9 commits into from
Mar 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
75 changes: 44 additions & 31 deletions app/src/main/java/com/imashnake/animite/features/home/HomeScreen.kt
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
package com.imashnake.animite.features.home

import androidx.compose.animation.AnimatedVisibility
import androidx.compose.animation.animateColorAsState
import androidx.compose.animation.core.Spring
import androidx.compose.animation.core.animateDpAsState
import androidx.compose.animation.core.spring
import androidx.compose.animation.core.tween
import androidx.compose.animation.expandVertically
import androidx.compose.animation.fadeIn
import androidx.compose.animation.fadeOut
import androidx.compose.animation.shrinkVertically
import androidx.compose.foundation.Image
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Arrangement
Expand Down Expand Up @@ -42,6 +51,7 @@ import androidx.compose.ui.res.dimensionResource
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.res.vectorResource
import androidx.compose.ui.unit.IntOffset
import androidx.compose.ui.unit.dp
import androidx.compose.ui.util.fastForEach
import androidx.hilt.navigation.compose.hiltViewModel
Expand Down Expand Up @@ -174,9 +184,9 @@ fun HomeScreen(
}
},
contentModifier = Modifier.padding(
top = LocalPaddings.current.large,
bottom = dimensionResource(coreR.dimen.navigation_bar_height)
)
),
verticalArrangement = Arrangement.Top
)
}
}
Expand All @@ -202,9 +212,14 @@ fun HomeRow(
onItemClicked: (Media.Medium) -> Unit,
modifier: Modifier = Modifier
) {
if (list.isNotEmpty()) {
AnimatedVisibility(
visible = list.isNotEmpty(),
enter = fadeIn() + expandVertically(),
exit = fadeOut(spring(stiffness = Spring.StiffnessHigh)) + shrinkVertically(),
label = "animate_media_list_enter_exit"
) {
Column(
modifier = modifier,
modifier = modifier.padding(top = LocalPaddings.current.large),
verticalArrangement = Arrangement.spacedBy(LocalPaddings.current.medium)
) {
Text(
Expand All @@ -215,17 +230,14 @@ fun HomeRow(
.landscapeCutoutPadding()
)

MediaSmallRow(
mediaList = list,
content = { media ->
MediaSmall(
image = media.coverImage,
label = media.title,
onClick = { onItemClicked(media) },
modifier = Modifier.width(dimensionResource(R.dimen.media_card_width))
)
}
)
MediaSmallRow(list) { media ->
MediaSmall(
image = media.coverImage,
label = media.title,
onClick = { onItemClicked(media) },
modifier = Modifier.width(dimensionResource(R.dimen.media_card_width))
)
}
}
}
}
Expand All @@ -244,17 +256,16 @@ private fun MediaTypeSelector(
shape = CircleShape
)
) {
// Indicator
val offset by animateDpAsState(
targetValue = if (selectedOption.value == MediaType.ANIME) 0.dp else 40.dp,
label = "media_switch"
)

Surface(
modifier = Modifier
.padding(dimensionResource(R.dimen.media_type_selector_padding))
.size(dimensionResource(R.dimen.media_type_choice_size))
.offset(
animateDpAsState(
targetValue = if (selectedOption.value == MediaType.ANIME) 0.dp else 40.dp,
label = "media_switch"
).value
),
.offset { IntOffset(x = offset.roundToPx(), y = 0) },
shape = CircleShape,
color = MaterialTheme.colorScheme.background
) { }
Expand All @@ -278,17 +289,19 @@ private fun MediaTypeSelector(
modifier = Modifier.requiredWidth(dimensionResource(R.dimen.media_type_choice_size))
) {
Icon(
imageVector = if (mediaType == MediaType.ANIME) {
Icons.Rounded.PlayArrow
} else {
ImageVector.vectorResource(id = R.drawable.manga)
imageVector = when (mediaType) {
MediaType.ANIME -> Icons.Rounded.PlayArrow
else -> ImageVector.vectorResource(id = R.drawable.manga)
},
contentDescription = mediaType.name,
tint = if (selectedOption.value == mediaType) {
MaterialTheme.colorScheme.primary
} else {
MaterialTheme.colorScheme.background
}
tint = animateColorAsState(
targetValue = when(selectedOption.value) {
mediaType -> MaterialTheme.colorScheme.primary
else -> MaterialTheme.colorScheme.background
},
animationSpec = tween(400),
label = "icon_color"
).value
)
}
}
Expand Down
40 changes: 28 additions & 12 deletions app/src/main/java/com/imashnake/animite/features/ui/MediaSmall.kt
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
package com.imashnake.animite.features.ui

import android.content.res.Configuration
import androidx.compose.animation.AnimatedContent
import androidx.compose.animation.core.tween
import androidx.compose.animation.fadeIn
import androidx.compose.animation.fadeOut
import androidx.compose.animation.togetherWith
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.PaddingValues
Expand Down Expand Up @@ -45,21 +50,32 @@ import com.imashnake.animite.core.ui.LocalPaddings
@Composable
fun <T> MediaSmallRow(
mediaList: List<T>,
modifier: Modifier = Modifier,
content: @Composable (T) -> Unit
) {
LazyRow(
horizontalArrangement = Arrangement.spacedBy(LocalPaddings.current.small),
contentPadding = PaddingValues(
start = LocalPaddings.current.large + if (
LocalConfiguration.current.orientation == Configuration.ORIENTATION_LANDSCAPE
) {
WindowInsets.displayCutout.asPaddingValues().calculateLeftPadding(LayoutDirection.Ltr)
} else 0.dp,
end = LocalPaddings.current.large
)
AnimatedContent(
targetState = mediaList,
transitionSpec = {
fadeIn(tween(500)).togetherWith(fadeOut(tween(500)))
},
label = "animate_media_list_content"
) {
items(mediaList) { media ->
content(media)
LazyRow(
horizontalArrangement = Arrangement.spacedBy(LocalPaddings.current.small),
contentPadding = PaddingValues(
start = LocalPaddings.current.large + if (
LocalConfiguration.current.orientation == Configuration.ORIENTATION_LANDSCAPE
) {
WindowInsets.displayCutout.asPaddingValues()
.calculateLeftPadding(LayoutDirection.Ltr)
} else 0.dp,
end = LocalPaddings.current.large
),
modifier = modifier
) {
items(it) { media ->
content(media)
}
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.ColumnScope
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
Expand Down Expand Up @@ -32,13 +33,14 @@ import com.imashnake.animite.core.ui.LocalPaddings
@Composable
fun BannerLayout(
banner: @Composable (Modifier) -> Unit,
content: @Composable () -> Unit,
content: @Composable ColumnScope.() -> Unit,
modifier: Modifier = Modifier,
bannerHeight: Dp = dimensionResource(R.dimen.banner_height),
bannerModifier: Modifier = Modifier
.height(bannerHeight)
.fillMaxWidth(),
contentModifier: Modifier = Modifier,
verticalArrangement: Arrangement.Vertical = Arrangement.spacedBy(LocalPaddings.current.large)
) {
Box(modifier) {
banner(bannerModifier)
Expand All @@ -51,7 +53,7 @@ fun BannerLayout(
.padding(bottom = LocalPaddings.current.large)
.navigationBarsPadding()
.then(contentModifier),
verticalArrangement = Arrangement.spacedBy(LocalPaddings.current.large)
verticalArrangement = verticalArrangement
) { content() }
}
}
Loading