Merge pull request #166 from WithPeace/feat/#165-화면_전환_개선

Feat/#165 화면 전환 개선
WithPeace · Jul 22, 2024 · 4ef1bd0 · 4ef1bd0
2 parents 52bb62f + bd08f8a
commit 4ef1bd0
Show file tree

Hide file tree

Showing 20 changed files with 198 additions and 18 deletions.
diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
@@ -11,8 +11,8 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 5,
-      "versionName": "1.0.0",
+      "versionCode": 9,
+      "versionName": "1.1.1",
       "outputFile": "app-release.apk"
     }
   ],

diff --git a/app/src/main/java/com/withpeace/withpeace/navigation/NavHost.kt b/app/src/main/java/com/withpeace/withpeace/navigation/NavHost.kt
@@ -1,5 +1,7 @@
 package com.withpeace.withpeace.navigation
 
+import androidx.compose.animation.EnterTransition
+import androidx.compose.animation.ExitTransition
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.navigation.NavHostController
@@ -55,6 +57,8 @@ fun WithpeaceNavHost(
         modifier = modifier,
         navController = navController,
         startDestination = startDestination,
+        enterTransition = { EnterTransition.None },
+        exitTransition = { ExitTransition.None },
     ) {
         loginNavGraph(
             onShowSnackBar = { onShowSnackBar(SnackbarState(it)) },

diff --git a/...ery/src/main/java/com/withpeace/withpeace/feature/gallery/navigation/GalleryNavigation.kt b/...ery/src/main/java/com/withpeace/withpeace/feature/gallery/navigation/GalleryNavigation.kt
@@ -1,5 +1,7 @@
 package com.withpeace.withpeace.feature.gallery.navigation
 
+import androidx.compose.animation.AnimatedContentTransitionScope
+import androidx.compose.animation.core.tween
 import androidx.navigation.NavController
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavOptions
@@ -32,6 +34,18 @@ fun NavGraphBuilder.galleryNavGraph(
             navArgument(GALLERY_IMAGE_LIMIT_ARGUMENT) { type = NavType.IntType },
             navArgument(GALLERY_ALREADY_IMAGE_COUNT_ARGUMENT) { type = NavType.IntType },
         ),
+        enterTransition = {
+            slideIntoContainer(
+                AnimatedContentTransitionScope.SlideDirection.Left,
+                animationSpec = tween(500),
+            )
+        },
+        exitTransition = {
+            slideOutOfContainer(
+                AnimatedContentTransitionScope.SlideDirection.Right,
+                animationSpec = tween(500),
+            )
+        },
     ) {
         GalleryRoute(
             onClickBackButton = onClickBackButton,

diff --git a/feature/home/src/main/java/com/withpeace/withpeace/feature/home/navigation/HomeNavigation.kt b/feature/home/src/main/java/com/withpeace/withpeace/feature/home/navigation/HomeNavigation.kt
@@ -1,10 +1,11 @@
 package com.withpeace.withpeace.feature.home.navigation
 
+import androidx.compose.animation.EnterTransition
+import androidx.compose.animation.ExitTransition
 import androidx.navigation.NavController
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavOptions
 import androidx.navigation.compose.composable
-import com.withpeace.withpeace.feature.home.uistate.YouthPolicyUiModel
 import com.withpeace.withpeace.feature.home.HomeRoute
 
 const val HOME_ROUTE = "homeRoute"
@@ -17,7 +18,11 @@ fun NavGraphBuilder.homeNavGraph(
     onShowSnackBar: (message: String) -> Unit,
     onPolicyClick: (String) -> Unit,
 ) {
-    composable(route = HOME_ROUTE) {
+    composable(
+        route = HOME_ROUTE,
+        enterTransition = { EnterTransition.None },
+        exitTransition = { ExitTransition.None },
+    ) {
         HomeRoute(
             onShowSnackBar = onShowSnackBar,
             onPolicyClick = onPolicyClick

diff --git a/...ypage/src/main/java/com/withpeace/withpeace/feature/mypage/navigation/MyPageNavigation.kt b/...ypage/src/main/java/com/withpeace/withpeace/feature/mypage/navigation/MyPageNavigation.kt
@@ -1,5 +1,7 @@
 package com.withpeace.withpeace.feature.mypage.navigation
 
+import androidx.compose.animation.EnterTransition
+import androidx.compose.animation.ExitTransition
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.navigation.NavController
 import androidx.navigation.NavGraphBuilder
@@ -24,7 +26,11 @@ fun NavGraphBuilder.myPageNavGraph(
     onAuthExpired: () -> Unit,
     onDibsOfPolicyClick: () -> Unit,
 ) {
-    composable(route = MY_PAGE_ROUTE) {
+    composable(
+        route = MY_PAGE_ROUTE,
+        enterTransition = { EnterTransition.None },
+        exitTransition = { ExitTransition.None },
+    ) {
         val nickname = it.savedStateHandle.get<String>(MY_PAGE_CHANGED_NICKNAME_ARGUMENT)
         val profile = it.savedStateHandle.get<String>(MY_PAGE_CHANGED_IMAGE_ARGUMENT)
         val viewModel: MyPageViewModel = hiltViewModel()

diff --git a/...a/com/withpeace/withpeace/feature/policybookmarks/navigation/PolicyBookmarksNavigation.kt b/...a/com/withpeace/withpeace/feature/policybookmarks/navigation/PolicyBookmarksNavigation.kt
@@ -1,3 +1,5 @@
+import androidx.compose.animation.AnimatedContentTransitionScope
+import androidx.compose.animation.core.tween
 import androidx.navigation.NavController
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavOptions
@@ -14,10 +16,25 @@ fun NavGraphBuilder.policyBookmarksNavGraph(
     onShowSnackBar: (message: String) -> Unit,
     onClickBackButton: () -> Unit,
 ) {
-    composable(route = POLICY_BOOKMARKS_ROUTE) {
+    composable(
+        route = POLICY_BOOKMARKS_ROUTE,
+        enterTransition = {
+            slideIntoContainer(
+                AnimatedContentTransitionScope.SlideDirection.Left,
+                animationSpec = tween(500),
+            )
+        },
+        exitTransition = {
+            slideOutOfContainer(
+                AnimatedContentTransitionScope.SlideDirection.Right,
+                animationSpec = tween(500),
+            )
+        },
+    ) {
         PolicyBookmarksRoute(
             onShowSnackBar = onShowSnackBar,
             onClickBackButton = onClickBackButton,
-        )
+
+            )
     }
 }
diff --git a/...onsent/src/main/java/com/withpeace/withpeace/feature/policyconsent/PolicyConsentScreen.kt b/...onsent/src/main/java/com/withpeace/withpeace/feature/policyconsent/PolicyConsentScreen.kt
@@ -1,6 +1,7 @@
 package com.withpeace.withpeace.feature.policyconsent
 
 import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -90,8 +91,10 @@ fun PolicyConsentScreen(
 ) {
     val scrollState = rememberScrollState()
     Column(
+        modifier = modifier
+            .fillMaxSize()
+            .background(WithpeaceTheme.colors.SystemWhite),
         verticalArrangement = Arrangement.SpaceBetween,
-        modifier = modifier.fillMaxSize(),
     ) {
         Column(
             modifier

diff --git a/.../java/com/withpeace/withpeace/feature/policyconsent/navigation/PolicyConsentNavigation.kt b/.../java/com/withpeace/withpeace/feature/policyconsent/navigation/PolicyConsentNavigation.kt
@@ -1,5 +1,7 @@
 package com.withpeace.withpeace.feature.policyconsent.navigation
 
+import androidx.compose.animation.AnimatedContentTransitionScope
+import androidx.compose.animation.core.tween
 import androidx.navigation.NavController
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavOptions
@@ -17,7 +19,21 @@ fun NavGraphBuilder.policyConsentGraph(
     onShowTermsOfServiceClick: () -> Unit,
     onSuccessToNext: () -> Unit,
 ) {
-    composable(POLICY_CONSENT_ROUTE) {
+    composable(
+        POLICY_CONSENT_ROUTE,
+        enterTransition = {
+            slideIntoContainer(
+                AnimatedContentTransitionScope.SlideDirection.Left,
+                animationSpec = tween(500),
+            )
+        },
+        exitTransition = {
+            slideOutOfContainer(
+                AnimatedContentTransitionScope.SlideDirection.Right,
+                animationSpec = tween(500),
+            )
+        },
+    ) {
         PolicyConsentRoute(
             onShowSnackBar = onShowSnackBar,
             onShowPrivacyPolicyClick = onShowPrivacyPolicyClick,

diff --git a/...cydetail/src/main/java/com/withpeace/withpeace/feature/policydetail/PolicyDetailScreen.kt b/...cydetail/src/main/java/com/withpeace/withpeace/feature/policydetail/PolicyDetailScreen.kt
@@ -84,10 +84,12 @@ private fun PolicyDetailContent(
     }
     val visibility = remember {
         derivedStateOf {
-            scrollState.value >= position.intValue
+            scrollState.value > position.intValue
         }
     }
-    Column(modifier = modifier.fillMaxSize()) {
+    Column(modifier = modifier
+        .fillMaxSize()
+        .background(WithpeaceTheme.colors.SystemWhite)) {
         WithPeaceBackButtonTopAppBar(
             onClickBackButton = onClickBackButton,
             title = {
@@ -103,6 +105,7 @@ private fun PolicyDetailContent(
                         overflow = TextOverflow.Ellipsis,
                         modifier = modifier.padding(end = 24.dp),
                     )
+
                 }
             },
         )

diff --git a/...in/java/com/withpeace/withpeace/feature/policydetail/navigation/PolicyDetailNavigation.kt b/...in/java/com/withpeace/withpeace/feature/policydetail/navigation/PolicyDetailNavigation.kt
@@ -1,5 +1,7 @@
 package com.withpeace.withpeace.feature.policydetail.navigation
 
+import androidx.compose.animation.AnimatedContentTransitionScope
+import androidx.compose.animation.core.tween
 import androidx.navigation.NavController
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavOptions
@@ -30,6 +32,18 @@ fun NavGraphBuilder.policyDetailNavGraph(
                 type = NavType.StringType
             },
         ),
+        enterTransition = {
+            slideIntoContainer(
+                AnimatedContentTransitionScope.SlideDirection.Left,
+                animationSpec = tween(500),
+            )
+        },
+        exitTransition = {
+            slideOutOfContainer(
+                AnimatedContentTransitionScope.SlideDirection.Right,
+                animationSpec = tween(500),
+            )
+        },
     ) {
 
         PolicyDetailRoute(

diff --git a/...c/main/java/com/withpeace/withpeace/feature/postdetail/navigation/PostDetailNavigation.kt b/...c/main/java/com/withpeace/withpeace/feature/postdetail/navigation/PostDetailNavigation.kt
@@ -39,6 +39,12 @@ fun NavGraphBuilder.postDetailGraph(
                 animationSpec = tween(500),
             )
         },
+        exitTransition = {
+            slideOutOfContainer(
+                AnimatedContentTransitionScope.SlideDirection.Right,
+                animationSpec = tween(500),
+            )
+        },
     ) {
         PostDetailRoute(
             onShowSnackBar = onShowSnackBar,

diff --git a/...t/src/main/java/com/withpeace/withpeace/feature/postlist/navigation/PostListNavigation.kt b/...t/src/main/java/com/withpeace/withpeace/feature/postlist/navigation/PostListNavigation.kt
@@ -1,5 +1,7 @@
 package com.withpeace.withpeace.feature.postlist.navigation
 
+import androidx.compose.animation.EnterTransition
+import androidx.compose.animation.ExitTransition
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.navigation.NavController
 import androidx.navigation.NavGraphBuilder
@@ -19,7 +21,11 @@ fun NavGraphBuilder.postListGraph(
     navigateToPostDetail: (postId: Long) -> Unit,
     onAuthExpired: () -> Unit,
 ) {
-    composable(POST_LIST_ROUTE) {
+    composable(
+        route = POST_LIST_ROUTE,
+        enterTransition = { EnterTransition.None },
+        exitTransition = { ExitTransition.None },
+    ) {
         val deletedId = it.savedStateHandle.get<Long>(POST_LIST_DELETED_POST_ID_ARGUMENT)
         val viewModel: PostListViewModel = hiltViewModel()
         deletedId?.let { id ->

diff --git a/.../java/com/withpeace/withpeace/feature/privacypolicy/navigation/PrivacyPolicyNavigation.kt b/.../java/com/withpeace/withpeace/feature/privacypolicy/navigation/PrivacyPolicyNavigation.kt
@@ -1,5 +1,7 @@
 package com.withpeace.withpeace.feature.privacypolicy.navigation
 
+import androidx.compose.animation.AnimatedContentTransitionScope
+import androidx.compose.animation.core.tween
 import androidx.navigation.NavController
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavOptions
@@ -15,7 +17,21 @@ fun NavGraphBuilder.privacyPolicyGraph(
     onShowSnackBar: (String) -> Unit,
     onClickBackButton: () -> Unit,
 ) {
-    composable(PRIVACY_POLICY_ROUTE) {
+    composable(
+        route = PRIVACY_POLICY_ROUTE,
+        enterTransition = {
+            slideIntoContainer(
+                AnimatedContentTransitionScope.SlideDirection.Left,
+                animationSpec = tween(500),
+            )
+        },
+        exitTransition = {
+            slideOutOfContainer(
+                AnimatedContentTransitionScope.SlideDirection.Right,
+                animationSpec = tween(500),
+            )
+        },
+    ) {
         PrivacyPolicyRoute(
             onShowSnackBar = onShowSnackBar,
             onClickBackButton = onClickBackButton,

diff --git a/feature/profileeditor/src/main/java/com/app/profileeditor/ProfileEditorScreen.kt b/feature/profileeditor/src/main/java/com/app/profileeditor/ProfileEditorScreen.kt
@@ -142,6 +142,7 @@ fun ProfileEditorScreen(
         verticalArrangement = Arrangement.SpaceBetween,
         modifier = modifier
             .fillMaxSize()
+            .background(WithpeaceTheme.colors.SystemWhite)
             .verticalScroll(rememberScrollState())
             .padding(top = 0.dp),
     ) {

diff --git a/...e/profileeditor/src/main/java/com/app/profileeditor/navigation/ProfileEditorNavigation.kt b/...e/profileeditor/src/main/java/com/app/profileeditor/navigation/ProfileEditorNavigation.kt
@@ -1,5 +1,7 @@
 package com.app.profileeditor.navigation
 
+import androidx.compose.animation.AnimatedContentTransitionScope
+import androidx.compose.animation.core.tween
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.navigation.NavController
 import androidx.navigation.NavGraphBuilder
@@ -41,6 +43,18 @@ fun NavGraphBuilder.profileEditorNavGraph(
             navArgument(PROFILE_NICKNAME_ARGUMENT) { type = NavType.StringType },
             navArgument(PROFILE_IMAGE_URL_ARGUMENT) { type = NavType.StringType },
         ),
+        enterTransition = {
+            slideIntoContainer(
+                AnimatedContentTransitionScope.SlideDirection.Left,
+                animationSpec = tween(500),
+            )
+        },
+        exitTransition = {
+            slideOutOfContainer(
+                AnimatedContentTransitionScope.SlideDirection.Right,
+                animationSpec = tween(500),
+            )
+        },
     ) { entry ->
         val selectedImageUri =
             entry.savedStateHandle.get<List<String>>(IMAGE_LIST_ARGUMENT) ?: emptyList()

diff --git a/...in/java/com/withpeace/withpeace/feature/registerpost/navigation/RegisterPostNavigation.kt b/...in/java/com/withpeace/withpeace/feature/registerpost/navigation/RegisterPostNavigation.kt
@@ -1,5 +1,7 @@
 package com.withpeace.withpeace.feature.registerpost.navigation
 
+import androidx.compose.animation.AnimatedContentTransitionScope
+import androidx.compose.animation.core.tween
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.navigation.NavController
 import androidx.navigation.NavGraphBuilder
@@ -25,7 +27,21 @@ fun NavGraphBuilder.registerPostNavGraph(
     originPost: RegisterPostUiModel?,
     onAuthExpired: () -> Unit,
 ) {
-    composable(route = REGISTER_POST_ROUTE) { entry ->
+    composable(
+        route = REGISTER_POST_ROUTE,
+        enterTransition = {
+            slideIntoContainer(
+                AnimatedContentTransitionScope.SlideDirection.Up,
+                animationSpec = tween(500),
+            )
+        },
+        exitTransition = {
+            slideOutOfContainer(
+                AnimatedContentTransitionScope.SlideDirection.Down,
+                animationSpec = tween(500),
+            )
+        },
+    ) { entry ->
         val viewModel: RegisterPostViewModel = hiltViewModel()
 
         viewModel.initRegisterPost(originPost)

diff --git a/...ignup/src/main/java/com/withpeace/withpeace/feature/signup/navigation/SignUpNavigation.kt b/...ignup/src/main/java/com/withpeace/withpeace/feature/signup/navigation/SignUpNavigation.kt
@@ -1,5 +1,7 @@
 package com.withpeace.withpeace.feature.signup.navigation
 
+import androidx.compose.animation.AnimatedContentTransitionScope
+import androidx.compose.animation.core.tween
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.navigation.NavController
 import androidx.navigation.NavGraphBuilder
@@ -20,7 +22,21 @@ fun NavGraphBuilder.signUpNavGraph(
     onNavigateToGallery: () -> Unit,
     onSignUpSuccess: () -> Unit,
 ) {
-    composable(route = SIGN_UP_ROUTE) { entry ->
+    composable(
+        route = SIGN_UP_ROUTE,
+        enterTransition = {
+            slideIntoContainer(
+                AnimatedContentTransitionScope.SlideDirection.Left,
+                animationSpec = tween(500),
+            )
+        },
+        exitTransition = {
+            slideOutOfContainer(
+                AnimatedContentTransitionScope.SlideDirection.Right,
+                animationSpec = tween(500),
+            )
+        },
+    ) { entry ->
         val selectedImageUri =
             entry.savedStateHandle.get<List<String>>(IMAGE_LIST_ARGUMENT) ?: emptyList()
         val viewModel: SignUpViewModel = hiltViewModel()