yenru0/EhViewer
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[DO NOT USE] Use new navigation anim

Browse Source
This commit is contained in:
tarsin committed 2023-06-05 23:45:54 +08:00
1 parent d98006c2cd
commit 40958179ca
2 files changed
+24 -2
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/src/main/java/com/hippo/ehviewer/ui/login/LoginActivity.kt
+12 -1
View File
@@ -1,6 +1,10 @@
package com.hippo.ehviewer.ui.login
import android.os.Bundle
import androidx.compose.animation.AnimatedContentTransitionScope
import androidx.compose.animation.core.tween
import androidx.compose.animation.fadeIn
import androidx.compose.animation.fadeOut
import androidx.compose.material3.windowsizeclass.calculateWindowSizeClass
import androidx.compose.runtime.CompositionLocalProvider
import androidx.compose.runtime.SideEffect
@@ -29,7 +33,14 @@ class LoginActivity : EhActivity() {
val navController = rememberNavController()
CompositionLocalProvider(LocalNavController provides navController) {
NavHost(navController = navController, startDestination = SIGN_IN_ROUTE_NAME) {
NavHost(
navController = navController,
startDestination = SIGN_IN_ROUTE_NAME,
enterTransition = { slideIntoContainer(AnimatedContentTransitionScope.SlideDirection.Up, tween(200)) },
exitTransition = { fadeOut(tween(0)) },
popEnterTransition = { fadeIn(tween(0)) },
popExitTransition = { slideOutOfContainer(AnimatedContentTransitionScope.SlideDirection.Down, tween(200)) },
) {
composable(SIGN_IN_ROUTE_NAME) {
SignInScreen(windowSizeClass)
}
app/src/main/java/com/hippo/ehviewer/ui/settings/SettingsActivity.kt
+12 -1
View File
@@ -1,6 +1,10 @@
package com.hippo.ehviewer.ui.settings
import android.os.Bundle
import androidx.compose.animation.AnimatedContentTransitionScope
import androidx.compose.animation.core.tween
import androidx.compose.animation.fadeIn
import androidx.compose.animation.fadeOut
import androidx.compose.runtime.CompositionLocalProvider
import androidx.core.view.WindowCompat
import androidx.navigation.compose.NavHost
@@ -18,7 +22,14 @@ class SettingsActivity : EhActivity() {
val navController = rememberNavController()
CompositionLocalProvider(LocalNavController provides navController) {
NavHost(navController = navController, startDestination = BASE_SETTINGS_SCREEN) {
NavHost(
navController = navController,
startDestination = BASE_SETTINGS_SCREEN,
enterTransition = { slideIntoContainer(AnimatedContentTransitionScope.SlideDirection.Up, tween(200)) },
exitTransition = { fadeOut(tween(0)) },
popEnterTransition = { fadeIn(tween(0)) },
popExitTransition = { slideOutOfContainer(AnimatedContentTransitionScope.SlideDirection.Down, tween(200)) },
) {
composable(BASE_SETTINGS_SCREEN) {
BaseScreen()
}