From f901bd233628fdabe29f37d4793b6c1e6d39fcb2 Mon Sep 17 00:00:00 2001 From: FooIbar <118464521+FooIbar@users.noreply.github.com> Date: Thu, 10 Aug 2023 20:42:51 +0800 Subject: [PATCH] Fix navigation transitions --- .../main/java/com/hippo/ehviewer/ui/ConfigureActivity.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/hippo/ehviewer/ui/ConfigureActivity.kt b/app/src/main/java/com/hippo/ehviewer/ui/ConfigureActivity.kt index 1ffe46895..fddd2023b 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/ConfigureActivity.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/ConfigureActivity.kt @@ -2,9 +2,9 @@ package com.hippo.ehviewer.ui 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 @@ -47,8 +47,8 @@ class ConfigureActivity : EhActivity() { BASE_SETTINGS_SCREEN }, enterTransition = { slideIntoContainer(AnimatedContentTransitionScope.SlideDirection.Up, tween(200)) }, - exitTransition = { ExitTransition.None }, - popEnterTransition = { EnterTransition.None }, + exitTransition = { fadeOut(tween(200)) }, + popEnterTransition = { fadeIn(tween(200)) }, popExitTransition = { slideOutOfContainer(AnimatedContentTransitionScope.SlideDirection.Down, tween(200)) }, ) { composable(SIGN_IN_ROUTE_NAME) {