Skip to content

Commit b41758b

Browse files
Merge pull request #107 from boostcampwm-2022/106-refactor-nav-graph-logic
refactor: backstack 처리 변경
2 parents 03f3c26 + c34a001 commit b41758b

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

presentation/src/main/java/com/stop/ui/placesearch/PlaceSearchFragment.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,19 +88,19 @@ class PlaceSearchFragment : Fragment() {
8888
placeSearchViewModel.setNearPlacesEmpty()
8989
placeSearchViewModel.insertRecentSearchPlace(placeUseCaseItem)
9090

91-
findNavController().navigate(R.id.action_placeSearchFragment_to_mapFragment)
91+
findNavController().popBackStack(R.id.mapFragment, false)
9292
}
9393

9494
private fun buttonClick() {
9595
with(binding) {
9696
layoutRecentSearch.textViewCurrentLocation.setOnClickListener {
9797
placeSearchViewModel.setClickCurrentLocation()
9898

99-
findNavController().navigate(R.id.action_placeSearchFragment_to_mapFragment)
99+
findNavController().popBackStack(R.id.mapFragment, false)
100100
}
101101

102102
layoutRecentSearch.textViewSelectMap.setOnClickListener {
103-
findNavController().navigate(R.id.action_placeSearchFragment_to_mapFragment)
103+
findNavController().popBackStack(R.id.mapFragment, false)
104104
}
105105
}
106106
}

presentation/src/main/java/com/stop/ui/route/RouteFragment.kt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,13 +83,17 @@ class RouteFragment : Fragment() {
8383
binding.textViewOrigin.setOnClickListener {
8484
val navController = findNavController()
8585
navController.setGraph(R.navigation.nav_graph)
86-
navController.navigate(R.id.action_global_placeSearchFragment)
86+
if (navController.popBackStack(R.id.action_global_placeSearchFragment, false).not()) {
87+
navController.navigate(R.id.placeSearchFragment)
88+
}
8789
}
8890

8991
binding.textViewDestination.setOnClickListener {
9092
val navController = findNavController()
9193
navController.setGraph(R.navigation.nav_graph)
92-
navController.navigate(R.id.action_global_placeSearchFragment)
94+
if (navController.popBackStack(R.id.action_global_placeSearchFragment, false).not()) {
95+
navController.navigate(R.id.placeSearchFragment)
96+
}
9397
}
9498

9599
binding.imageViewSwapOriginWithDestination.setOnClickListener {

0 commit comments

Comments
 (0)