From d7e5097f6ff189640975ff1a6d84bf205ac9f635 Mon Sep 17 00:00:00 2001 From: Acclorite <140836141+Acclorite@users.noreply.github.com> Date: Sat, 21 Sep 2024 10:29:13 +0300 Subject: [PATCH] =?UTF-8?q?=F0=9F=9B=A0=EF=B8=8F=20Change=20default=20Fade?= =?UTF-8?q?TransitionPreservingSpace=20animation=20spec?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Changed default animation duration to 300ms --- .../screens/about/components/AboutItem.kt | 7 ++++++- .../components/layout/list/BrowseListItem.kt | 16 +++------------- .../components/settings/ColorPresetSetting.kt | 3 +-- .../book_story/presentation/ui/Transitions.kt | 2 +- 4 files changed, 11 insertions(+), 17 deletions(-) diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/about/components/AboutItem.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/about/components/AboutItem.kt index 72a843eb..f28db66e 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/about/components/AboutItem.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/about/components/AboutItem.kt @@ -1,5 +1,7 @@ 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.layout.Column import androidx.compose.foundation.layout.Row @@ -70,7 +72,10 @@ fun AboutItem( } } - FadeTransitionPreservingSpace(visible = showLoading) { + FadeTransitionPreservingSpace( + visible = showLoading, + animationSpec = tween(150, easing = EaseInOut) + ) { Row { Spacer(modifier = Modifier.width(18.dp)) CircularProgressIndicator( diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/components/layout/list/BrowseListItem.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/components/layout/list/BrowseListItem.kt index a8facd4f..9c74f7cb 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/components/layout/list/BrowseListItem.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/components/layout/list/BrowseListItem.kt @@ -1,6 +1,5 @@ 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.background import androidx.compose.foundation.combinedClickable @@ -65,10 +64,7 @@ fun BrowseListItem( !file.isDirectory -> { BrowseListFileItem(file = file) - FadeTransitionPreservingSpace( - visible = hasSelectedFiles, - animationSpec = tween(300) - ) { + FadeTransitionPreservingSpace(visible = hasSelectedFiles) { Row(verticalAlignment = Alignment.CenterVertically) { Spacer(modifier = Modifier.width(16.dp)) @@ -90,20 +86,14 @@ fun BrowseListItem( Spacer(modifier = Modifier.width(16.dp)) Box(contentAlignment = Alignment.Center) { - FadeTransitionPreservingSpace( - hasSelectedFiles, - animationSpec = tween(300) - ) { + FadeTransitionPreservingSpace(hasSelectedFiles) { CustomCheckbox( selected = file.isSelected, containerColor = MaterialTheme.colorScheme.surface, size = 18.dp ) } - FadeTransitionPreservingSpace( - !hasSelectedFiles, - animationSpec = tween(300) - ) { + FadeTransitionPreservingSpace(!hasSelectedFiles) { Icon( imageVector = if (file.isFavorite) Icons.Default.Favorite else Icons.Default.FavoriteBorder, diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/appearance/components/settings/ColorPresetSetting.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/appearance/components/settings/ColorPresetSetting.kt index 2e1b47f3..f3ab9608 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/appearance/components/settings/ColorPresetSetting.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/appearance/components/settings/ColorPresetSetting.kt @@ -2,7 +2,6 @@ package ua.acclorite.book_story.presentation.screens.settings.nested.appearance. import android.content.Context import androidx.compose.animation.animateColorAsState -import androidx.compose.animation.core.tween import androidx.compose.animation.expandHorizontally import androidx.compose.animation.fadeIn import androidx.compose.animation.fadeOut @@ -437,7 +436,7 @@ private fun ColorPresetSettingConfigurationItem( Spacer(modifier = Modifier.width(12.dp)) - FadeTransitionPreservingSpace(visible = canDelete, animationSpec = tween(300)) { + FadeTransitionPreservingSpace(visible = canDelete) { CustomIconButton( modifier = Modifier.size(24.dp), icon = Icons.Default.DeleteOutline, diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/ui/Transitions.kt b/app/src/main/java/ua/acclorite/book_story/presentation/ui/Transitions.kt index ef5cea82..9ad63c3b 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/ui/Transitions.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/ui/Transitions.kt @@ -101,7 +101,7 @@ fun ExpandingTransition( fun FadeTransitionPreservingSpace( visible: Boolean, modifier: Modifier = Modifier, - animationSpec: AnimationSpec = tween(durationMillis = 150, easing = EaseInOut), + animationSpec: AnimationSpec = tween(durationMillis = 300, easing = EaseInOut), content: @Composable () -> Unit ) { val alpha by animateFloatAsState(