Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Disable navigation transitions #18

Merged
merged 2 commits into from
Aug 15, 2024
Merged

feat: Disable navigation transitions #18

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0bb5f0a
feat: Disable navigation transitions
sirambd Aug 14, 2024
397885b
Refactor NavHost
sirambd Aug 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions app/src/main/java/com/infomaniak/swisstransfer/ui/navigation/NavigationDestination.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ import kotlin.reflect.KClass
*/
@Serializable
sealed class MainNavigation : NavigationDestination() {
var enableTransition = true

@Serializable
data object SentDestination : MainNavigation()
@Serializable
Expand Down
11 changes: 10 additions & 1 deletion app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/MainNavHost.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -37,8 +41,13 @@ 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, MainNavigation.startDestination, modifier = Modifier.safeDrawingPadding(),
enterTransition = { if (currentDestination.enableTransition) fadeIn() else EnterTransition.None },
exitTransition = { if (currentDestination.enableTransition) fadeOut() else ExitTransition.None },
sirambd marked this conversation as resolved.
Show resolved Hide resolved
) {
composable<SentDestination> {
SentScreen(
navigateToDetails = { navController.navigate(TransferDetailsDestination(it)) },
Expand Down
1 change: 1 addition & 0 deletions app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/MainScaffold.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/MainScreen.kt
View file
Open in desktop
Original file line number Diff 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
Loading