Browse Source

Fix FAB animation. When using fadeIn and fadeOut, the shadow is not animated properly.

julioromano/fixTallAndWidePreviews
Benoit Marty 1 year ago
parent
commit
c436c55314
  1. 6
      features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineView.kt

6
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.AnimatedVisibility
import androidx.compose.animation.ExperimentalAnimationApi import androidx.compose.animation.ExperimentalAnimationApi
import androidx.compose.animation.animateContentSize import androidx.compose.animation.animateContentSize
import androidx.compose.animation.fadeIn
import androidx.compose.animation.fadeOut
import androidx.compose.animation.scaleIn import androidx.compose.animation.scaleIn
import androidx.compose.animation.scaleOut import androidx.compose.animation.scaleOut
import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Box
@ -266,8 +264,8 @@ internal fun BoxScope.TimelineScrollHelper(
.align(Alignment.BottomEnd) .align(Alignment.BottomEnd)
.padding(end = 24.dp, bottom = 12.dp), .padding(end = 24.dp, bottom = 12.dp),
visible = showScrollToBottomButton || LocalInspectionMode.current, visible = showScrollToBottomButton || LocalInspectionMode.current,
enter = scaleIn() + fadeIn(), enter = scaleIn(),
exit = scaleOut() + fadeOut(), exit = scaleOut(),
) { ) {
FloatingActionButton( FloatingActionButton(
onClick = { onClick = {

Loading…
Cancel
Save