refactor: MapFragment 리팩토링

Author: khcho226

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

@@ -53,7 +53,6 @@ class MapFragment : Fragment(), MapHandler {
         initTMap()
         initBottomSheetBehavior()
         initBottomSheetView()
-        listenButtonClick()
     }
 
     override fun alertTMapReady() {
@@ -116,7 +115,6 @@ class MapFragment : Fragment(), MapHandler {
                 )
             )
         }
-
     }
 
     private fun initNavigateAction() {
@@ -170,9 +168,12 @@ class MapFragment : Fragment(), MapHandler {
     private fun initBottomSheetView() {
         binding.homeBottomSheet.layoutStateExpanded.viewAlarm.setOnClickListener {
             val behavior = BottomSheetBehavior.from(binding.layoutHomeBottomSheet)
+            val intent = Intent(requireContext(), SoundService::class.java)
 
-            behavior.state = BottomSheetBehavior.STATE_COLLAPSED
             alarmViewModel.deleteAlarm()
+            behavior.state = BottomSheetBehavior.STATE_COLLAPSED
+            requireContext().stopService(intent)
+            SoundService.normalExit = true
         }
     }
 
@@ -243,40 +244,25 @@ class MapFragment : Fragment(), MapHandler {
         }
     }
 
-    private fun listenButtonClick() {
-        binding.homeBottomSheet.layoutStateExpanded.buttonAlarmTurnOff.setOnClickListener {
-            val behavior = BottomSheetBehavior.from(binding.layoutHomeBottomSheet)
-
-            behavior.state = BottomSheetBehavior.STATE_COLLAPSED
-            alarmViewModel.deleteAlarm()
-            turnOffSoundService()
-        }
-    }
-
-    private fun turnOffSoundService() {
-        val intent = Intent(requireContext(), SoundService::class.java)
-
-        requireContext().stopService(intent)
-        SoundService.normalExit = true
-    }
-
     override fun onResume() {
         super.onResume()
 
         requireActivity().intent.extras?.getInt("ALARM_MAP_CODE")?.let {
             if (it == ALARM_MAP_CODE) {
-                showBottomSheet()
+                openBottomSheet()
             }
         }
     }
 
-    private fun showBottomSheet() {
+    private fun openBottomSheet() {
         val behavior = BottomSheetBehavior.from(binding.layoutHomeBottomSheet)
 
         behavior.state = BottomSheetBehavior.STATE_EXPANDED
+        /*
         binding.homeBottomSheet.layoutStateExpanded.root.visibility = View.VISIBLE
         binding.homeBottomSheet.textViewAlarmState.visibility = View.GONE
         binding.homeBottomSheet.homeBottomSheetDragHandle.visibility = View.GONE
+        */
     }
 
     override fun onDestroyView() {

presentation/src/main/java/com/stop/ui/mission/MissionFragment.kt

@@ -108,7 +108,7 @@ class MissionFragment : Fragment(), MissionHandler {
     fun clickMissionOver() {
         Snackbar.make(requireActivity().findViewById(R.id.constraint_layout_container), "미션을 취소했습니다", Snackbar.LENGTH_SHORT).show()
         missionViewModel.isMissionOver.value = true
-       // findNavController().navigate(R.id.action_missionFragment_to_mapFragment)
+        findNavController().navigate(R.id.action_missionFragment_to_mapFragment)
     }
 
     override fun alertTMapReady() {