[FEAT/#230] 여행 조회, 여행 수정, 여행 나가기 뷰 / 서버통신 구현

presentation/src/main/java/com/going/presentation/todo/edittrip/QuitTripDialogFragment.kt

@@ -43,8 +43,9 @@ class QuitTripDialogFragment :
     private fun initNegativeClickListener() {
         binding.tvDialogNegative.setOnSingleClickListener {
             viewModel.patchQuitTripFromServer()
-            val intent = Intent(requireActivity(), DashBoardActivity::class.java)
-            startActivity(intent)
+            Intent(requireActivity(), DashBoardActivity::class.java).apply {
+                requireActivity().startActivity(this)
+            }
         }
     }
 }

presentation/src/main/java/com/going/presentation/todo/edittrip/info/EditDateBottomSheet.kt

@@ -30,16 +30,16 @@ class EditDateBottomSheet(val isStart: Boolean) :
         val calendar = Calendar.getInstance()
         val datePicker = binding.dpEditTripDate.apply {
             updateDate(
-                viewModel.currentStartYear.value ?: calendar.get(Calendar.YEAR),
-                (viewModel.currentStartMonth.value ?: calendar.get(Calendar.MONTH)) - 1,
-                viewModel.currentStartDay.value ?: calendar.get(Calendar.DAY_OF_MONTH)
+                viewModel.currentStartYear ?: calendar.get(Calendar.YEAR),
+                (viewModel.currentStartMonth ?: calendar.get(Calendar.MONTH)) - 1,
+                viewModel.currentStartDay ?: calendar.get(Calendar.DAY_OF_MONTH)
             )
         }
