From 13bcf8b4bdd82c0cb049d9053d05948552b8960c Mon Sep 17 00:00:00 2001 From: MinJae Han Date: Mon, 17 Feb 2025 23:33:55 +0900 Subject: [PATCH 1/5] =?UTF-8?q?[MOD/#199]=20=ED=8C=A8=EB=94=A9=20=EA=B4=80?= =?UTF-8?q?=EB=A6=AC=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/spoony/spoony/presentation/register/RegisterScreen.kt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/src/main/java/com/spoony/spoony/presentation/register/RegisterScreen.kt b/app/src/main/java/com/spoony/spoony/presentation/register/RegisterScreen.kt index f72b0fdf..ed12a8b4 100644 --- a/app/src/main/java/com/spoony/spoony/presentation/register/RegisterScreen.kt +++ b/app/src/main/java/com/spoony/spoony/presentation/register/RegisterScreen.kt @@ -61,14 +61,13 @@ fun RegisterScreen( modifier = modifier .fillMaxSize() .background(SpoonyAndroidTheme.colors.white) - .padding(horizontal = 20.dp) ) { TopLinearProgressBar( currentStep = state.currentStep, totalSteps = 3f, modifier = Modifier .fillMaxWidth() - .padding(top = 56.dp, bottom = 10.dp) + .padding(top = 56.dp, bottom = 10.dp,start = 20.dp, end = 20.dp) ) NavHost( From 2d52cfdc60d84fe71c924ec35c638fcf897f1ed3 Mon Sep 17 00:00:00 2001 From: MinJae Han Date: Mon, 17 Feb 2025 23:34:31 +0900 Subject: [PATCH 2/5] =?UTF-8?q?[MOD/#199]=20=EC=A0=84=EC=B2=B4=20=ED=99=94?= =?UTF-8?q?=EB=A9=B4=20=ED=8C=A8=EB=94=A9=EA=B0=92=20=EB=B3=80=EA=B2=BD=20?= =?UTF-8?q?=EB=B0=8F=20=EB=A9=94=EB=89=B4=20=EC=B6=94=EA=B0=80=20=EB=B2=84?= =?UTF-8?q?=ED=8A=BC=20=EC=95=A0=EB=8B=88=EB=A9=94=EC=9D=B4=EC=85=98=20?= =?UTF-8?q?=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../presentation/register/RegisterStepOneScreen.kt | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/spoony/spoony/presentation/register/RegisterStepOneScreen.kt b/app/src/main/java/com/spoony/spoony/presentation/register/RegisterStepOneScreen.kt index 89091d4f..b07989c0 100644 --- a/app/src/main/java/com/spoony/spoony/presentation/register/RegisterStepOneScreen.kt +++ b/app/src/main/java/com/spoony/spoony/presentation/register/RegisterStepOneScreen.kt @@ -1,5 +1,10 @@ package com.spoony.spoony.presentation.register +import androidx.compose.animation.AnimatedVisibility +import androidx.compose.animation.fadeIn +import androidx.compose.animation.fadeOut +import androidx.compose.animation.slideInVertically +import androidx.compose.animation.slideOutVertically import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column @@ -72,7 +77,7 @@ fun RegisterStepOneScreen( .addFocusCleaner(focusManager) .advancedImePadding() .verticalScroll(rememberScrollState()) - .padding(top = 22.dp, bottom = 17.dp) + .padding(top = 22.dp, bottom = 17.dp, start = 20.dp, end = 20.dp) ) { Text( text = "나의 찐맛집을 등록해볼까요?", @@ -291,8 +296,13 @@ private fun MenuSection( Spacer(modifier = Modifier.height(8.dp)) - if (menuList.size < MAX_MENU_COUNT) { + AnimatedVisibility( + visible = menuList.size < MAX_MENU_COUNT, + enter = slideInVertically(initialOffsetY = { it }) + fadeIn(), + exit = slideOutVertically(targetOffsetY = { it }) + fadeOut() + ) { AddMenuButton(onClick = onMenuAdd) } } } + From cc3717d1de189fed34e69ec8b2b4516a9a3e96b8 Mon Sep 17 00:00:00 2001 From: MinJae Han Date: Mon, 17 Feb 2025 23:34:40 +0900 Subject: [PATCH 3/5] =?UTF-8?q?[MOD/#199]=20=EC=A0=84=EC=B2=B4=20=ED=99=94?= =?UTF-8?q?=EB=A9=B4=20=ED=8C=A8=EB=94=A9=EA=B0=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../spoony/presentation/register/RegisterStepTwoScreen.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/spoony/spoony/presentation/register/RegisterStepTwoScreen.kt b/app/src/main/java/com/spoony/spoony/presentation/register/RegisterStepTwoScreen.kt index 4f4f2b2d..8a601b11 100644 --- a/app/src/main/java/com/spoony/spoony/presentation/register/RegisterStepTwoScreen.kt +++ b/app/src/main/java/com/spoony/spoony/presentation/register/RegisterStepTwoScreen.kt @@ -73,7 +73,7 @@ fun RegisterStepTwoScreen( .fillMaxSize() .addFocusCleaner(focusManager) .verticalScroll(rememberScrollState()) - .padding(top = 22.dp, bottom = 17.dp) + .padding(top = 22.dp, bottom = 17.dp, start = 20.dp, end = 20.dp) ) { Text( text = "거의 다 왔어요!", From 7c7e3e0723d6e63f84c2e8843e6f08aa6aadd181 Mon Sep 17 00:00:00 2001 From: MinJae Han Date: Mon, 17 Feb 2025 23:35:06 +0900 Subject: [PATCH 4/5] =?UTF-8?q?[FEAT/#199]=20RegisterScreen=20=ED=99=94?= =?UTF-8?q?=EB=A9=B4=20=EC=A0=84=ED=99=98=20=EC=95=A0=EB=8B=88=EB=A9=94?= =?UTF-8?q?=EC=9D=B4=EC=85=98=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../register/navigation/RegisterNavigation.kt | 32 +++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/spoony/spoony/presentation/register/navigation/RegisterNavigation.kt b/app/src/main/java/com/spoony/spoony/presentation/register/navigation/RegisterNavigation.kt index 57b2610e..14cb5d8a 100644 --- a/app/src/main/java/com/spoony/spoony/presentation/register/navigation/RegisterNavigation.kt +++ b/app/src/main/java/com/spoony/spoony/presentation/register/navigation/RegisterNavigation.kt @@ -1,5 +1,7 @@ package com.spoony.spoony.presentation.register.navigation +import androidx.compose.animation.AnimatedContentTransitionScope +import androidx.compose.animation.core.tween import androidx.compose.foundation.layout.PaddingValues import androidx.navigation.NavController import androidx.navigation.NavGraphBuilder @@ -39,7 +41,20 @@ fun NavGraphBuilder.registerGraph( viewModel: RegisterViewModel, onResetRegisterState: () -> Unit ) { - composable { + composable( + enterTransition = { + slideIntoContainer( + AnimatedContentTransitionScope.SlideDirection.Right, + animationSpec = tween(500) + ) + }, + exitTransition = { + slideOutOfContainer( + AnimatedContentTransitionScope.SlideDirection.Left, + animationSpec = tween(500) + ) + } + ) { RegisterStepOneScreen( viewModel = viewModel, onNextClick = { @@ -52,7 +67,20 @@ fun NavGraphBuilder.registerGraph( ) } - composable { + composable( + enterTransition = { + slideIntoContainer( + AnimatedContentTransitionScope.SlideDirection.Left, + animationSpec = tween(500) + ) + }, + exitTransition = { + slideOutOfContainer( + AnimatedContentTransitionScope.SlideDirection.Right, + animationSpec = tween(500) + ) + } + ) { RegisterStepTwoScreen( viewModel = viewModel, onStepTwoComplete = { From 91a9504f0b794c30c641ddd3c145a6fc1bba54bd Mon Sep 17 00:00:00 2001 From: MinJae Han Date: Mon, 17 Feb 2025 23:36:13 +0900 Subject: [PATCH 5/5] [MOD/#199] Fix lint error --- .../com/spoony/spoony/presentation/register/RegisterScreen.kt | 2 +- .../spoony/presentation/register/RegisterStepOneScreen.kt | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/app/src/main/java/com/spoony/spoony/presentation/register/RegisterScreen.kt b/app/src/main/java/com/spoony/spoony/presentation/register/RegisterScreen.kt index ed12a8b4..5432ca60 100644 --- a/app/src/main/java/com/spoony/spoony/presentation/register/RegisterScreen.kt +++ b/app/src/main/java/com/spoony/spoony/presentation/register/RegisterScreen.kt @@ -67,7 +67,7 @@ fun RegisterScreen( totalSteps = 3f, modifier = Modifier .fillMaxWidth() - .padding(top = 56.dp, bottom = 10.dp,start = 20.dp, end = 20.dp) + .padding(top = 56.dp, bottom = 10.dp, start = 20.dp, end = 20.dp) ) NavHost( diff --git a/app/src/main/java/com/spoony/spoony/presentation/register/RegisterStepOneScreen.kt b/app/src/main/java/com/spoony/spoony/presentation/register/RegisterStepOneScreen.kt index b07989c0..0efc431e 100644 --- a/app/src/main/java/com/spoony/spoony/presentation/register/RegisterStepOneScreen.kt +++ b/app/src/main/java/com/spoony/spoony/presentation/register/RegisterStepOneScreen.kt @@ -305,4 +305,3 @@ private fun MenuSection( } } } -