[FEAT/#96] 액티비티 연결

presentation/src/main/java/com/going/presentation/dashboard/DashBoardActivity.kt

@@ -1,10 +1,13 @@
 package com.going.presentation.dashboard
 
+import android.content.Intent
 import android.os.Bundle
 import androidx.activity.viewModels
 import com.going.presentation.R
 import com.going.presentation.databinding.ActivityTripDashBoardBinding
+import com.going.presentation.entertrip.starttrip.invitetrip.CreateTripActivity
 import com.going.ui.base.BaseActivity
+import com.going.ui.extension.setOnSingleClickListener
 import com.google.android.material.tabs.TabLayoutMediator
 import dagger.hilt.android.AndroidEntryPoint
 
@@ -22,6 +25,7 @@ class DashBoardActivity :
         setTabLayout()
         setViewPager()
         setTravelerName()
+        initCreateTripBtnClickListener()
 
     }
 
@@ -51,6 +55,14 @@ class DashBoardActivity :
         }
     }
 
+    private fun initCreateTripBtnClickListener() {
+        binding.btnDashboardCreateTrip.setOnSingleClickListener {
+            Intent(this, CreateTripActivity::class.java).apply {
+                startActivity(this)
+            }
+        }
+    }
+
     companion object {
         const val TAB_ONGOING = "진행중인 여행"
         const val TAB_COMPLETED = "지나간 여행"

presentation/src/main/java/com/going/presentation/entertrip/starttrip/createtrip/EnterPreferenceActivity.kt

@@ -9,11 +9,11 @@ import androidx.lifecycle.lifecycleScope
 import com.going.domain.entity.PreferenceData
 import com.going.presentation.R
 import com.going.presentation.databinding.ActivityEnterPreferenceBinding
+import com.going.presentation.entertrip.starttrip.createtrip.EnterTripActivity.Companion.CODE
 import com.going.presentation.entertrip.starttrip.createtrip.EnterTripActivity.Companion.DAY
 import com.going.presentation.entertrip.starttrip.createtrip.EnterTripActivity.Companion.END
 import com.going.presentation.entertrip.starttrip.createtrip.EnterTripActivity.Companion.START
 import com.going.presentation.entertrip.starttrip.createtrip.EnterTripActivity.Companion.TITLE
-import com.going.presentation.entertrip.starttrip.createtrip.FinishTripActivity
 import com.going.presentation.entertrip.starttrip.invitetrip.CreateTripActivity.Companion.END_DAY
 import com.going.presentation.entertrip.starttrip.invitetrip.CreateTripActivity.Companion.END_MONTH
 import com.going.presentation.entertrip.starttrip.invitetrip.CreateTripActivity.Companion.END_YEAR
@@ -120,6 +120,7 @@ class EnterPreferenceActivity :
                         putExtra(TITLE, state.data.title)
                         putExtra(START, state.data.startDate)
                         putExtra(END, state.data.endDate)
+                        putExtra(CODE, state.data.code)
                         putExtra(DAY, state.data.day)
                         startActivity(this)
                     }

presentation/src/main/java/com/going/presentation/entertrip/starttrip/createtrip/EnterTripActivity.kt

@@ -123,6 +123,7 @@ class EnterTripActivity : BaseActivity<ActivityEnterTripBinding>(R.layout.activi
         const val TITLE = "title"
         const val START = "start"
         const val END = "end"
+        const val CODE = "code"
         const val DAY = "day"
     }
 

presentation/src/main/java/com/going/presentation/entertrip/starttrip/createtrip/FinishTripActivity.kt

@@ -5,31 +5,40 @@ import android.content.ClipboardManager
 import android.content.Context
 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.entertrip.starttrip.createtrip.EnterTripActivity.Companion.DAY
+import com.going.presentation.entertrip.starttrip.createtrip.EnterTripActivity.Companion.END
+import com.going.presentation.entertrip.starttrip.createtrip.EnterTripActivity.Companion.START
+import com.going.presentation.entertrip.starttrip.createtrip.EnterTripActivity.Companion.TITLE
+import com.going.presentation.entertrip.starttrip.invitetrip.InviteFinishActivity.Companion.DATE_FORMAT
+import com.going.presentation.entertrip.starttrip.invitetrip.InviteFinishActivity.Companion.D_DAY_FORMAT
+import com.going.presentation.entertrip.starttrip.invitetrip.InviteFinishActivity.Companion.TRIP_FORMAT
 import com.going.ui.base.BaseActivity
 import com.going.ui.extension.setOnSingleClickListener
+import com.kakao.sdk.auth.Constants.CODE
 
 class FinishTripActivity :
     BaseActivity<ActivityFinishTripBinding>(R.layout.activity_finish_trip) {
-    private val viewModel by viewModels<FinishTripViewModel>()
+
+    private var inviteCode: String? = ""
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
+        getTripInfo()
         initCopyCodetvClickListener()
         initSendCodeBtnClickListener()
         initEnterTripBtnClickListener()
-        //checkDayLeft()
+
     }
 
     private fun initCopyCodetvClickListener() {
         binding.tvFinishTripTermsText.setOnSingleClickListener {
             val clipboardManager =
                 this.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
-            val clipData = ClipData.newPlainText("INVITE_CODE_LABEL", viewModel.INVITE_CODE)
+            val clipData = ClipData.newPlainText("INVITE_CODE_LABEL", inviteCode)
             clipboardManager.setPrimaryClip(clipData)
         }
     }
@@ -49,16 +58,27 @@ class FinishTripActivity :
         }
     }
 
-    //    private fun checkDayLeft(){
-//       그 전 뷰에서 서버 붙여서 보내주는 day 값 알게 되면 맞게 로직 구현하겠습니다
-//        if(dayLeft > 0) {
-//            binding.tvFinishTripDayLeft.text = dayLeft
-//        }else{
-//            binding.tvFinishTripDayLeft.text =
-//        }
-//    }
-    companion object {
-        const val INVITE_CODE_LABEL = "Invite Code"
+    private fun getTripInfo() {
+        val intent = getIntent()
+
+        if (intent != null) {
+            val title = intent.getStringExtra(TITLE)
+            val start = intent.getStringExtra(START)
+            val end = intent.getStringExtra(END)
+            val code = intent.getStringExtra(CODE)
+            val day = intent.getIntExtra(DAY, 0)
+
+            binding.tvFinishTripName.text = title
+            binding.tvFinishTripDay.text = String.format(DATE_FORMAT, start, end)
+            binding.tvInviteCode.text = code
+
+            if (day > 0) {
+                binding.tvFinishTripDayLeft.text = String.format(D_DAY_FORMAT, day)
+            } else {
+                binding.tvFinishTripDayLeft.text = TRIP_FORMAT
+            }
+        }
     }
+
 }
 

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

@@ -5,9 +5,6 @@
 
     <data>
 
-        <variable
-            name="viewModel"
-            type="com.going.presentation.entertrip.starttrip.createtrip.FinishTripViewModel" />
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout

presentation/src/main/res/values/strings.xml

@@ -106,7 +106,7 @@
     <!--trip_dash_board-->
     <string name="dashboard_tv_title">%s님의 여행</string>
     <string name="dashboard_tv_empty">새로운 여행을 시작해 보세요</string>
-    <string name="dashboard_btn_create_trip">여행 생성하기</string>
+    <string name="dashboard_btn_create_trip">여행 추가하기</string>
     <string name="dashboard_tv_completed_trip">여행종료</string>
     <string name="dashboard_tv_dash">-</string>
     <string name="dashboard_tv_deadline">D - %d</string>