From d1b4756607d79e449f44b9fe5affcbdbbbbea079 Mon Sep 17 00:00:00 2001 From: crownjoe Date: Fri, 12 Jan 2024 22:38:32 +0900 Subject: [PATCH 1/2] =?UTF-8?q?[FEAT/#86]=20CreateTrip=EC=97=90=EC=84=9C?= =?UTF-8?q?=20Intent=20=EB=B3=B4=EB=82=B4=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../createtrip/CreateTripActivity.kt | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) 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 index 0d17f484..23bfe80f 100644 --- a/presentation/src/main/java/com/going/presentation/starttrip/createtrip/CreateTripActivity.kt +++ b/presentation/src/main/java/com/going/presentation/starttrip/createtrip/CreateTripActivity.kt @@ -8,6 +8,7 @@ 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.preferencetag.PreferenceTagActivity import com.going.presentation.starttrip.StartTripSplashActivity import com.going.ui.base.BaseActivity import com.going.ui.extension.setOnSingleClickListener @@ -174,9 +175,25 @@ class CreateTripActivity : private fun initNextBtnClickListener() { binding.btnCreateTripNext.setOnSingleClickListener { - //다음으로 넘어감 + Intent(this, PreferenceTagActivity::class.java).apply { + putExtra(NAME, viewModel.name.value) + putExtra(START, viewModel.startYear.value) + + putExtra(START, viewModel.startMonth.value) + putExtra(START, viewModel.startDay.value) + putExtra(END, viewModel.endYear.value) + putExtra(END, viewModel.endMonth.value) + putExtra(END, viewModel.endDay.value) + startActivity(this) + } } } + + companion object { + const val NAME = "name" + const val START = "start" + const val END = "end" + } } From 98ae36ac3554f08c1ece745a874a507fe7822e4f Mon Sep 17 00:00:00 2001 From: crownjoe Date: Fri, 12 Jan 2024 22:53:49 +0900 Subject: [PATCH 2/2] =?UTF-8?q?[FEAT/#86]=20finish=EB=B7=B0=EC=97=90?= =?UTF-8?q?=EC=84=9C=20=EB=9C=A8=EB=8A=94=20preference=20=EB=B7=B0=20?= =?UTF-8?q?=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../going/presentation/enter/FinishPreferenceActivity.kt | 4 ++++ .../src/main/res/layout/activity_finish_preference.xml | 6 ++++++ 2 files changed, 10 insertions(+) create mode 100644 presentation/src/main/java/com/going/presentation/enter/FinishPreferenceActivity.kt create mode 100644 presentation/src/main/res/layout/activity_finish_preference.xml diff --git a/presentation/src/main/java/com/going/presentation/enter/FinishPreferenceActivity.kt b/presentation/src/main/java/com/going/presentation/enter/FinishPreferenceActivity.kt new file mode 100644 index 00000000..8e5291cc --- /dev/null +++ b/presentation/src/main/java/com/going/presentation/enter/FinishPreferenceActivity.kt @@ -0,0 +1,4 @@ +package com.going.presentation.enter + +class FinishPreferenceActivity { +} diff --git a/presentation/src/main/res/layout/activity_finish_preference.xml b/presentation/src/main/res/layout/activity_finish_preference.xml new file mode 100644 index 00000000..13544084 --- /dev/null +++ b/presentation/src/main/res/layout/activity_finish_preference.xml @@ -0,0 +1,6 @@ + + + +