From 40958179cad3ca6b75a8fb255cf4771aef596d88 Mon Sep 17 00:00:00 2001 From: tarsin Date: Mon, 5 Jun 2023 23:45:54 +0800 Subject: [PATCH] [DO NOT USE] Use new navigation anim --- .../com/hippo/ehviewer/ui/login/LoginActivity.kt | 13 ++++++++++++- .../hippo/ehviewer/ui/settings/SettingsActivity.kt | 13 ++++++++++++- 2 files changed, 24 insertions(+), 2 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 d0aa38bca..18d904174 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 @@ -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) } 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 0a886261c..eb1a51043 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 @@ -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() }