Skip to content

Commit 347aeb0

Browse files
committed
fix : conflict 해결
1 parent d92c349 commit 347aeb0

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ class MapFragment : Fragment(), MapHandler {
7070
binding.lifecycleOwner = viewLifecycleOwner
7171
binding.alarmViewModel = alarmViewModel
7272
binding.placeSearchViewModel = placeSearchViewModel
73+
binding.fragment = this@MapFragment
7374
}
7475

7576
private fun initTMap() {
@@ -131,7 +132,7 @@ class MapFragment : Fragment(), MapHandler {
131132

132133
alarmViewModel.getAlarm()
133134

134-
alarmViewModel.isAlarmItemNotNull.asLiveData().observe(viewLifecycleOwner){
135+
alarmViewModel.isAlarmItemNotNull.asLiveData().observe(viewLifecycleOwner) {
135136
behavior.isDraggable = it
136137
}
137138

@@ -221,7 +222,7 @@ class MapFragment : Fragment(), MapHandler {
221222
}
222223
}
223224

224-
private fun listenButtonClick(){
225+
private fun listenButtonClick() {
225226
binding.homeBottomSheet.layoutStateExpanded.buttonAlarmTurnOff.setOnClickListener {
226227
alarmViewModel.deleteAlarm()
227228
turnOffSoundService()
@@ -249,6 +250,10 @@ class MapFragment : Fragment(), MapHandler {
249250
}
250251
}
251252

253+
fun setMissionStart() {
254+
findNavController().navigate(R.id.action_mapFragment_to_missionFragment)
255+
}
256+
252257
companion object {
253258
private val PERMISSIONS =
254259
arrayOf(permission.ACCESS_FINE_LOCATION, permission.ACCESS_COARSE_LOCATION)

0 commit comments

Comments
 (0)