Skip to content

Commit 0124b7c

Browse files
authored
[MERGE] #86 -> develop
[FEAT/#86] ์—ฌํ–‰ ์ƒ์„ฑ ๋ทฐ
2 parents 934ab8e + 98ae36a commit 0124b7c

3 files changed

Lines changed: 28 additions & 1 deletion

File tree

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
package com.going.presentation.enter
2+
3+
class FinishPreferenceActivity {
4+
}

โ€Žpresentation/src/main/java/com/going/presentation/starttrip/createtrip/CreateTripActivity.ktโ€Ž

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import androidx.core.content.res.ResourcesCompat
88
import com.going.domain.entity.NameState
99
import com.going.presentation.R
1010
import com.going.presentation.databinding.ActivityCreateTripBinding
11+
import com.going.presentation.preferencetag.PreferenceTagActivity
1112
import com.going.presentation.starttrip.StartTripSplashActivity
1213
import com.going.ui.base.BaseActivity
1314
import com.going.ui.extension.setOnSingleClickListener
@@ -174,9 +175,25 @@ class CreateTripActivity :
174175

175176
private fun initNextBtnClickListener() {
176177
binding.btnCreateTripNext.setOnSingleClickListener {
177-
//๋‹ค์Œ์œผ๋กœ ๋„˜์–ด๊ฐ
178+
Intent(this, PreferenceTagActivity::class.java).apply {
179+
putExtra(NAME, viewModel.name.value)
180+
putExtra(START, viewModel.startYear.value)
181+
182+
putExtra(START, viewModel.startMonth.value)
183+
putExtra(START, viewModel.startDay.value)
184+
putExtra(END, viewModel.endYear.value)
185+
putExtra(END, viewModel.endMonth.value)
186+
putExtra(END, viewModel.endDay.value)
187+
startActivity(this)
188+
}
178189
}
179190
}
191+
192+
companion object {
193+
const val NAME = "name"
194+
const val START = "start"
195+
const val END = "end"
196+
}
180197
}
181198

182199

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
3+
android:layout_width="match_parent"
4+
android:layout_height="match_parent">
5+
6+
</androidx.constraintlayout.widget.ConstraintLayout>

0 commit comments

Comments
ย (0)