From 3734afd465e07c2fea2ed451db83bf7d4845c043 Mon Sep 17 00:00:00 2001 From: Kevinlinpr Date: Thu, 12 Sep 2024 21:47:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A8=E7=94=BB=E9=80=9F=E5=BA=A6=E8=B0=83?= =?UTF-8?q?=E8=8A=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/aiosman/riderpro/ui/Navi.kt | 69 ++++++++++++++++--- 1 file changed, 59 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/com/aiosman/riderpro/ui/Navi.kt b/app/src/main/java/com/aiosman/riderpro/ui/Navi.kt index c73e941..a16c03f 100644 --- a/app/src/main/java/com/aiosman/riderpro/ui/Navi.kt +++ b/app/src/main/java/com/aiosman/riderpro/ui/Navi.kt @@ -142,23 +142,64 @@ fun NavigationController( ) } } - composable(route = NavigationRoute.ModificationList.route) { + composable(route = NavigationRoute.ModificationList.route, + enterTransition = { + fadeIn(animationSpec = tween(durationMillis = 0)) + }, + exitTransition = { + fadeOut(animationSpec = tween(durationMillis = 0)) + } + ) { ModificationListScreen() } - composable(route = NavigationRoute.MyMessage.route) { + composable(route = NavigationRoute.MyMessage.route, + enterTransition = { + fadeIn(animationSpec = tween(durationMillis = 0)) + }, + exitTransition = { + fadeOut(animationSpec = tween(durationMillis = 0)) + } + ) { NotificationsScreen() } - composable(route = NavigationRoute.Comments.route) { + composable(route = NavigationRoute.Comments.route, + enterTransition = { + fadeIn(animationSpec = tween(durationMillis = 0)) + }, + exitTransition = { + fadeOut(animationSpec = tween(durationMillis = 0)) + } + ) { CommentsScreen() } - composable(route = NavigationRoute.Likes.route) { + composable(route = NavigationRoute.Likes.route, + enterTransition = { + fadeIn(animationSpec = tween(durationMillis = 0)) + }, + exitTransition = { + fadeOut(animationSpec = tween(durationMillis = 0)) + } + ) { LikeNoticeScreen() } - composable(route = NavigationRoute.Followers.route) { + composable(route = NavigationRoute.Followers.route, + enterTransition = { + fadeIn(animationSpec = tween(durationMillis = 0)) + }, + exitTransition = { + fadeOut(animationSpec = tween(durationMillis = 0)) + } + ) { FollowerNoticeScreen() } composable( route = NavigationRoute.NewPost.route, + enterTransition = { + fadeIn(animationSpec = tween(durationMillis = 0)) + }, + exitTransition = { + fadeOut(animationSpec = tween(durationMillis = 0)) + } ) { NewPostScreen() } @@ -197,10 +238,10 @@ fun NavigationController( composable( route = NavigationRoute.UserAuth.route, enterTransition = { - fadeIn(animationSpec = tween(durationMillis = 100)) + fadeIn(animationSpec = tween(durationMillis = 0)) }, exitTransition = { - fadeOut(animationSpec = tween(durationMillis = 100)) + fadeOut(animationSpec = tween(durationMillis = 0)) } ) { UserAuthScreen() @@ -208,15 +249,23 @@ fun NavigationController( composable( route = NavigationRoute.EmailSignUp.route, enterTransition = { - fadeIn(animationSpec = tween(durationMillis = 100)) + fadeIn(animationSpec = tween(durationMillis = 0)) }, exitTransition = { - fadeOut(animationSpec = tween(durationMillis = 100)) + fadeOut(animationSpec = tween(durationMillis = 0)) } ) { EmailSignupScreen() } - composable(route = NavigationRoute.AccountEdit.route) { + composable( + route = NavigationRoute.AccountEdit.route, + enterTransition = { + fadeIn(animationSpec = tween(durationMillis = 0)) + }, + exitTransition = { + fadeOut(animationSpec = tween(durationMillis = 0)) + } + ) { AccountEditScreen2() } composable(route = NavigationRoute.ImageViewer.route) {