[CHORE/#105] 페이지 이동 작업

Team-Going · Jan 14, 2024 · 2738cac · 2738cac
1 parent a474215
commit 2738cac
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 24 deletions.
diff --git a/presentation/src/main/java/com/going/presentation/dashboard/DashBoardActivity.kt b/presentation/src/main/java/com/going/presentation/dashboard/DashBoardActivity.kt
@@ -76,6 +76,7 @@ class DashBoardActivity :
 
     private fun navigateToDashboard() {
         Intent(this, CreateTripActivity::class.java).apply {
+            addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
             startActivity(this)
         }
     }

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,7 +10,6 @@ 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.StartTripSplashActivity
 import com.going.presentation.entertrip.starttrip.invitetrip.InviteFinishActivity
 import com.going.ui.base.BaseActivity
 import com.going.ui.extension.UiState
@@ -32,15 +31,10 @@ class EnterTripActivity : BaseActivity<ActivityEnterTripBinding>(R.layout.activi
         observeIsCodeAvailable()
         initNextBtnClickListener()
         observeEnterTripState()
-
-
     }
 
     private fun initBackBtnClickListener() {
         binding.btnEnterBack.setOnSingleClickListener {
-            Intent(this, StartTripSplashActivity::class.java).apply {
-                startActivity(this)
-            }
             finish()
         }
     }
@@ -85,12 +79,10 @@ class EnterTripActivity : BaseActivity<ActivityEnterTripBinding>(R.layout.activi
         counter.setTextColor(getColor(color))
     }
 
-
     private fun observeEnterTripState() {
         viewModel.tripState.flowWithLifecycle(lifecycle).onEach { state ->
             when (state) {
                 is UiState.Success -> {
-
                     Intent(this, InviteFinishActivity::class.java).apply {
                         putExtra(TRIP_ID, state.data.tripId)
                         putExtra(TITLE, state.data.title)
@@ -126,5 +118,4 @@ class EnterTripActivity : BaseActivity<ActivityEnterTripBinding>(R.layout.activi
         const val CODE = "code"
         const val DAY = "day"
     }
-
 }
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
@@ -8,7 +8,6 @@ import androidx.core.content.res.ResourcesCompat
 import com.going.domain.entity.NameState
 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.entertrip.starttrip.createtrip.EnterPreferenceActivity
 import com.going.ui.base.BaseActivity
@@ -37,9 +36,7 @@ class CreateTripActivity :
 
     private fun initBackBtnClickListener() {
         binding.tbCreateTrip.setOnSingleClickListener {
-            Intent(this, StartTripSplashActivity::class.java).apply {
-                startActivity(this)
-            }
+            finish()
         }
     }
 
@@ -76,14 +73,12 @@ class CreateTripActivity :
         }
     }
 
-
     private fun observeCheckStartDateAvailable() {
         viewModel.isStartDateAvailable.observe(this) { isAvailable ->
             if (isAvailable) {
                 setStartDateColors(
-                    binding.tvCreateTripStartDate
-                )
-                { background ->
+                    binding.tvCreateTripStartDate,
+                ) { background ->
                     binding.tvCreateTripStartDate.background = ResourcesCompat.getDrawable(
                         this.resources,
                         background,
@@ -98,9 +93,8 @@ class CreateTripActivity :
         viewModel.isEndDateAvailable.observe(this) { isAvailable ->
             if (isAvailable) {
                 setEndDateColors(
-                    binding.tvCreateTripEndDate
-                )
-                { background ->
+                    binding.tvCreateTripEndDate,
+                ) { background ->
                     binding.tvCreateTripEndDate.background = ResourcesCompat.getDrawable(
                         this.resources,
                         background,
@@ -159,7 +153,6 @@ class CreateTripActivity :
         counter.setTextColor(getColor(color))
     }
 
-
     private fun initStartDateClickListener() {
         binding.tvCreateTripStartDate.setOnSingleClickListener {
             startBottomSheetDialog = BottomSheetDateContentFragment(viewModel, true)
@@ -199,6 +192,3 @@ class CreateTripActivity :
         const val END_DAY = "endDay"
     }
 }
-
-
-