Merge pull request #18 from Infomaniak/feat-navigation-transition

feat: Disable navigation transitions
Infomaniak · Aug 15, 2024 · 322851f · 322851f
2 parents e0bcf6b + 397885b
commit 322851f
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 2 deletions.
diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/navigation/NavigationDestination.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/navigation/NavigationDestination.kt
@@ -28,6 +28,8 @@ import kotlin.reflect.KClass
  */
 @Serializable
 sealed class MainNavigation : NavigationDestination() {
+    var enableTransition = true
+
     @Serializable
     data object SentDestination : MainNavigation()
     @Serializable

diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/MainNavHost.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/MainNavHost.kt
@@ -18,6 +18,10 @@
 
 package com.infomaniak.swisstransfer.ui.screen.main
 
+import androidx.compose.animation.EnterTransition
+import androidx.compose.animation.ExitTransition
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
 import androidx.compose.foundation.layout.safeDrawingPadding
 import androidx.compose.material3.adaptive.WindowAdaptiveInfo
 import androidx.compose.runtime.Composable
@@ -37,8 +41,15 @@ import com.infomaniak.swisstransfer.ui.screen.main.transferdetails.TransferDetai
 fun MainNavHost(
     navController: NavHostController,
     windowAdaptiveInfo: WindowAdaptiveInfo,
+    currentDestination: MainNavigation,
 ) {
-    NavHost(navController, MainNavigation.startDestination, modifier = Modifier.safeDrawingPadding()) {
+    NavHost(
+        navController = navController,
+        startDestination = MainNavigation.startDestination,
+        modifier = Modifier.safeDrawingPadding(),
+        enterTransition = { if (currentDestination.enableTransition) fadeIn() else EnterTransition.None },
+        exitTransition = { if (currentDestination.enableTransition) fadeOut() else ExitTransition.None },
+    ) {
         composable<SentDestination> {
             SentScreen(
                 navigateToDetails = { navController.navigate(TransferDetailsDestination(it)) },

diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/MainScaffold.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/MainScaffold.kt
@@ -97,6 +97,7 @@ private fun rememberNavType(
 }
 
 private fun NavHostController.navigateToSelectedItem(destination: MainNavigation) {
+    destination.enableTransition = false
     navigate(destination) {
         // Pop up to the start destination of the graph to avoid building up a large stack of destinations
         // on the back stack as users select items

diff --git a/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/MainScreen.kt b/app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/MainScreen.kt
@@ -45,7 +45,7 @@ fun MainScreen() {
     }
 
     MainScaffold(navController, currentDestination, windowAdaptiveInfo) {
-        MainNavHost(navController, windowAdaptiveInfo)
+        MainNavHost(navController, windowAdaptiveInfo, currentDestination)
     }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -45,7 +45,7 @@ fun MainScreen() { @@
         }
         MainScaffold(navController, currentDestination, windowAdaptiveInfo) {
-            MainNavHost(navController, windowAdaptiveInfo)
+            MainNavHost(navController, windowAdaptiveInfo, currentDestination)
         }
     }
@@ Expand Down @@