From bc5a0f9140d5fe1924bc219edfc2b03c9376adc3 Mon Sep 17 00:00:00 2001 From: tarsin Date: Mon, 5 Jun 2023 23:52:35 +0800 Subject: [PATCH] [DO NOT USE] Fix to use Transition.None --- .../java/com/hippo/ehviewer/ui/login/LoginActivity.kt | 8 ++++---- .../com/hippo/ehviewer/ui/settings/SettingsActivity.kt | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/com/hippo/ehviewer/ui/login/LoginActivity.kt b/app/src/main/java/com/hippo/ehviewer/ui/login/LoginActivity.kt index 18d904174..20da78fdb 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/login/LoginActivity.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/login/LoginActivity.kt @@ -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) { diff --git a/app/src/main/java/com/hippo/ehviewer/ui/settings/SettingsActivity.kt b/app/src/main/java/com/hippo/ehviewer/ui/settings/SettingsActivity.kt index eb1a51043..0392e2d58 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/settings/SettingsActivity.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/settings/SettingsActivity.kt @@ -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) {