@@ -19,7 +19,6 @@ import com.stop.R
19
19
import com.stop.RouteNavGraphDirections
20
20
import com.stop.databinding.FragmentMapBinding
21
21
import com.stop.model.Location
22
- import com.stop.ui.alarmsetting.AlarmSettingFragment
23
22
import com.stop.ui.alarmsetting.AlarmSettingViewModel
24
23
import com.stop.ui.placesearch.PlaceSearchViewModel
25
24
import com.stop.ui.util.Marker
@@ -50,7 +49,6 @@ class MapFragment : Fragment(), MapHandler {
50
49
override fun onViewCreated (view : View , savedInstanceState : Bundle ? ) {
51
50
super .onViewCreated(view, savedInstanceState)
52
51
53
- handleActivityViewModels()
54
52
initTMap()
55
53
initView()
56
54
initNavigateAction()
@@ -66,19 +64,6 @@ class MapFragment : Fragment(), MapHandler {
66
64
observeClickCurrentLocation()
67
65
}
68
66
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
-
82
67
private fun initBinding () {
83
68
binding.lifecycleOwner = viewLifecycleOwner
84
69
binding.alarmViewModel = alarmViewModel
@@ -127,16 +112,14 @@ class MapFragment : Fragment(), MapHandler {
127
112
binding.layoutPanel.findViewById<View >(R .id.view_panel_start).setOnClickListener {
128
113
val navController = findNavController()
129
114
navController.setGraph(R .navigation.route_nav_graph)
130
- val action = RouteNavGraphDirections .actionGlobalRouteFragment()
131
- .setStart(placeSearchViewModel.panelInfo)
115
+ val action = RouteNavGraphDirections .actionGlobalRouteFragment().setStart(placeSearchViewModel.panelInfo)
132
116
navController.navigate(action)
133
117
}
134
118
135
119
binding.layoutPanel.findViewById<View >(R .id.view_panel_end).setOnClickListener {
136
120
val navController = findNavController()
137
121
navController.setGraph(R .navigation.route_nav_graph)
138
- val action = RouteNavGraphDirections .actionGlobalRouteFragment()
139
- .setEnd(placeSearchViewModel.panelInfo)
122
+ val action = RouteNavGraphDirections .actionGlobalRouteFragment().setEnd(placeSearchViewModel.panelInfo)
140
123
navController.navigate(action)
141
124
}
142
125
}
@@ -146,7 +129,7 @@ class MapFragment : Fragment(), MapHandler {
146
129
147
130
alarmViewModel.getAlarm()
148
131
149
- alarmViewModel.isAlarmItemNotNull.asLiveData().observe(viewLifecycleOwner) {
132
+ alarmViewModel.isAlarmItemNotNull.asLiveData().observe(viewLifecycleOwner){
150
133
behavior.isDraggable = it
151
134
}
152
135
@@ -236,7 +219,7 @@ class MapFragment : Fragment(), MapHandler {
236
219
}
237
220
}
238
221
239
- private fun listenButtonClick () {
222
+ private fun listenButtonClick (){
240
223
binding.homeBottomSheet.layoutStateExpanded.buttonAlarmTurnOff.setOnClickListener {
241
224
alarmViewModel.deleteAlarm()
242
225
val behavior = BottomSheetBehavior .from(binding.layoutHomeBottomSheet)
0 commit comments