feat : 알람 바텀시트 연결 준비

Author: koreatlwls

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

@@ -9,6 +9,7 @@ import android.view.ViewGroup
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
+import androidx.lifecycle.asLiveData
 import androidx.lifecycle.flowWithLifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.findNavController
@@ -17,7 +18,7 @@ import com.skt.tmap.TMapPoint
 import com.stop.R
 import com.stop.databinding.FragmentMapBinding
 import com.stop.model.Location
-import com.stop.ui.alarmsetting.AlarmViewModel
+import com.stop.ui.alarmsetting.AlarmSettingViewModel
 import com.stop.ui.placesearch.PlaceSearchViewModel
 import com.stop.ui.util.Marker
 import kotlinx.coroutines.launch
@@ -26,7 +27,7 @@ class MapFragment : Fragment(), MapHandler {
     private var _binding: FragmentMapBinding? = null
     private val binding get() = _binding!!
 
-    private val alarmViewModel: AlarmViewModel by activityViewModels()
+    private val alarmViewModel: AlarmSettingViewModel by activityViewModels()
     private val placeSearchViewModel: PlaceSearchViewModel by activityViewModels()
 
     private lateinit var tMap: MapTMap
@@ -46,6 +47,7 @@ class MapFragment : Fragment(), MapHandler {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
+        alarmViewModel.getAlarm()
         initTMap()
         initView()
         initNavigateAction()
@@ -98,11 +100,6 @@ class MapFragment : Fragment(), MapHandler {
             )
         }
 
-        binding.layoutBookmark.setOnClickListener {
-            alarmViewModel.isBottomSheetVisible.value?.let {
-                alarmViewModel.setVisibility(it)
-            }
-        }
     }
 
     private fun initNavigateAction() {
@@ -131,7 +128,7 @@ class MapFragment : Fragment(), MapHandler {
     private fun initBottomSheetBehavior() {
         val behavior = BottomSheetBehavior.from(binding.layoutHomeBottomSheet)
 
-        alarmViewModel.isBottomSheetVisible.observe(viewLifecycleOwner) { isBottomSheetVisible ->
+        alarmViewModel.isAlarmItemNotNull.asLiveData().observe(viewLifecycleOwner) { isBottomSheetVisible ->
             if (isBottomSheetVisible) {
                 behavior.state = BottomSheetBehavior.STATE_EXPANDED
                 behavior.maxHeight = convertDpToPx(200)

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

@@ -10,7 +10,7 @@
 
         <variable
             name="alarmViewModel"
-            type="com.stop.ui.alarmsetting.AlarmViewModel" />
+            type="com.stop.ui.alarmsetting.AlarmSettingViewModel" />
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout
@@ -70,6 +70,7 @@
                 android:id="@+id/home_panel"
                 layout="@layout/home_panel"
                 bind:placeSearchViewModel="@{placeSearchViewModel}" />
+
         </androidx.constraintlayout.widget.ConstraintLayout>
 
         <androidx.constraintlayout.widget.ConstraintLayout
@@ -102,6 +103,7 @@
                 app:layout_constraintTop_toTopOf="@id/layout_search"
                 app:layout_constraintBottom_toBottomOf="@id/layout_search"
                 app:srcCompat="@drawable/ic_search" />
+
         </androidx.constraintlayout.widget.ConstraintLayout>
 
         <androidx.constraintlayout.widget.ConstraintLayout
@@ -124,6 +126,7 @@
                 app:layout_constraintTop_toTopOf="@id/layout_compass"
                 app:layout_constraintBottom_toBottomOf="@id/layout_compass"
                 app:srcCompat="@drawable/ic_compass" />
+
         </androidx.constraintlayout.widget.ConstraintLayout>
 
         <androidx.constraintlayout.widget.ConstraintLayout
@@ -146,6 +149,7 @@
                 app:layout_constraintTop_toTopOf="@id/layout_current"
                 app:layout_constraintBottom_toBottomOf="@id/layout_current"
                 app:srcCompat="@drawable/ic_location" />
+
         </androidx.constraintlayout.widget.ConstraintLayout>
 
         <androidx.constraintlayout.widget.ConstraintLayout
@@ -167,6 +171,7 @@
                 app:layout_constraintTop_toTopOf="@id/layout_bookmark"
                 app:layout_constraintBottom_toBottomOf="@id/layout_bookmark"
                 app:srcCompat="@drawable/ic_bookmark" />
+
         </androidx.constraintlayout.widget.ConstraintLayout>
 
         <androidx.coordinatorlayout.widget.CoordinatorLayout
@@ -186,7 +191,11 @@
                     android:id="@+id/home_bottom_sheet"
                     layout="@layout/home_bottom_sheet"
                     bind:alarmViewModel="@{alarmViewModel}" />
+
             </androidx.constraintlayout.widget.ConstraintLayout>
+
         </androidx.coordinatorlayout.widget.CoordinatorLayout>
+
     </androidx.constraintlayout.widget.ConstraintLayout>
+
 </layout>

presentation/src/main/res/layout/fragment_map.xml

@@ -7,7 +7,7 @@
 
         <variable
             name="alarmViewModel"
-            type="com.stop.ui.alarmsetting.AlarmViewModel" />
+            type="com.stop.ui.alarmsetting.AlarmSettingViewModel" />
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout
@@ -29,7 +29,7 @@
             android:id="@+id/home_bottom_sheet_no_alarm"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:visibility="@{alarmViewModel.isBottomSheetVisible ? View.GONE : View.VISIBLE}"
+            android:visibility="@{alarmViewModel.isAlarmItemNotNull() ? View.GONE : View.VISIBLE}"
             app:layout_constraintTop_toBottomOf="@id/home_bottom_sheet_drag_handle">
 
             <TextView
@@ -45,6 +45,9 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintBottom_toBottomOf="parent"/>
+
         </androidx.constraintlayout.widget.ConstraintLayout>
+
     </androidx.constraintlayout.widget.ConstraintLayout>
+
 </layout>

presentation/src/main/res/layout/home_bottom_sheet.xml

@@ -26,7 +26,7 @@
     <string name="off_text">OFF</string>
     <string name="last_transport_arrival_time">막차가 %1$d시 %2$d분에 도착할 예정이에요!!</string>
     <string name="last_transport_walking_time">막차까지 도보 시간이 %1$d분 소요될것으로 예상돼요!!</string>
-    <string name="alarm_time_text">알람이 막차시간 %1$d분 전에\n울리도록 설정하시겠습니까?</string>
+    <string name="alarm_time_text">알람이 막차시간\n%1$d분 전에\n울리도록 설정하시겠습니까?</string>
     <string name="register_alarm_text">알람 등록</string>
     <string name="search_hint">장소, 주소 검색</string>
     <string name="expected_last_arrival_time">막차 도착 예정 시간</string>
@@ -38,4 +38,6 @@
     <string name="no_end_input">도착지가 입력되지 않았습니다.</string>
     <string name="km">km</string>
     <string name="no_alarm">현재 등록된 막차 알림이 없습니다.</string>
+    <string name="start_position_text">출발지 : %1$s</string>
+    <string name="end_position_text">도착지 : %1$s</string>
 </resources>