[FIX/#96] 컨플릭 수정

Team-Going · Jan 14, 2024 · b39d305 · b39d305
1 parent d2c8ce2
commit b39d305
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 10 deletions.
diff --git a/...a/com/going/presentation/entertrip/starttrip/createtrip/BottomSheetDateContentFragment.kt b/...a/com/going/presentation/entertrip/starttrip/createtrip/BottomSheetDateContentFragment.kt
@@ -53,7 +53,7 @@ class BottomSheetDateContentFragment(val viewModel: CreateTripViewModel, val isS
                 calendar.set(Calendar.DAY_OF_MONTH, viewModel.endDay.value ?: 0)
                 val endDate = calendar.time
 
-                if(startDate.before(endDate)) {
+                if (startDate.before(endDate)) {
                     dismiss()
                 } else {
                     toast(getString(R.string.create_trip_toast_error))

diff --git a/...ain/java/com/going/presentation/entertrip/starttrip/createtrip/EnterPreferenceActivity.kt b/...ain/java/com/going/presentation/entertrip/starttrip/createtrip/EnterPreferenceActivity.kt
@@ -1,4 +1,4 @@
-package com.going.presentation.preferencetag.entertrip
+package com.going.presentation.entertrip.starttrip.createtrip
 
 import android.content.Intent
 import android.os.Bundle

diff --git a/...in/java/com/going/presentation/entertrip/starttrip/createtrip/EnterPreferenceViewModel.kt b/...in/java/com/going/presentation/entertrip/starttrip/createtrip/EnterPreferenceViewModel.kt
@@ -1,4 +1,4 @@
-package com.going.presentation.preferencetag.entertrip
+package com.going.presentation.entertrip.starttrip.createtrip
 
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel

diff --git a/.../src/main/java/com/going/presentation/entertrip/starttrip/createtrip/EnterTripActivity.kt b/.../src/main/java/com/going/presentation/entertrip/starttrip/createtrip/EnterTripActivity.kt
@@ -10,8 +10,8 @@ import androidx.lifecycle.lifecycleScope
 import com.going.domain.entity.CodeState
 import com.going.presentation.R
 import com.going.presentation.databinding.ActivityEnterTripBinding
-import com.going.presentation.entertrip.starttrip.invitetrip.InviteFinishActivity
 import com.going.presentation.entertrip.starttrip.StartTripSplashActivity
+import com.going.presentation.entertrip.starttrip.invitetrip.InviteFinishActivity
 import com.going.ui.base.BaseActivity
 import com.going.ui.extension.UiState
 import com.going.ui.extension.setOnSingleClickListener

diff --git a/...src/main/java/com/going/presentation/entertrip/starttrip/createtrip/FinishTripActivity.kt b/...src/main/java/com/going/presentation/entertrip/starttrip/createtrip/FinishTripActivity.kt
@@ -7,8 +7,8 @@ import android.content.Intent
 import android.os.Bundle
 import androidx.activity.viewModels
 import com.going.presentation.R
+import com.going.presentation.dashboard.DashBoardActivity
 import com.going.presentation.databinding.ActivityFinishTripBinding
-import com.going.presentation.preferencetag.entertrip.EnterPreferenceActivity
 import com.going.ui.base.BaseActivity
 import com.going.ui.extension.setOnSingleClickListener
 
@@ -42,15 +42,14 @@ class FinishTripActivity :
 
     private fun initEnterTripBtnClickListener() {
         binding.btnFinishTripEnterTrip.setOnSingleClickListener {
-            Intent(this, EnterPreferenceActivity::class.java).apply {
+            Intent(this, DashBoardActivity::class.java).apply {
                 startActivity(this)
-                //입장 코드 받아서 보내기
             }
             finish()
         }
     }
 
-//    private fun checkDayLeft(){
+    //    private fun checkDayLeft(){
 //       그 전 뷰에서 서버 붙여서 보내주는 day 값 알게 되면 맞게 로직 구현하겠습니다
 //        if(dayLeft > 0) {
 //            binding.tvFinishTripDayLeft.text = dayLeft

diff --git a/...rc/main/java/com/going/presentation/entertrip/starttrip/createtrip/FinishTripViewModel.kt b/...rc/main/java/com/going/presentation/entertrip/starttrip/createtrip/FinishTripViewModel.kt
@@ -2,7 +2,7 @@ package com.going.presentation.entertrip.starttrip.createtrip
 
 import androidx.lifecycle.ViewModel
 
-class FinishTripViewModel : ViewModel(){
+class FinishTripViewModel : ViewModel() {
     val INVITE_CODE = "a1b2c3"
 }
 
diff --git a/...src/main/java/com/going/presentation/entertrip/starttrip/invitetrip/CreateTripActivity.kt b/...src/main/java/com/going/presentation/entertrip/starttrip/invitetrip/CreateTripActivity.kt
@@ -10,7 +10,7 @@ import com.going.presentation.R
 import com.going.presentation.databinding.ActivityCreateTripBinding
 import com.going.presentation.entertrip.starttrip.StartTripSplashActivity
 import com.going.presentation.entertrip.starttrip.createtrip.BottomSheetDateContentFragment
-import com.going.presentation.preferencetag.entertrip.EnterPreferenceActivity
+import com.going.presentation.entertrip.starttrip.createtrip.EnterPreferenceActivity
 import com.going.ui.base.BaseActivity
 import com.going.ui.extension.setOnSingleClickListener