Skip to content

Commit d54dc01

Browse files
committed
Revert "기록용: backStackEntry 코드를 적용했지만 동작하지 않음"
This reverts commit 9b8b21d.
1 parent 9b8b21d commit d54dc01

File tree

2 files changed

+4
-23
lines changed

2 files changed

+4
-23
lines changed

presentation/src/main/java/com/stop/ui/alarmsetting/AlarmSettingFragment.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@ class AlarmSettingFragment : Fragment() {
120120
makeAlarm()
121121
//makeAlarmWorker()
122122
val navController = findNavController()
123-
navController.getBackStackEntry(R.id.mapFragment).savedStateHandle.set(BACK_STACK_KEY, true)
124123
navController.setGraph(R.navigation.nav_graph)
125124
navController.popBackStack(R.id.action_global_mapFragment, false)
126125
}
@@ -149,7 +148,6 @@ class AlarmSettingFragment : Fragment() {
149148

150149
companion object {
151150
const val ALARM_CODE = 123
152-
const val BACK_STACK_KEY = "isCreatedFromPopBackStack"
153151
}
154152

155153
}

presentation/src/main/java/com/stop/ui/map/MapFragment.kt

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import com.stop.R
1919
import com.stop.RouteNavGraphDirections
2020
import com.stop.databinding.FragmentMapBinding
2121
import com.stop.model.Location
22-
import com.stop.ui.alarmsetting.AlarmSettingFragment
2322
import com.stop.ui.alarmsetting.AlarmSettingViewModel
2423
import com.stop.ui.placesearch.PlaceSearchViewModel
2524
import com.stop.ui.util.Marker
@@ -50,7 +49,6 @@ class MapFragment : Fragment(), MapHandler {
5049
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
5150
super.onViewCreated(view, savedInstanceState)
5251

53-
handleActivityViewModels()
5452
initTMap()
5553
initView()
5654
initNavigateAction()
@@ -66,19 +64,6 @@ class MapFragment : Fragment(), MapHandler {
6664
observeClickCurrentLocation()
6765
}
6866

69-
private fun handleActivityViewModels() {
70-
findNavController().currentBackStackEntry?.savedStateHandle?.getLiveData<Boolean>(
71-
AlarmSettingFragment.BACK_STACK_KEY
72-
)?.observe(viewLifecycleOwner) { isBackstackRestoredFromAlarmSetting ->
73-
if (isBackstackRestoredFromAlarmSetting) {
74-
requireActivity().viewModelStore.clear()
75-
}
76-
findNavController().currentBackStackEntry?.savedStateHandle?.remove<Boolean>(
77-
AlarmSettingFragment.BACK_STACK_KEY
78-
)
79-
}
80-
}
81-
8267
private fun initBinding() {
8368
binding.lifecycleOwner = viewLifecycleOwner
8469
binding.alarmViewModel = alarmViewModel
@@ -127,16 +112,14 @@ class MapFragment : Fragment(), MapHandler {
127112
binding.layoutPanel.findViewById<View>(R.id.view_panel_start).setOnClickListener {
128113
val navController = findNavController()
129114
navController.setGraph(R.navigation.route_nav_graph)
130-
val action = RouteNavGraphDirections.actionGlobalRouteFragment()
131-
.setStart(placeSearchViewModel.panelInfo)
115+
val action = RouteNavGraphDirections.actionGlobalRouteFragment().setStart(placeSearchViewModel.panelInfo)
132116
navController.navigate(action)
133117
}
134118

135119
binding.layoutPanel.findViewById<View>(R.id.view_panel_end).setOnClickListener {
136120
val navController = findNavController()
137121
navController.setGraph(R.navigation.route_nav_graph)
138-
val action = RouteNavGraphDirections.actionGlobalRouteFragment()
139-
.setEnd(placeSearchViewModel.panelInfo)
122+
val action = RouteNavGraphDirections.actionGlobalRouteFragment().setEnd(placeSearchViewModel.panelInfo)
140123
navController.navigate(action)
141124
}
142125
}
@@ -146,7 +129,7 @@ class MapFragment : Fragment(), MapHandler {
146129

147130
alarmViewModel.getAlarm()
148131

149-
alarmViewModel.isAlarmItemNotNull.asLiveData().observe(viewLifecycleOwner) {
132+
alarmViewModel.isAlarmItemNotNull.asLiveData().observe(viewLifecycleOwner){
150133
behavior.isDraggable = it
151134
}
152135

@@ -236,7 +219,7 @@ class MapFragment : Fragment(), MapHandler {
236219
}
237220
}
238221

239-
private fun listenButtonClick() {
222+
private fun listenButtonClick(){
240223
binding.homeBottomSheet.layoutStateExpanded.buttonAlarmTurnOff.setOnClickListener {
241224
alarmViewModel.deleteAlarm()
242225
val behavior = BottomSheetBehavior.from(binding.layoutHomeBottomSheet)

0 commit comments

Comments
 (0)