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

[DO NOT USE] Fix to use Transition.None

Browse Source
This commit is contained in:
tarsin committed 2023-06-05 23:52:35 +08:00
1 parent 40958179ca
commit bc5a0f9140
2 files changed
+8 -8
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
+4 -4
View File
@@ -2,9 +2,9 @@ package com.hippo.ehviewer.ui.login
import android.os.Bundle
import androidx.compose.animation.AnimatedContentTransitionScope
import androidx.compose.animation.EnterTransition
import androidx.compose.animation.ExitTransition
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
@@ -37,8 +37,8 @@ class LoginActivity : EhActivity() {
navController = navController,
startDestination = SIGN_IN_ROUTE_NAME,
enterTransition = { slideIntoContainer(AnimatedContentTransitionScope.SlideDirection.Up, tween(200)) },
exitTransition = { fadeOut(tween(0)) },
popEnterTransition = { fadeIn(tween(0)) },
exitTransition = { ExitTransition.None },
popEnterTransition = { EnterTransition.None },
popExitTransition = { slideOutOfContainer(AnimatedContentTransitionScope.SlideDirection.Down, tween(200)) },
) {
composable(SIGN_IN_ROUTE_NAME) {
app/src/main/java/com/hippo/ehviewer/ui/settings/SettingsActivity.kt
+4 -4
View File
@@ -2,9 +2,9 @@ package com.hippo.ehviewer.ui.settings
import android.os.Bundle
import androidx.compose.animation.AnimatedContentTransitionScope
import androidx.compose.animation.EnterTransition
import androidx.compose.animation.ExitTransition
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
@@ -26,8 +26,8 @@ class SettingsActivity : EhActivity() {
navController = navController,
startDestination = BASE_SETTINGS_SCREEN,
enterTransition = { slideIntoContainer(AnimatedContentTransitionScope.SlideDirection.Up, tween(200)) },
exitTransition = { fadeOut(tween(0)) },
popEnterTransition = { fadeIn(tween(0)) },
exitTransition = { ExitTransition.None },
popEnterTransition = { EnterTransition.None },
popExitTransition = { slideOutOfContainer(AnimatedContentTransitionScope.SlideDirection.Down, tween(200)) },
) {
composable(BASE_SETTINGS_SCREEN) {