feat : 알람 설정 화면 뷰 수정

Author: koreatlwls

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

@@ -1,13 +1,12 @@
 package com.stop.ui.alarmsetting
 
 import android.os.Bundle
-import android.transition.AutoTransition
-import android.transition.TransitionManager
 import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
+import androidx.fragment.app.activityViewModels
 import androidx.fragment.app.viewModels
 import androidx.navigation.findNavController
 import androidx.work.PeriodicWorkRequestBuilder
@@ -16,6 +15,7 @@ import com.stop.AlarmFunctions
 import com.stop.AlarmWorker
 import com.stop.R
 import com.stop.databinding.FragmentAlarmSettingBinding
+import com.stop.ui.route.RouteViewModel
 import dagger.hilt.android.AndroidEntryPoint
 import java.util.concurrent.TimeUnit
 
@@ -26,6 +26,7 @@ class AlarmSettingFragment : Fragment() {
     private val binding get() = _binding!!
 
     private val alarmSettingViewModel by viewModels<AlarmSettingViewModel>()
+    private val routeViewModel by activityViewModels<RouteViewModel>()
 
     private lateinit var alarmFunctions: AlarmFunctions
 
@@ -45,14 +46,16 @@ class AlarmSettingFragment : Fragment() {
 
         alarmFunctions = AlarmFunctions(requireActivity())
         initView()
-        setButtonListener()
         setToggleListener()
+
+        // TODO 뷰모델 가져와서 경로 막차시간 등 연결 작업해야함
     }
 
     private fun initBinding() {
         binding.apply {
             lifecycleOwner = viewLifecycleOwner
-            viewModel = alarmSettingViewModel
+            alarmViewModel = alarmSettingViewModel
+            routeViewModel = routeViewModel
             fragment = this@AlarmSettingFragment
         }
     }
@@ -66,37 +69,6 @@ class AlarmSettingFragment : Fragment() {
             numberPickerAlarmTime.maxValue = 60
 
             buttonSound.isCheckable = true
-            buttonMissionOn.isCheckable = true
-        }
-    }
-
-    private fun setButtonListener() {
-        with(binding) {
-            textViewRouteContent.setOnClickListener {
-                if (textViewTransportContent.visibility == View.VISIBLE) {
-                    setTransportViewGone()
-                } else {
-                    setTransportViewVisible()
-                }
-            }
-        }
-    }
-
-    private fun setTransportViewGone() {
-        with(binding) {
-            TransitionManager.beginDelayedTransition(cardViewRoute, AutoTransition())
-            textViewTransportContent.visibility = View.GONE
-            textViewRouteContent.setCompoundDrawables(null, null, null, null)
-            textViewRouteContent.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_baseline_keyboard_arrow_down_24, 0)
-        }
-    }
-
-    private fun setTransportViewVisible() {
-        with(binding) {
-            TransitionManager.beginDelayedTransition(cardViewRoute, AutoTransition())
-            textViewTransportContent.visibility = View.VISIBLE
-            textViewRouteContent.setCompoundDrawables(null, null, null, null)
-            textViewRouteContent.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_baseline_keyboard_arrow_up_24, 0)
         }
     }
 
@@ -110,15 +82,6 @@ class AlarmSettingFragment : Fragment() {
                     }
                 }
             }
-
-            toggleGroupMission.addOnButtonCheckedListener { _, checkedId, isChecked ->
-                if (isChecked) {
-                    when (checkedId) {
-                        R.id.button_mission_on -> alarmSettingViewModel.isMission = true
-                        else -> alarmSettingViewModel.isMission = false
-                    }
-                }
-            }
         }
     }
 

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

@@ -1,6 +1,5 @@
 package com.stop.ui.alarmsetting
 
-import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
@@ -9,6 +8,8 @@ import com.stop.domain.usecase.alarm.GetAlarmUseCase
 import com.stop.domain.usecase.alarm.SaveAlarmUseCase
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.launch
 import javax.inject.Inject
@@ -20,36 +21,36 @@ class AlarmSettingViewModel @Inject constructor(
 ) : ViewModel() {
 
     val alarmTime = MutableLiveData(0)
+    var alarmMethod = true
 
-    //TODO TEST 코드
-    private val _alarmUseCaseItem = MutableLiveData<AlarmUseCaseItem?>()
-    val alarmUseCaseItem: LiveData<AlarmUseCaseItem?> = _alarmUseCaseItem
+    private val _alarmItem = MutableStateFlow<AlarmUseCaseItem?>(null)
+    val alarmItem : StateFlow<AlarmUseCaseItem?> = _alarmItem
 
-    var alarmMethod = true
-    var isMission = true
+    private val _isAlarmItemNotNull = MutableStateFlow(false)
+    val isAlarmItemNotNull : StateFlow<Boolean> = _isAlarmItemNotNull
 
     fun saveAlarm() {
         val alarmUseCaseItem = AlarmUseCaseItem(
             "쑥고개로 2다길 1",
             "현대 아남타워",
             listOf("도보", "버스5517", "신림역", "선릉역", "도보"),
-            "23:30",
+            "23:30:00",
             alarmTime.value ?: 0,
             123,
-            alarmMethod,
-            isMission
+            alarmMethod
         )
 
         viewModelScope.launch(Dispatchers.IO) {
             saveAlarmUseCase.saveAlarm(alarmUseCaseItem)
         }
     }
 
-    // TODO TEST 코드
     fun getAlarm() {
-        viewModelScope.launch(Dispatchers.IO) {
+        viewModelScope.launch(Dispatchers.IO){
             getAlarmUseCase.getAlarm().collectLatest {
-                _alarmUseCaseItem.postValue(it)
+                _alarmItem.value = it
+
+                _isAlarmItemNotNull.value = it != null
             }
         }
     }