Merge branch 'fix/#184-register-to-explore' into fix/#186-lock-regist…

…er-button
spooooony · Jan 24, 2025 · bc840f3 · bc840f3
2 parents 9997d4b + 0c26b76
commit bc840f3
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 7 deletions.
diff --git a/app/src/main/java/com/spoony/spoony/presentation/main/MainNavigator.kt b/app/src/main/java/com/spoony/spoony/presentation/main/MainNavigator.kt
@@ -15,6 +15,7 @@ import com.spoony.spoony.presentation.map.navigaion.Map
 import com.spoony.spoony.presentation.map.navigaion.navigateToMap
 import com.spoony.spoony.presentation.map.search.navigation.navigateToMapSearch
 import com.spoony.spoony.presentation.placeDetail.navigation.navigateToPlaceDetail
+import com.spoony.spoony.presentation.register.navigation.Register
 import com.spoony.spoony.presentation.register.navigation.navigateToRegister
 import com.spoony.spoony.presentation.report.navigation.navigateToReport
 
@@ -64,12 +65,22 @@ class MainNavigator(
     }
 
     fun navigateToExplore(
-        navOptions: NavOptions? = navOptions {
-            popUpTo(Explore) {
-                inclusive = false
+        fromRegister: Boolean = false,
+        navOptions: NavOptions? = if (fromRegister) {
+            navOptions {
+                popUpTo(Register) {
+                    inclusive = true
+                }
+                launchSingleTop = true
+            }
+        } else {
+            navOptions {
+                popUpTo(Explore) {
+                    inclusive = false
+                }
+                restoreState = true
+                launchSingleTop = true
             }
-            restoreState = true
-            launchSingleTop = true
         }
     ) {
         navController.navigateToExplore(navOptions)

diff --git a/app/src/main/java/com/spoony/spoony/presentation/main/MainScreen.kt b/app/src/main/java/com/spoony/spoony/presentation/main/MainScreen.kt
@@ -111,7 +111,7 @@ fun MainScreen(
 
                 registerNavGraph(
                     paddingValues = paddingValues,
-                    navigateToExplore = navigator::navigateToExplore
+                    navigateToExplore = { navigator.navigateToExplore(fromRegister = true) }
                 )
 
                 placeDetailNavGraph(

diff --git a/app/src/main/java/com/spoony/spoony/presentation/register/RegisterViewModel.kt b/app/src/main/java/com/spoony/spoony/presentation/register/RegisterViewModel.kt
@@ -225,7 +225,8 @@ class RegisterViewModel @Inject constructor(
         viewModelScope.launch {
             _state.update { currentState ->
                 RegisterState(
-                    categories = currentState.categories
+                    categories = currentState.categories,
+                    showRegisterSnackBar = false
                 )
             }
         }