FatttSnake/oxygen-android
1
0
Fork 0
Code Pull Requests Activity

Refactor(Animation): Optimize navigation switch animation

Browse Source 
Optimize AboutNavigation and LibrariesNavigation switch animation
This commit is contained in:
Fat Snake
2024-04-24 17:23:28 +08:00
parent b11ae055c3
commit 4d047247f1
2 changed files with 10 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/kotlin/top/fatweb/oxygen/toolbox/navigation/AboutNavigation.kt
View File

@@ -1,7 +1,7 @@
package top.fatweb.oxygen.toolbox.navigation package top.fatweb.oxygen.toolbox.navigation
import androidx.compose.animation.scaleIn import androidx.compose.animation.slideInHorizontally
import androidx.compose.animation.slideOutVertically import androidx.compose.animation.slideOutHorizontally
import androidx.navigation.NavController import androidx.navigation.NavController
import androidx.navigation.NavGraphBuilder import androidx.navigation.NavGraphBuilder
import androidx.navigation.NavOptions import androidx.navigation.NavOptions
@@ -20,16 +20,11 @@ fun NavGraphBuilder.aboutScreen(
composable( composable(
route = ABOUT_ROUTE, route = ABOUT_ROUTE,
enterTransition = { enterTransition = {
scaleIn() slideInHorizontally(initialOffsetX = { fullWidth -> fullWidth })
},
exitTransition = {
slideOutVertically { it }
},
popEnterTransition = {
scaleIn()
}, },
popEnterTransition = null,
popExitTransition = { popExitTransition = {
slideOutVertically { it } slideOutHorizontally(targetOffsetX = { fullWidth -> fullWidth })
} }
) { ) {
AboutRoute( AboutRoute(

15
app/src/main/kotlin/top/fatweb/oxygen/toolbox/navigation/LibrariesNavigation.kt
View File

@@ -1,7 +1,7 @@
package top.fatweb.oxygen.toolbox.navigation package top.fatweb.oxygen.toolbox.navigation
import androidx.compose.animation.scaleIn import androidx.compose.animation.slideInHorizontally
import androidx.compose.animation.scaleOut import androidx.compose.animation.slideOutHorizontally
import androidx.navigation.NavController import androidx.navigation.NavController
import androidx.navigation.NavGraphBuilder import androidx.navigation.NavGraphBuilder
import androidx.navigation.NavOptions import androidx.navigation.NavOptions
@@ -19,16 +19,11 @@ fun NavGraphBuilder.librariesScreen(
composable( composable(
route = LIBRARIES_ROUTE, route = LIBRARIES_ROUTE,
enterTransition = { enterTransition = {
scaleIn() slideInHorizontally(initialOffsetX = { fullWidth -> fullWidth })
},
exitTransition = {
scaleOut()
},
popEnterTransition = {
scaleIn()
}, },
popEnterTransition = null,
popExitTransition = { popExitTransition = {
scaleOut() slideOutHorizontally(targetOffsetX = { fullWidth -> fullWidth })
} }
) { ) {
LibrariesRoute(onBackClick = onBackClick) LibrariesRoute(onBackClick = onBackClick)