refactor: simplify navigation transitions across screens

egorikftp · egorikftp · commit ee8c69927bb2 · 2025-10-10T17:06:18.000+03:00
diff --git a/tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/ui/ValkyriePlugin.kt b/tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/ui/ValkyriePlugin.kt
@@ -14,6 +14,7 @@ import com.composegears.leviathan.compose.inject
 import com.composegears.tiamat.TiamatExperimentalApi
 import com.composegears.tiamat.compose.Navigation
 import com.composegears.tiamat.compose.navigationNone
+import com.composegears.tiamat.compose.navigationSlideInOut
 import com.composegears.tiamat.compose.rememberNavController
 import com.composegears.tiamat.compose.replace
 import com.composegears.tiamat.navigation.NavController
@@ -105,6 +106,7 @@ fun ValkyriePlugin(
 
                 WebImportFlow,
             ),
+            contentTransformProvider = { isForward -> navigationSlideInOut(isForward) },
         )
         SnackbarHost(
             modifier = Modifier.align(Alignment.BottomCenter),
diff --git a/tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/ui/screen/editor/EditorSelectScreen.kt b/tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/ui/screen/editor/EditorSelectScreen.kt
@@ -23,7 +23,6 @@ import com.composegears.tiamat.compose.back
 import com.composegears.tiamat.compose.navController
 import com.composegears.tiamat.compose.navDestination
 import com.composegears.tiamat.compose.navigate
-import com.composegears.tiamat.compose.navigationSlideInOut
 import io.github.composegears.valkyrie.compose.core.layout.VerticalSpacer
 import io.github.composegears.valkyrie.compose.util.dim
 import io.github.composegears.valkyrie.ui.foundation.AppBarTitle
@@ -37,12 +36,11 @@ val EditorSelectScreen by navDestination<Unit> {
     val navController = navController()
 
     EditorScreenUi(
-        onBack = { navController.back(transition = navigationSlideInOut(false)) },
+        onBack = navController::back,
         openEdit = { type ->
             navController.navigate(
                 dest = EditScreen,
                 navArgs = type,
-                transition = navigationSlideInOut(true),
             )
         },
     )
diff --git a/tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/ui/screen/editor/edit/EditScreen.kt b/tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/ui/screen/editor/edit/EditScreen.kt
@@ -18,7 +18,6 @@ import com.composegears.tiamat.compose.navArgs
 import com.composegears.tiamat.compose.navController
 import com.composegears.tiamat.compose.navDestination
 import com.composegears.tiamat.compose.navigate
-import com.composegears.tiamat.compose.navigationSlideInOut
 import com.composegears.tiamat.compose.saveableViewModel
 import io.github.composegears.valkyrie.ui.common.picker.PickerEvent
 import io.github.composegears.valkyrie.ui.foundation.compositionlocal.LocalProject
@@ -44,12 +43,9 @@ val EditScreen by navDestination<EditorType> {
 
     EditScreenUi(
         state = state,
-        onBack = { navController.back(transition = navigationSlideInOut(false)) },
+        onBack = navController::back,
         openSettings = {
-            navController.navigate(
-                dest = SettingsScreen,
-                transition = navigationSlideInOut(true),
-            )
+            navController.navigate(dest = SettingsScreen)
         },
         onPickerEvent = {
             viewModel.pickerEvent(project = project.current, events = it)
diff --git a/tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/ui/screen/intro/IntroScreen.kt b/tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/ui/screen/intro/IntroScreen.kt
@@ -20,7 +20,6 @@ import androidx.compose.ui.unit.dp
 import com.composegears.tiamat.compose.navController
 import com.composegears.tiamat.compose.navDestination
 import com.composegears.tiamat.compose.navigate
-import com.composegears.tiamat.compose.navigationSlideInOut
 import com.composegears.tiamat.navigation.NavDestination
 import io.github.composegears.valkyrie.FeatureFlag.ICON_EDITOR_FEATURE_ENABLED
 import io.github.composegears.valkyrie.FeatureFlag.WEB_IMPORT_FEATURE_ENABLED
@@ -55,37 +54,14 @@ val IntroScreen: NavDestination<Unit> by navDestination {
 
     IntroScreenUI(
         openSettings = {
-            navController.navigate(
-                dest = SettingsScreen,
-                transition = navigationSlideInOut(true),
-            )
+            navController.navigate(dest = SettingsScreen)
         },
         onModeChange = {
             when (it) {
-                Simple -> {
-                    navController.navigate(
-                        dest = SimpleModeSetupScreen,
-                        transition = navigationSlideInOut(true),
-                    )
-                }
-                IconPack -> {
-                    navController.navigate(
-                        dest = IconPackCreationScreen,
-                        transition = navigationSlideInOut(true),
-                    )
-                }
-                Editor -> {
-                    navController.navigate(
-                        dest = EditorSelectScreen,
-                        transition = navigationSlideInOut(true),
-                    )
-                }
-                WebImport -> {
-                    navController.navigate(
-                        dest = WebImportFlow,
-                        transition = navigationSlideInOut(true),
-                    )
-                }
+                Simple -> navController.navigate(dest = SimpleModeSetupScreen)
+                IconPack -> navController.navigate(dest = IconPackCreationScreen)
+                Editor -> navController.navigate(dest = EditorSelectScreen)
+                WebImport -> navController.navigate(dest = WebImportFlow)
                 Unspecified -> {}
             }
         },
diff --git a/tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/ui/screen/mode/iconpack/conversion/IconPackConversionScreen.kt b/tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/ui/screen/mode/iconpack/conversion/IconPackConversionScreen.kt
@@ -41,7 +41,6 @@ import com.composegears.tiamat.compose.navArgsOrNull
 import com.composegears.tiamat.compose.navController
 import com.composegears.tiamat.compose.navDestination
 import com.composegears.tiamat.compose.navigate
-import com.composegears.tiamat.compose.navigationSlideInOut
 import com.composegears.tiamat.compose.saveableViewModel
 import com.intellij.openapi.application.writeAction
 import com.intellij.openapi.vfs.VirtualFileManager
@@ -107,14 +106,9 @@ val IconPackConversionScreen by navDestination<PendingPathData> {
     IconPackConversionUi(
         state = state,
         previewType = settings.previewType,
-        onBack = {
-            navController.back(transition = navigationSlideInOut(false))
-        },
+        onBack = navController::back,
         openSettings = {
-            navController.navigate(
-                dest = SettingsScreen,
-                transition = navigationSlideInOut(true),
-            )
+            navController.navigate(dest = SettingsScreen)
         },
         onPickEvent = viewModel::pickerEvent,
         updatePack = viewModel::updateIconPack,
diff --git a/tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/ui/screen/mode/iconpack/creation/IconPackCreationScreen.kt b/tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/ui/screen/mode/iconpack/creation/IconPackCreationScreen.kt
@@ -24,7 +24,6 @@ import com.composegears.tiamat.compose.currentNavDestinationAsState
 import com.composegears.tiamat.compose.navArgsOrNull
 import com.composegears.tiamat.compose.navDestination
 import com.composegears.tiamat.compose.navigate
-import com.composegears.tiamat.compose.navigationSlideInOut
 import com.composegears.tiamat.compose.popToTop
 import com.composegears.tiamat.compose.rememberNavController
 import com.composegears.tiamat.navigation.NavController
@@ -54,7 +53,7 @@ val IconPackCreationScreen by navDestination<PendingPathData> {
             ) {
                 nestedNavController.back()
             } else {
-                nestedNavController.parent?.back(transition = navigationSlideInOut(false))
+                nestedNavController.parent?.back()
             }
         },
     )
diff --git a/tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/ui/screen/mode/simple/conversion/SimpleConversionScreen.kt b/tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/ui/screen/mode/simple/conversion/SimpleConversionScreen.kt
@@ -18,7 +18,6 @@ import com.composegears.tiamat.compose.back
 import com.composegears.tiamat.compose.navController
 import com.composegears.tiamat.compose.navDestination
 import com.composegears.tiamat.compose.navigate
-import com.composegears.tiamat.compose.navigationSlideInOut
 import com.composegears.tiamat.compose.saveableViewModel
 import io.github.composegears.valkyrie.ui.domain.model.PreviewType
 import io.github.composegears.valkyrie.ui.foundation.rememberSnackbar
@@ -67,11 +66,8 @@ val SimpleConversionScreen by navDestination<Unit> {
         previewType = settings.previewType,
         onAction = {
             when (it) {
-                is Back -> navController.back(transition = navigationSlideInOut(false))
-                is OpenSettings -> navController.navigate(
-                    dest = SettingsScreen,
-                    transition = navigationSlideInOut(true),
-                )
+                is Back -> navController.back()
+                is OpenSettings -> navController.navigate(dest = SettingsScreen)
                 is ClosePreview -> viewModel.reset()
                 is OpenFilePicker -> {
                     scope.launch {
diff --git a/tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/ui/screen/mode/simple/setup/SimpleModeSetupScreen.kt b/tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/ui/screen/mode/simple/setup/SimpleModeSetupScreen.kt
@@ -17,7 +17,6 @@ import androidx.lifecycle.viewmodel.compose.viewModel
 import com.composegears.tiamat.compose.back
 import com.composegears.tiamat.compose.navController
 import com.composegears.tiamat.compose.navDestination
-import com.composegears.tiamat.compose.navigationSlideInOut
 import com.composegears.tiamat.compose.replace
 import io.github.composegears.valkyrie.compose.core.layout.VerticalSpacer
 import io.github.composegears.valkyrie.ui.domain.validation.ErrorCriteria
@@ -42,15 +41,10 @@ val SimpleModeSetupScreen by navDestination<Unit> {
     SimpleModeSetupScreenUI(
         state = state,
         onValueChange = viewModel::onValueChange,
-        onBack = {
-            navController.back(transition = navigationSlideInOut(false))
-        },
+        onBack = navController::back,
         onNext = {
             viewModel.saveSettings()
-            navController.replace(
-                dest = SimpleConversionScreen,
-                transition = navigationSlideInOut(true),
-            )
+            navController.replace(dest = SimpleConversionScreen)
         },
     )
 }
diff --git a/tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/ui/screen/settings/SettingsScreen.kt b/tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/ui/screen/settings/SettingsScreen.kt
@@ -10,7 +10,6 @@ import com.composegears.tiamat.compose.back
 import com.composegears.tiamat.compose.currentNavDestinationAsState
 import com.composegears.tiamat.compose.navController
 import com.composegears.tiamat.compose.navDestination
-import com.composegears.tiamat.compose.navigationSlideInOut
 import com.composegears.tiamat.compose.rememberNavController
 import com.composegears.tiamat.compose.replace
 import com.composegears.tiamat.navigation.NavDestination
@@ -39,11 +38,7 @@ val SettingsScreen by navDestination<Unit> {
 
     Column(modifier = Modifier.fillMaxSize()) {
         TopAppBar {
-            BackAction(
-                onBack = {
-                    navController.back(transition = navigationSlideInOut(false))
-                },
-            )
+            BackAction(onBack = navController::back)
             AppBarTitle("Settings")
         }
 
diff --git a/tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/ui/screen/webimport/WebImportSelectorScreen.kt b/tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/ui/screen/webimport/WebImportSelectorScreen.kt
@@ -15,7 +15,6 @@ import androidx.compose.ui.unit.dp
 import com.composegears.tiamat.compose.back
 import com.composegears.tiamat.compose.navController
 import com.composegears.tiamat.compose.navDestination
-import com.composegears.tiamat.compose.navigationSlideInOut
 import io.github.composegears.valkyrie.compose.core.layout.VerticalSpacer
 import io.github.composegears.valkyrie.compose.icons.ValkyrieIcons
 import io.github.composegears.valkyrie.compose.icons.colored.GoogleMaterialLogo
@@ -29,9 +28,7 @@ import io.github.composegears.valkyrie.util.stringResource
 val WebImportSelectorScreen by navDestination<Unit> {
     val navController = navController()
 
-    WebImportSelectorScreenUI(
-        onBack = { navController.back(transition = navigationSlideInOut(false)) },
-    )
+    WebImportSelectorScreenUI(onBack = navController::back)
 }
 
 @Composable
