Atte149/book-story
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

🛠️ Change default FadeTransitionPreservingSpace animation spec

Browse source 
* Changed default animation duration to 300ms
This commit is contained in:
Acclorite 2024-09-21 10:29:13 +03:00
parent f2d8042164
commit d7e5097f6f
4 changed files with 11 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/src/main/java/ua/acclorite/book_story/presentation/screens/about/components/AboutItem.kt
View file

@ -1,5 +1,7 @@
package ua.acclorite.book_story.presentation.screens.about.components package ua.acclorite.book_story.presentation.screens.about.components
import androidx.compose.animation.core.EaseInOut
import androidx.compose.animation.core.tween
import androidx.compose.foundation.clickable import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Row
@ -70,7 +72,10 @@ fun AboutItem(
} }
} }
FadeTransitionPreservingSpace(visible = showLoading) { FadeTransitionPreservingSpace(
visible = showLoading,
animationSpec = tween(150, easing = EaseInOut)
) {
Row { Row {
Spacer(modifier = Modifier.width(18.dp)) Spacer(modifier = Modifier.width(18.dp))
CircularProgressIndicator( CircularProgressIndicator(

16
app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/components/layout/list/BrowseListItem.kt
View file

@ -1,6 +1,5 @@
package ua.acclorite.book_story.presentation.screens.browse.components.layout.list package ua.acclorite.book_story.presentation.screens.browse.components.layout.list
import androidx.compose.animation.core.tween
import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.background import androidx.compose.foundation.background
import androidx.compose.foundation.combinedClickable import androidx.compose.foundation.combinedClickable
@ -65,10 +64,7 @@ fun BrowseListItem(
!file.isDirectory -> { !file.isDirectory -> {
BrowseListFileItem(file = file) BrowseListFileItem(file = file)
FadeTransitionPreservingSpace( FadeTransitionPreservingSpace(visible = hasSelectedFiles) {
visible = hasSelectedFiles,
animationSpec = tween(300)
) {
Row(verticalAlignment = Alignment.CenterVertically) { Row(verticalAlignment = Alignment.CenterVertically) {
Spacer(modifier = Modifier.width(16.dp)) Spacer(modifier = Modifier.width(16.dp))
@ -90,20 +86,14 @@ fun BrowseListItem(
Spacer(modifier = Modifier.width(16.dp)) Spacer(modifier = Modifier.width(16.dp))
Box(contentAlignment = Alignment.Center) { Box(contentAlignment = Alignment.Center) {
FadeTransitionPreservingSpace( FadeTransitionPreservingSpace(hasSelectedFiles) {
hasSelectedFiles,
animationSpec = tween(300)
) {
CustomCheckbox( CustomCheckbox(
selected = file.isSelected, selected = file.isSelected,
containerColor = MaterialTheme.colorScheme.surface, containerColor = MaterialTheme.colorScheme.surface,
size = 18.dp size = 18.dp
) )
} }
FadeTransitionPreservingSpace( FadeTransitionPreservingSpace(!hasSelectedFiles) {
!hasSelectedFiles,
animationSpec = tween(300)
) {
Icon( Icon(
imageVector = if (file.isFavorite) Icons.Default.Favorite imageVector = if (file.isFavorite) Icons.Default.Favorite
else Icons.Default.FavoriteBorder, else Icons.Default.FavoriteBorder,

3
app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/appearance/components/settings/ColorPresetSetting.kt
View file

@ -2,7 +2,6 @@ package ua.acclorite.book_story.presentation.screens.settings.nested.appearance.
import android.content.Context import android.content.Context
import androidx.compose.animation.animateColorAsState import androidx.compose.animation.animateColorAsState
import androidx.compose.animation.core.tween
import androidx.compose.animation.expandHorizontally import androidx.compose.animation.expandHorizontally
import androidx.compose.animation.fadeIn import androidx.compose.animation.fadeIn
import androidx.compose.animation.fadeOut import androidx.compose.animation.fadeOut
@ -437,7 +436,7 @@ private fun ColorPresetSettingConfigurationItem(
Spacer(modifier = Modifier.width(12.dp)) Spacer(modifier = Modifier.width(12.dp))
FadeTransitionPreservingSpace(visible = canDelete, animationSpec = tween(300)) { FadeTransitionPreservingSpace(visible = canDelete) {
CustomIconButton( CustomIconButton(
modifier = Modifier.size(24.dp), modifier = Modifier.size(24.dp),
icon = Icons.Default.DeleteOutline, icon = Icons.Default.DeleteOutline,

2
app/src/main/java/ua/acclorite/book_story/presentation/ui/Transitions.kt
View file

@ -101,7 +101,7 @@ fun ExpandingTransition(
fun FadeTransitionPreservingSpace( fun FadeTransitionPreservingSpace(
visible: Boolean, visible: Boolean,
modifier: Modifier = Modifier, modifier: Modifier = Modifier,
animationSpec: AnimationSpec<Float> = tween(durationMillis = 150, easing = EaseInOut), animationSpec: AnimationSpec<Float> = tween(durationMillis = 300, easing = EaseInOut),
content: @Composable () -> Unit content: @Composable () -> Unit
) { ) {
val alpha by animateFloatAsState( val alpha by animateFloatAsState(