@@ -39,6 +39,7 @@ import androidx.compose.ui.platform.LocalDensity
3939import androidx.compose.ui.unit.dp
4040import androidx.compose.ui.zIndex
4141import top.yukonga.miuix.kmp.anim.DecelerateEasing
42+ import top.yukonga.miuix.kmp.anim.SinOutEasing
4243import top.yukonga.miuix.kmp.basic.Scaffold
4344import top.yukonga.miuix.kmp.theme.MiuixTheme
4445
@@ -80,14 +81,14 @@ class MiuixPopupUtils {
8081 private var nextZIndex = 1f
8182
8283 private val DialogDimEnter : EnterTransition =
83- fadeIn(animationSpec = tween(300 , easing = DecelerateEasing ( 1.5f ) ))
84+ fadeIn(animationSpec = tween(300 , easing = SinOutEasing ))
8485 private val DialogDimExit : ExitTransition =
85- fadeOut(animationSpec = tween(250 , easing = DecelerateEasing ( 1.5f ) ))
86+ fadeOut(animationSpec = tween(250 , easing = SinOutEasing ))
8687
8788 private val PopupDimEnter : EnterTransition =
88- fadeIn(animationSpec = tween(150 , easing = DecelerateEasing ( 1.5f ) ))
89+ fadeIn(animationSpec = tween(300 , easing = SinOutEasing ))
8990 private val PopupDimExit : ExitTransition =
90- fadeOut(animationSpec = tween(150 , easing = DecelerateEasing ( 1.5f ) ))
91+ fadeOut(animationSpec = tween(150 , easing = SinOutEasing ))
9192
9293 @Composable
9394 private fun rememberDefaultDialogEnterTransition (largeScreen : Boolean ): EnterTransition {
@@ -131,9 +132,10 @@ class MiuixPopupUtils {
131132 private fun rememberDefaultPopupEnterTransition (transformOrigin : () -> TransformOrigin ): EnterTransition {
132133 return remember(transformOrigin()) {
133134 fadeIn(
134- animationSpec = tween(durationMillis = 150 , easing = DecelerateEasing (2f ))
135+ animationSpec = tween(durationMillis = 200 , easing = DecelerateEasing (1.5f ))
135136 ) + scaleIn(
136- animationSpec = spring(dampingRatio = 0.88f , stiffness = 300f , visibilityThreshold = 0.001f ),
137+ initialScale = 0.15f ,
138+ animationSpec = spring(dampingRatio = 0.82f , stiffness = 800f , visibilityThreshold = 0.001f ),
137139 transformOrigin = transformOrigin()
138140 )
139141 }
@@ -143,9 +145,9 @@ class MiuixPopupUtils {
143145 private fun rememberDefaultPopupExitTransition (transformOrigin : () -> TransformOrigin ): ExitTransition {
144146 return remember(transformOrigin()) {
145147 fadeOut(
146- animationSpec = tween(durationMillis = 150 , easing = DecelerateEasing (0.8f ))
148+ animationSpec = tween(durationMillis = 150 , easing = DecelerateEasing (1.5f ))
147149 ) + scaleOut(
148- animationSpec = tween(durationMillis = 150 , easing = DecelerateEasing ( 0.8f ) ),
150+ animationSpec = spring(dampingRatio = 0.82f , stiffness = 800f , visibilityThreshold = 0.001f ),
149151 transformOrigin = transformOrigin()
150152 )
151153 }
0 commit comments