fix: conflict 해결

Author: khcho226

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

@@ -163,18 +163,23 @@ class MapFragment : Fragment(), MapHandler {
             override fun onStateChanged(bottomSheet: View, newState: Int) = Unit
 
             override fun onSlide(bottomSheet: View, slideOffset: Float) {
-                binding.homeBottomSheet.layoutStateExpanded.layoutBottomSheetHomeStateExpanded.alpha = slideOffset
-                binding.homeBottomSheet.textViewAlarmState.alpha = 1 - slideOffset
+                with (binding.homeBottomSheet) {
+                    layoutStateExpanded.layoutBottomSheetHomeStateExpanded.alpha = slideOffset
+                    textViewAlarmState.alpha = 1 - slideOffset
+                }
             }
         })
     }
 
     private fun initBottomSheetView() {
         binding.homeBottomSheet.layoutStateExpanded.viewAlarm.setOnClickListener {
+            val notificationManager =
+                requireContext().getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
             val behavior = BottomSheetBehavior.from(binding.layoutHomeBottomSheet)
             val intent = Intent(requireContext(), SoundService::class.java)
 
             alarmViewModel.deleteAlarm()
+            notificationManager.cancel(AlarmSettingFragment.ALARM_NOTIFICATION_HIGH_ID)
             behavior.state = BottomSheetBehavior.STATE_COLLAPSED
             requireContext().stopService(intent)
             SoundService.normalExit = true
@@ -241,34 +246,13 @@ class MapFragment : Fragment(), MapHandler {
     }
 
     private fun setViewVisibility() {
-        with (binding) {
+        with(binding) {
             textViewSearch.visibility = mapUIVisibility
             layoutCompass.visibility = mapUIVisibility
             layoutCurrent.visibility = mapUIVisibility
         }
     }
 
-    private fun listenButtonClick() {
-        binding.homeBottomSheet.layoutStateExpanded.buttonAlarmTurnOff.setOnClickListener {
-            alarmViewModel.deleteAlarm()
-            cancelNotification()
-            turnOffSoundService()
-            val behavior = BottomSheetBehavior.from(binding.layoutHomeBottomSheet)
-            behavior.state = BottomSheetBehavior.STATE_COLLAPSED
-        }
-    }
-
-    private fun cancelNotification() {
-        val notificationManager = requireContext().getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
-        notificationManager.cancel(AlarmSettingFragment.ALARM_NOTIFICATION_HIGH_ID)
-    }
-
-    private fun turnOffSoundService() {
-        val intent = Intent(requireContext(), SoundService::class.java)
-        requireContext().stopService(intent)
-        SoundService.normalExit = true
-    }
-
     override fun onResume() {
         super.onResume()
 

presentation/src/main/res/values/strings.xml

@@ -80,7 +80,7 @@
     <string name="end_position_text">도착지 : %1$s</string>
     <string name="last_time_text">막차시간 : %1$s</string>
     <string name="walk_time_text">%1$d분</string>
-    <string name="alarm_last_notification_text">막차시간 %1$s에서 %2$s분 전에 알람이 울릴예정입니다.</string>
+    <string name="alarm_last_notification_text">알람이 %1$s의 %2$s분 전에 울릴 예정입니다.</string>
     <string name="last_time_not_found">알람을 설정할 수 없습니다</string>
     <string name="minute_before">분 전</string>
     <string name="option_setting">옵션 설정</string>