Clear backstack after navigation to conversion screens

ComposeGears · Sep 25, 2024 · 58ecf7f · 58ecf7f
1 parent cd8e167
commit 58ecf7f
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 22 deletions.
diff --git a/...thub/composegears/valkyrie/ui/screen/mode/iconpack/conversion/IconPackConversionScreen.kt b/...thub/composegears/valkyrie/ui/screen/mode/iconpack/conversion/IconPackConversionScreen.kt
@@ -40,9 +40,6 @@ import com.composegears.tiamat.navDestination
 import com.composegears.tiamat.navigationSlideInOut
 import com.intellij.openapi.application.writeAction
 import com.intellij.openapi.vfs.VirtualFileManager
-import io.github.composegears.valkyrie.generator.imagevector.OutputFormat
-import io.github.composegears.valkyrie.settings.ValkyriesSettings
-import io.github.composegears.valkyrie.ui.domain.model.Mode
 import io.github.composegears.valkyrie.ui.foundation.AppBarTitle
 import io.github.composegears.valkyrie.ui.foundation.BackAction
 import io.github.composegears.valkyrie.ui.foundation.ClearAction
@@ -65,8 +62,6 @@ val IconPackConversionScreen by navDestination<Unit> {
     val viewModel = koinTiamatViewModel<IconPackConversionViewModel>()
     val state by viewModel.state.collectAsState()
 
-    val settings by viewModel.valkyriesSettings.collectAsState()
-
     LaunchedEffect(Unit) {
         viewModel.events
             .onEach {
@@ -89,7 +84,6 @@ val IconPackConversionScreen by navDestination<Unit> {
 
     IconPackConversionUi(
         state = state,
-        settings = settings,
         onBack = {
             navController.back(transition = navigationSlideInOut(false))
         },
@@ -112,7 +106,6 @@ val IconPackConversionScreen by navDestination<Unit> {
 @Composable
 private fun IconPackConversionUi(
     state: IconPackConversionState,
-    settings: ValkyriesSettings,
     onBack: () -> Unit,
     openSettings: () -> Unit,
     onPickEvent: (PickerEvent) -> Unit,
@@ -156,7 +149,7 @@ private fun IconPackConversionUi(
                 if (state is BatchProcessing.IconPackCreationState) {
                     ClearAction(onClear = onReset)
                 }
-                AppBarTitle(title = "${settings.iconPackName} generation")
+                AppBarTitle(title = "IconPack generation")
                 WeightSpacer()
                 SettingsAction(openSettings = openSettings)
             }
@@ -239,16 +232,6 @@ private fun LoadingStateUi(message: String) {
 private fun IconPackConversionUiPickeringPreview() = PreviewTheme {
     IconPackConversionUi(
         state = IconsPickering,
-        settings = ValkyriesSettings(
-            mode = Mode.IconPack,
-            iconPackName = "MyPack",
-            packageName = "",
-            iconPackDestination = "",
-            nestedPacks = emptyList(),
-            outputFormat = OutputFormat.BackingProperty,
-            generatePreview = true,
-            showImageVectorPreview = true,
-        ),
         onBack = {},
         openSettings = {},
         onPickEvent = {},

diff --git a/...b/composegears/valkyrie/ui/screen/mode/iconpack/conversion/IconPackConversionViewModel.kt b/...b/composegears/valkyrie/ui/screen/mode/iconpack/conversion/IconPackConversionViewModel.kt
@@ -42,7 +42,7 @@ class IconPackConversionViewModel(
     private val _events = MutableSharedFlow<ConversionEvent>()
     val events = _events.asSharedFlow()
 
-    val valkyriesSettings: StateFlow<ValkyriesSettings> = inMemorySettings.settings
+    private val valkyriesSettings: StateFlow<ValkyriesSettings> = inMemorySettings.settings
 
     fun pickerEvent(events: PickerEvent) {
         when (events) {

diff --git a/...o/github/composegears/valkyrie/ui/screen/mode/iconpack/existingpack/ExistingPackScreen.kt b/...o/github/composegears/valkyrie/ui/screen/mode/iconpack/existingpack/ExistingPackScreen.kt
@@ -39,7 +39,7 @@ val ExistingPackScreen by navDestination<Unit> {
             .onEach {
                 when (it) {
                     is ExistingPackEvent.OnSettingsUpdated -> {
-                        navController.parent?.navigate(IconPackConversionScreen)
+                        navController.parent?.replace(IconPackConversionScreen)
                     }
                     is ExistingPackEvent.PreviewIconPackObject -> {
                         navController.parent?.navigate(

diff --git a/...n/kotlin/io/github/composegears/valkyrie/ui/screen/mode/iconpack/newpack/NewPackScreen.kt b/...n/kotlin/io/github/composegears/valkyrie/ui/screen/mode/iconpack/newpack/NewPackScreen.kt
@@ -39,7 +39,7 @@ val NewPackScreen by navDestination<Unit> {
             .onEach {
                 when (it) {
                     is NewPackEvent.OnSettingsUpdated -> {
-                        navController.parent?.navigate(IconPackConversionScreen)
+                        navController.parent?.replace(IconPackConversionScreen)
                     }
                     is NewPackEvent.PreviewIconPackObject -> {
                         navController.parent?.navigate(

diff --git a/...tlin/io/github/composegears/valkyrie/ui/screen/mode/simple/setup/SimpleModeSetupScreen.kt b/...tlin/io/github/composegears/valkyrie/ui/screen/mode/simple/setup/SimpleModeSetupScreen.kt
@@ -45,7 +45,7 @@ val SimpleModeSetupScreen by navDestination<Unit> {
         },
         onNext = {
             viewModel.saveSettings()
-            navController.navigate(
+            navController.replace(
                 dest = SimpleConversionScreen,
                 transition = navigationSlideInOut(true),
             )