From 94adbab65e4b52dd2dd87d87bfcba5e94d1e20b4 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Mon, 3 Jul 2023 15:51:53 +0200 Subject: [PATCH] Fix FAB animation. When using fadeIn and fadeOut, the shadow is not animated properly. --- .../android/features/messages/impl/timeline/TimelineView.kt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineView.kt index 895125186d..37ab178ac0 100644 --- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineView.kt +++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineView.kt @@ -21,8 +21,6 @@ package io.element.android.features.messages.impl.timeline import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.ExperimentalAnimationApi import androidx.compose.animation.animateContentSize -import androidx.compose.animation.fadeIn -import androidx.compose.animation.fadeOut import androidx.compose.animation.scaleIn import androidx.compose.animation.scaleOut import androidx.compose.foundation.layout.Box @@ -266,8 +264,8 @@ internal fun BoxScope.TimelineScrollHelper( .align(Alignment.BottomEnd) .padding(end = 24.dp, bottom = 12.dp), visible = showScrollToBottomButton || LocalInspectionMode.current, - enter = scaleIn() + fadeIn(), - exit = scaleOut() + fadeOut(), + enter = scaleIn(), + exit = scaleOut(), ) { FloatingActionButton( onClick = {