feat: update navigate and replace

triandamai · Jun 25, 2023 · beb31e2 · beb31e2
1 parent d3d8ff7
commit beb31e2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 10 deletions.
diff --git a/ui/src/main/java/app/trian/mvi/ui/PageWrapper.kt b/ui/src/main/java/app/trian/mvi/ui/PageWrapper.kt
@@ -53,25 +53,22 @@ inline fun <reified ViewModel : MviViewModel<*, *, *>> NavGraphBuilder.pageWrapp
                     )
                         .show()
 
-                    is UIEvent.ShowSnackBar -> {
-
-                    }
-
+                    is UIEvent.ShowSnackBar -> {}
                     is UIEvent.NavigateAndReplace ->
                         controller.navigator.navigateAndReplace(event.route, *event.params)
 
                     is UIEvent.NavigateSingleTop -> controller.navigator.navigateSingleTop(
                         event.route,
                         *event.params
                     )
-
-                    UIEvent.NavigateBackAndClose -> controller.navigator.navigateBackAndClose()
-                    UIEvent.NavigateUp -> controller.navigator.navigateUp()
-                    UIEvent.Nothing -> {}
                     is UIEvent.Navigate -> controller.navigator.navigate(
                         event.route,
                         *event.params
                     )
+                    UIEvent.NavigateBackAndClose -> controller.navigator.navigateBackAndClose()
+                    UIEvent.NavigateUp -> controller.navigator.navigateUp()
+                    UIEvent.Nothing -> {}
+
                 }
             }
         })

diff --git a/ui/src/main/java/app/trian/mvi/ui/UIEvent.kt b/ui/src/main/java/app/trian/mvi/ui/UIEvent.kt
@@ -2,7 +2,6 @@ package app.trian.mvi.ui
 
 sealed interface UIEvent {
     class ShowToast(val message: String) : UIEvent
-
     class ShowSnackBar(val message: String) : UIEvent
     class NavigateAndReplace(val route: String, vararg val params: String) : UIEvent
     class NavigateSingleTop(val route: String, vararg val params: String) : UIEvent

diff --git a/ui/src/main/java/app/trian/mvi/ui/internal/Navigator.kt b/ui/src/main/java/app/trian/mvi/ui/internal/Navigator.kt
@@ -74,6 +74,7 @@ class Navigator(
             launchSingleTop = true
         }
     }
+
     /**
      * Navigation into [routeName] as destination, and pop all backstack before last route
      * if same route exist on back stack, will be replace with [routeName]
@@ -95,7 +96,7 @@ class Navigator(
             }
         }
         this.navHostController.navigate(buildRoute) {
-            popUpTo(navHostController.graph.startDestinationId) {
+            popUpTo(navHostController.graph.id) {
                 inclusive = true
             }
             launchSingleTop = true