[FEAT/#37] splash 기능 구현 완료

Team-Going · Jan 8, 2024 · e76cd69 · e76cd69
1 parent ca00107
commit e76cd69
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/presentation/src/main/java/com/going/presentation/starttrip/StartTripSplashActivity.kt b/presentation/src/main/java/com/going/presentation/starttrip/StartTripSplashActivity.kt
@@ -22,8 +22,8 @@ class StartTripSplashActivity :
             Intent(this, CreateTripActivity::class.java).apply {
                 startActivity(this)
             }
+            finish()
         }
-        finish()
     }
 
     private fun initEnterTripBtnClickListener() {

diff --git a/presentation/src/main/java/com/going/presentation/starttrip/createtrip/CreateTripActivity.kt b/presentation/src/main/java/com/going/presentation/starttrip/createtrip/CreateTripActivity.kt
@@ -1,12 +1,14 @@
 package com.going.presentation.starttrip.createtrip
 
+import android.content.Intent
 import android.os.Bundle
 import android.widget.TextView
 import androidx.activity.viewModels
 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.starttrip.StartTripSplashActivity
 import com.going.ui.base.BaseActivity
 import com.going.ui.extension.setOnSingleClickListener
 
@@ -20,6 +22,7 @@ class CreateTripActivity :
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
+        initBackBtnClickListener()
         initBindingViewModel()
         observeIsNameAvailable()
         observeCheckStartDateAvailable()
@@ -29,6 +32,14 @@ class CreateTripActivity :
         initNextBtnClickListener()
     }
 
+    private fun initBackBtnClickListener(){
+        binding.tbCreateTrip.setNavigationOnClickListener() {
+            Intent(this, StartTripSplashActivity::class.java).apply {
+                startActivity(this)
+            }
+            finish()
+        }
+    }
     private fun initBindingViewModel() {
         binding.viewModel = viewModel
     }

diff --git a/presentation/src/main/res/layout/activity_start_trip_splash.xml b/presentation/src/main/res/layout/activity_start_trip_splash.xml
@@ -6,11 +6,10 @@
 
     </data>
 
-    <androidx.constraintlayout.widget.ConstraintLayout xmlns:tools="http://schemas.android.com/tools"
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/white_000"
-        tools:context=".starttrip.StartTripSplashActivity">
+        android:background="@color/white_000">
 
         <androidx.appcompat.widget.Toolbar
             android:id="@+id/tb_start_trip_splash"