diff --git a/app/src/main/java/com/tangem/tap/features/home/compose/StoriesAnimation.kt b/app/src/main/java/com/tangem/tap/features/home/compose/StoriesAnimation.kt index 76ef1a643e..5265c91db4 100644 --- a/app/src/main/java/com/tangem/tap/features/home/compose/StoriesAnimation.kt +++ b/app/src/main/java/com/tangem/tap/features/home/compose/StoriesAnimation.kt @@ -96,6 +96,8 @@ fun StoriesTextAnimation( @Composable fun StoriesBottomImageAnimation( initialScale: Float = 2.5f, + secondStageScale: Float = SCALE_SWITCH_BARRIER, + targetScale: Float = 1.0f, firstStepDuration: Int, totalDuration: Int, content: @Composable (Modifier) -> Unit, @@ -117,7 +119,7 @@ fun StoriesBottomImageAnimation( ) }, label = "Appearing scale", - ) { value -> if (value) SCALE_SWITCH_BARRIER else initialScale } + ) { value -> if (value) secondStageScale else initialScale } val secondTransition = updateTransition( targetState = isSecondStepLaunched.value, @@ -131,14 +133,14 @@ fun StoriesBottomImageAnimation( ) }, label = "Outgoing scale", - ) { value -> if (value) 1f else SCALE_SWITCH_BARRIER } + ) { value -> if (value) targetScale else secondStageScale } val fadeIn = firstTransition.animateFloat( transitionSpec = { tween(durationMillis = 400) }, label = "Fade in on start", ) { value -> if (value) 1f else 0f } - if (firstScaleStep.value == SCALE_SWITCH_BARRIER) { + if (firstScaleStep.value == secondStageScale) { isSecondStepLaunched.value = true } diff --git a/app/src/main/java/com/tangem/tap/features/home/compose/content/Content.kt b/app/src/main/java/com/tangem/tap/features/home/compose/content/Content.kt index db1c2d34ee..198f6930da 100644 --- a/app/src/main/java/com/tangem/tap/features/home/compose/content/Content.kt +++ b/app/src/main/java/com/tangem/tap/features/home/compose/content/Content.kt @@ -105,6 +105,9 @@ fun StoriesWalletForEveryone(stepDuration: Int) { SpacerH32() BoxWithGradient { StoriesBottomImageAnimation( + initialScale = 2.6f, + secondStageScale = 1.2f, + targetScale = 1.1f, totalDuration = stepDuration, firstStepDuration = 500, ) { modifier -> @@ -184,8 +187,8 @@ private fun StoriesImage(@DrawableRes drawableResId: Int, modifier: Modifier = M Image( painter = painterResource(id = drawableResId), contentDescription = null, - contentScale = ContentScale.FillWidth, - modifier = modifier.fillMaxWidth(), + contentScale = ContentScale.Inside, + modifier = modifier.fillMaxSize(), ) } diff --git a/app/src/main/java/com/tangem/tap/features/home/compose/content/FirstStoriesContent.kt b/app/src/main/java/com/tangem/tap/features/home/compose/content/FirstStoriesContent.kt index 71f3e52cf3..1577eecad8 100644 --- a/app/src/main/java/com/tangem/tap/features/home/compose/content/FirstStoriesContent.kt +++ b/app/src/main/java/com/tangem/tap/features/home/compose/content/FirstStoriesContent.kt @@ -4,8 +4,8 @@ import androidx.compose.animation.core.Animatable import androidx.compose.animation.core.LinearEasing import androidx.compose.animation.core.tween import androidx.compose.foundation.Image -import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.material.Text import androidx.compose.runtime.Composable @@ -54,34 +54,30 @@ fun FirstStoriesContent(isPaused: Boolean, duration: Int) { textAlign = TextAlign.Center, ) - Box { - Column( - modifier = Modifier - .fillMaxWidth(), - horizontalAlignment = Alignment.CenterHorizontally, - ) { - SpacerH(TangemTheme.dimens.spacing94) - StoriesTextAnimation( - slideInDuration = 500, - slideInDelay = 150, - ) { modifier -> - Text( - modifier = modifier - .weight(1f), - text = stringResource(R.string.story_meet_title), - style = style, - color = TangemColorPalette.White, - textAlign = TextAlign.Center, - ) - } - SpacerH(TangemTheme.dimens.spacing46) + Column( + modifier = Modifier + .fillMaxSize(), + horizontalAlignment = Alignment.CenterHorizontally, + ) { + SpacerH(TangemTheme.dimens.spacing94) + StoriesTextAnimation( + slideInDuration = 500, + slideInDelay = 150, + ) { modifier -> + Text( + modifier = modifier, + text = stringResource(R.string.story_meet_title), + style = style, + color = TangemColorPalette.White, + textAlign = TextAlign.Center, + ) } + SpacerH(TangemTheme.dimens.spacing46) Image( modifier = Modifier - .align(Alignment.BottomCenter) .fillMaxWidth(), painter = painterResource(R.drawable.img_meet_tangem), - contentScale = ContentScale.FillWidth, + contentScale = ContentScale.Inside, contentDescription = "Tangem Wallet card", ) }