-        if (viewModel.endYear.value != viewModel.currentEndYear.value || viewModel.endMonth.value != viewModel.currentEndMonth.value || viewModel.endDay.value != viewModel.currentEndDay.value) {
+        if (viewModel.endYear != viewModel.currentEndYear || viewModel.endMonth != viewModel.currentEndMonth || viewModel.endDay != viewModel.currentEndDay) {
             calendar.set(
-                viewModel.endYear.value ?: 0,
-                (viewModel.endMonth.value ?: 0) - 1,
-                viewModel.endDay.value ?: 0
+                viewModel.endYear ?: 0,
+                (viewModel.endMonth ?: 0) - 1,
+                viewModel.endDay ?: 0
             )
             datePicker.maxDate = calendar.timeInMillis
         } else {
@@ -52,16 +52,16 @@ class EditDateBottomSheet(val isStart: Boolean) :
         val calendar = Calendar.getInstance()
         val datePicker = binding.dpEditTripDate.apply {
             updateDate(
-                viewModel.currentEndYear.value ?: calendar.get(Calendar.YEAR),
-                (viewModel.currentEndMonth.value ?: calendar.get(Calendar.MONTH)) - 1,
-                viewModel.currentEndDay.value ?: calendar.get(Calendar.DAY_OF_MONTH)
+                viewModel.currentEndYear ?: calendar.get(Calendar.YEAR),
+                (viewModel.currentEndMonth ?: calendar.get(Calendar.MONTH)) - 1,
+                viewModel.currentEndDay ?: calendar.get(Calendar.DAY_OF_MONTH)
             )
         }
-        if (viewModel.startYear.value != viewModel.currentStartYear.value || viewModel.startMonth.value != viewModel.currentStartMonth.value || viewModel.startDay.value != viewModel.currentStartDay.value) {
+        if (viewModel.startYear != viewModel.currentStartYear || viewModel.startMonth != viewModel.currentStartMonth || viewModel.startDay != viewModel.currentStartDay) {
             calendar.set(
-                viewModel.startYear.value ?: 0,
-                (viewModel.startMonth.value ?: 0) - 1,
-                viewModel.startDay.value ?: 0
+                viewModel.startYear ?: 0,
+                (viewModel.startMonth ?: 0) - 1,
+                viewModel.startDay ?: 0
             )
             datePicker.minDate = calendar.timeInMillis
         } else {

presentation/src/main/java/com/going/presentation/todo/edittrip/info/EditTripInfoActivity.kt

@@ -51,26 +51,8 @@ class EditTripInfoActivity :
         viewModel.currentEndDate = intent.getStringExtra(END_DATE) ?: ""
 
         binding.etEditTripInfoName.editText.setText(viewModel.currentTitle)
-
-        val (startYear, startMonth, startDay) = splitDate(viewModel.currentStartDate)
-        viewModel.currentStartYear.value = startYear
-        viewModel.currentStartMonth.value = startMonth
-        viewModel.currentStartDay.value = startDay
-        viewModel.setStartDate(startYear, startMonth, startDay)
-
-        val (endYear, endMonth, endDay) = splitDate(viewModel.currentEndDate)
-        viewModel.currentEndYear.value = endYear
-        viewModel.currentEndMonth.value = endMonth
-        viewModel.currentEndDay.value = endDay
-        viewModel.setEndDate(endYear, endMonth, endDay)
-    }
-
-    fun splitDate(date: String): Triple<Int, Int, Int> {
-        val parts = date.split(".")
-        val year = parts[0].toInt()
-        val month = parts[1].toInt()
-        val day = parts[2].toInt()
-        return Triple(year, month, day)
+        viewModel.splitStartDate()
+        viewModel.splitEndDate()
     }
 
     private fun observePatchEditState() {
@@ -125,8 +107,9 @@ class EditTripInfoActivity :
     private fun initEditBtnClickListener() {
         binding.btnEditTripSave.setOnSingleClickListener {
             viewModel.patchTripInfoFromServer()
-            val intent = Intent(this, DashBoardActivity::class.java)
-            startActivity(intent)
+            Intent(this, DashBoardActivity::class.java).apply {
+                startActivity(this)
+            }
         }
     }
 
@@ -137,10 +120,10 @@ class EditTripInfoActivity :
     }
 
     companion object {
-        const val TRIP_ID = "TRIP_ID"
-        const val TITLE = "TITLE"
-        const val START_DATE = "START_DATE"
-        const val END_DATE = "END_DATE"
+        private const val TRIP_ID = "TRIP_ID"
+        private const val TITLE = "TITLE"
+        private const val START_DATE = "START_DATE"
+        private const val END_DATE = "END_DATE"
 
         @JvmStatic
         fun createIntent(

presentation/src/main/java/com/going/presentation/todo/edittrip/info/EditTripInfoViewModel.kt

@@ -27,23 +27,23 @@ class EditTripInfoViewModel @Inject constructor(
     var currentStartDate: String = ""
     var currentEndDate: String = ""
 
-    val title = MutableLiveData<String>()
-
-    var currentStartYear = MutableLiveData<Int>()
-    var currentStartMonth = MutableLiveData<Int>()
-    var currentStartDay = MutableLiveData<Int>()
-    var currentEndYear = MutableLiveData<Int>()
-    var currentEndMonth = MutableLiveData<Int>()
-    var currentEndDay = MutableLiveData<Int>()
-
-    val startYear = MutableLiveData<Int>()
-    val startMonth = MutableLiveData<Int>()
-    val startDay = MutableLiveData<Int>()
+    var title: String? = null
+
+    var currentStartYear: Int? = null
+    var currentStartMonth: Int? = null
+    var currentStartDay: Int? = null
+    var currentEndYear: Int? = null
+    var currentEndMonth: Int? = null
+    var currentEndDay: Int? = null
+
+    var startYear: Int? = null
+    var startMonth: Int? = null
+    var startDay: Int? = null
     var startDate = MutableLiveData<String>()
 
-    val endYear = MutableLiveData<Int>()
-    val endMonth = MutableLiveData<Int>()
-    val endDay = MutableLiveData<Int>()
+    var endYear: Int? = null
+    var endMonth: Int? = null
+    var endDay: Int? = null
     var endDate = MutableLiveData<String>()
 
     val isStartDateAvailable = MutableLiveData(false)
@@ -59,7 +59,7 @@ class EditTripInfoViewModel @Inject constructor(
             editTripRepository.patchEditTripInfo(
                 tripId,
                 EditTripRequestModel(
-                    title = title.value.orEmpty(),
+                    title = title.orEmpty(),
                     startDate = startDate.value.orEmpty(),
                     endDate = endDate.value.orEmpty()
                 )
@@ -73,31 +73,61 @@ class EditTripInfoViewModel @Inject constructor(
         }
     }
 
+    fun splitStartDate() {
+        val (startYear, startMonth, startDay) = splitDate(currentStartDate)
+        currentStartYear = startYear
+        currentStartMonth = startMonth
+        currentStartDay = startDay
+        setStartDate(startYear, startMonth, startDay)
+
+        val (endYear, endMonth, endDay) = splitDate(currentEndDate)
+        currentEndYear = endYear
+        currentEndMonth = endMonth
+        currentEndDay = endDay
+        setEndDate(endYear, endMonth, endDay)
+    }
+
+    fun splitEndDate() {
+        val (endYear, endMonth, endDay) = splitDate(currentEndDate)
+        currentEndYear = endYear
+        currentEndMonth = endMonth
+        currentEndDay = endDay
+        setEndDate(endYear, endMonth, endDay)
+    }
+
+    fun splitDate(date: String): Triple<Int, Int, Int> {
+        val parts = date.split(".")
+        val year = parts[0].toInt()
+        val month = parts[1].toInt()
+        val day = parts[2].toInt()
+        return Triple(year, month, day)
+    }
+
     fun setTitleState(newTitle: String, state: EditTextState) {
-        title.value = newTitle
+        title = newTitle
         isTitleAvailable.value = state == EditTextState.SUCCESS
         checkTripAvailable()
     }
 
     fun setStartDate(year: Int, month: Int, day: Int) {
-        startYear.value = year
-        startMonth.value = month
-        startDay.value = day
+        startYear = year
+        startMonth = month
+        startDay = day
         checkStartDateAvailable()
         startDate.value = String.format("%04d.%02d.%02d", year, month, day)
     }
 
 
     fun setEndDate(year: Int, month: Int, day: Int) {
-        endYear.value = year
-        endMonth.value = month
-        endDay.value = day
+        endYear = year
+        endMonth = month
+        endDay = day
         checkEndDateAvailable()
         endDate.value = String.format("%04d.%02d.%02d", year, month, day)
     }
 
     fun checkStartDateAvailable() {
-        if (startYear.value != null && startMonth.value != null && startDay.value != null) {
+        if (startYear != null && startMonth != null && startDay != null) {
             isStartDateAvailable.value = true
             checkTripAvailable()
         } else {
@@ -106,7 +136,7 @@ class EditTripInfoViewModel @Inject constructor(
     }
 
     fun checkEndDateAvailable() {
-        if (endYear.value != null && endMonth.value != null && endDay.value != null) {
+        if (endYear != null && endMonth != null && endDay != null) {
             isEndDateAvailable.value = true
             checkTripAvailable()
         } else {
@@ -115,8 +145,8 @@ class EditTripInfoViewModel @Inject constructor(
     }
 
     fun checkTripAvailable() {
-        isCheckTripAvailable.value = !title.value.isNullOrEmpty() && (
-                (title.value != null && currentTitle != title.value) ||
+        isCheckTripAvailable.value = !title.isNullOrEmpty() && (
+                (title != null && currentTitle != title) ||
                         currentStartDate != startDate.value ||
                         currentEndDate != endDate.value
                 )

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

@@ -58,7 +58,6 @@
             app:canBlankError="true"
             app:hint="@string/edit_trip_info_et_name_hint"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="0.0"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tb_edit_trip_info"
             app:title="@string/edit_trip_info_tv_title" />