diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index bc972e59..a2311acb 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -74,7 +74,12 @@ android:screenOrientation="portrait" /> + + diff --git a/data/src/main/java/com/going/data/repositoryImpl/AuthRepositoryImpl.kt b/data/src/main/java/com/going/data/repositoryImpl/AuthRepositoryImpl.kt index 0cfe772e..f5e55515 100644 --- a/data/src/main/java/com/going/data/repositoryImpl/AuthRepositoryImpl.kt +++ b/data/src/main/java/com/going/data/repositoryImpl/AuthRepositoryImpl.kt @@ -35,7 +35,7 @@ class AuthRepositoryImpl @Inject constructor( ).data.toAuthTokenModel() } - override suspend fun getSplash(): Result = kotlin.runCatching { + override suspend fun getSplash(): Result = runCatching { authDataSource.getSplash() } } diff --git a/presentation/src/main/java/com/going/presentation/dashboard/DashBoardActivity.kt b/presentation/src/main/java/com/going/presentation/dashboard/DashBoardActivity.kt index 6053cdb2..6b4d73bd 100644 --- a/presentation/src/main/java/com/going/presentation/dashboard/DashBoardActivity.kt +++ b/presentation/src/main/java/com/going/presentation/dashboard/DashBoardActivity.kt @@ -3,7 +3,6 @@ package com.going.presentation.dashboard import android.os.Bundle import androidx.activity.viewModels import com.going.presentation.R -import com.going.presentation.dashboard.triplist.OngoingTripFragment import com.going.presentation.databinding.ActivityTripDashBoardBinding import com.going.ui.base.BaseActivity import com.google.android.material.tabs.TabLayoutMediator diff --git a/presentation/src/main/java/com/going/presentation/dashboard/DashBoardViewPagerAdapter.kt b/presentation/src/main/java/com/going/presentation/dashboard/DashBoardViewPagerAdapter.kt index a0baf469..7bd02bd0 100644 --- a/presentation/src/main/java/com/going/presentation/dashboard/DashBoardViewPagerAdapter.kt +++ b/presentation/src/main/java/com/going/presentation/dashboard/DashBoardViewPagerAdapter.kt @@ -3,8 +3,8 @@ package com.going.presentation.dashboard import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentActivity import androidx.viewpager2.adapter.FragmentStateAdapter -import com.going.presentation.dashboard.triplist.CompletedTripFragment -import com.going.presentation.dashboard.triplist.OngoingTripFragment +import com.going.presentation.dashboard.triplist.completed.CompletedTripFragment +import com.going.presentation.dashboard.triplist.ongoing.OngoingTripFragment class DashBoardViewPagerAdapter(fragment: FragmentActivity) : FragmentStateAdapter(fragment) { override fun getItemCount(): Int = 2 diff --git a/presentation/src/main/java/com/going/presentation/dashboard/triplist/CompletedAdapter.kt b/presentation/src/main/java/com/going/presentation/dashboard/triplist/completed/CompletedAdapter.kt similarity index 95% rename from presentation/src/main/java/com/going/presentation/dashboard/triplist/CompletedAdapter.kt rename to presentation/src/main/java/com/going/presentation/dashboard/triplist/completed/CompletedAdapter.kt index d4af5574..2097680f 100644 --- a/presentation/src/main/java/com/going/presentation/dashboard/triplist/CompletedAdapter.kt +++ b/presentation/src/main/java/com/going/presentation/dashboard/triplist/completed/CompletedAdapter.kt @@ -1,4 +1,4 @@ -package com.going.presentation.dashboard.triplist +package com.going.presentation.dashboard.triplist.completed import android.view.LayoutInflater import android.view.ViewGroup diff --git a/presentation/src/main/java/com/going/presentation/dashboard/triplist/CompletedTripFragment.kt b/presentation/src/main/java/com/going/presentation/dashboard/triplist/completed/CompletedTripFragment.kt similarity index 95% rename from presentation/src/main/java/com/going/presentation/dashboard/triplist/CompletedTripFragment.kt rename to presentation/src/main/java/com/going/presentation/dashboard/triplist/completed/CompletedTripFragment.kt index ecbd0419..a76406ff 100644 --- a/presentation/src/main/java/com/going/presentation/dashboard/triplist/CompletedTripFragment.kt +++ b/presentation/src/main/java/com/going/presentation/dashboard/triplist/completed/CompletedTripFragment.kt @@ -1,4 +1,4 @@ -package com.going.presentation.dashboard.triplist +package com.going.presentation.dashboard.triplist.completed import android.os.Bundle import android.view.View @@ -9,6 +9,7 @@ import androidx.lifecycle.lifecycleScope import com.going.domain.entity.response.DashBoardModel.DashBoardTripModel import com.going.presentation.R import com.going.presentation.dashboard.DashBoardViewModel +import com.going.presentation.dashboard.triplist.DashBoardDecoration import com.going.presentation.databinding.FragmentCompletedTripBinding import com.going.ui.base.BaseFragment import com.going.ui.extension.UiState diff --git a/presentation/src/main/java/com/going/presentation/dashboard/triplist/CompletedViewHolder.kt b/presentation/src/main/java/com/going/presentation/dashboard/triplist/completed/CompletedViewHolder.kt similarity index 94% rename from presentation/src/main/java/com/going/presentation/dashboard/triplist/CompletedViewHolder.kt rename to presentation/src/main/java/com/going/presentation/dashboard/triplist/completed/CompletedViewHolder.kt index 5ff5e9cb..f559c3e7 100644 --- a/presentation/src/main/java/com/going/presentation/dashboard/triplist/CompletedViewHolder.kt +++ b/presentation/src/main/java/com/going/presentation/dashboard/triplist/completed/CompletedViewHolder.kt @@ -1,4 +1,4 @@ -package com.going.presentation.dashboard.triplist +package com.going.presentation.dashboard.triplist.completed import androidx.recyclerview.widget.RecyclerView import com.going.domain.entity.response.DashBoardModel.DashBoardTripModel diff --git a/presentation/src/main/java/com/going/presentation/dashboard/triplist/OngoingAdapter.kt b/presentation/src/main/java/com/going/presentation/dashboard/triplist/ongoing/OngoingAdapter.kt similarity index 95% rename from presentation/src/main/java/com/going/presentation/dashboard/triplist/OngoingAdapter.kt rename to presentation/src/main/java/com/going/presentation/dashboard/triplist/ongoing/OngoingAdapter.kt index 91f58972..31cab927 100644 --- a/presentation/src/main/java/com/going/presentation/dashboard/triplist/OngoingAdapter.kt +++ b/presentation/src/main/java/com/going/presentation/dashboard/triplist/ongoing/OngoingAdapter.kt @@ -1,4 +1,4 @@ -package com.going.presentation.dashboard.triplist +package com.going.presentation.dashboard.triplist.ongoing import android.view.LayoutInflater import android.view.ViewGroup diff --git a/presentation/src/main/java/com/going/presentation/dashboard/triplist/OngoingTripFragment.kt b/presentation/src/main/java/com/going/presentation/dashboard/triplist/ongoing/OngoingTripFragment.kt similarity index 95% rename from presentation/src/main/java/com/going/presentation/dashboard/triplist/OngoingTripFragment.kt rename to presentation/src/main/java/com/going/presentation/dashboard/triplist/ongoing/OngoingTripFragment.kt index 8534a2bc..eceab208 100644 --- a/presentation/src/main/java/com/going/presentation/dashboard/triplist/OngoingTripFragment.kt +++ b/presentation/src/main/java/com/going/presentation/dashboard/triplist/ongoing/OngoingTripFragment.kt @@ -1,4 +1,4 @@ -package com.going.presentation.dashboard.triplist +package com.going.presentation.dashboard.triplist.ongoing import android.os.Bundle import android.view.View @@ -9,6 +9,7 @@ import androidx.lifecycle.lifecycleScope import com.going.domain.entity.response.DashBoardModel.DashBoardTripModel import com.going.presentation.R import com.going.presentation.dashboard.DashBoardViewModel +import com.going.presentation.dashboard.triplist.DashBoardDecoration import com.going.presentation.databinding.FragmentOngoingTripBinding import com.going.ui.base.BaseFragment import com.going.ui.extension.UiState diff --git a/presentation/src/main/java/com/going/presentation/dashboard/triplist/OngoingViewHolder.kt b/presentation/src/main/java/com/going/presentation/dashboard/triplist/ongoing/OngoingViewHolder.kt similarity index 95% rename from presentation/src/main/java/com/going/presentation/dashboard/triplist/OngoingViewHolder.kt rename to presentation/src/main/java/com/going/presentation/dashboard/triplist/ongoing/OngoingViewHolder.kt index 66a8d17e..726406c3 100644 --- a/presentation/src/main/java/com/going/presentation/dashboard/triplist/OngoingViewHolder.kt +++ b/presentation/src/main/java/com/going/presentation/dashboard/triplist/ongoing/OngoingViewHolder.kt @@ -1,4 +1,4 @@ -package com.going.presentation.dashboard.triplist +package com.going.presentation.dashboard.triplist.ongoing import androidx.recyclerview.widget.RecyclerView import com.going.domain.entity.response.DashBoardModel.DashBoardTripModel diff --git a/presentation/src/main/java/com/going/presentation/enter/FinishPreferenceActivity.kt b/presentation/src/main/java/com/going/presentation/enter/FinishPreferenceActivity.kt deleted file mode 100644 index 8e5291cc..00000000 --- a/presentation/src/main/java/com/going/presentation/enter/FinishPreferenceActivity.kt +++ /dev/null @@ -1,4 +0,0 @@ -package com.going.presentation.enter - -class FinishPreferenceActivity { -} diff --git a/presentation/src/main/java/com/going/presentation/enter/invitefinish/InviteFinishActivity.kt b/presentation/src/main/java/com/going/presentation/enter/invitefinish/InviteFinishActivity.kt index 8d902939..b7acc8aa 100644 --- a/presentation/src/main/java/com/going/presentation/enter/invitefinish/InviteFinishActivity.kt +++ b/presentation/src/main/java/com/going/presentation/enter/invitefinish/InviteFinishActivity.kt @@ -9,7 +9,7 @@ import com.going.presentation.enter.entertrip.EnterTripActivity.Companion.DAY import com.going.presentation.enter.entertrip.EnterTripActivity.Companion.END import com.going.presentation.enter.entertrip.EnterTripActivity.Companion.START import com.going.presentation.enter.entertrip.EnterTripActivity.Companion.TITLE -import com.going.presentation.preferencetag.PreferenceTagActivity +import com.going.presentation.preferencetag.entertrip.EnterPreferenceActivity import com.going.ui.base.BaseActivity import com.going.ui.extension.setOnSingleClickListener import dagger.hilt.android.AndroidEntryPoint @@ -58,7 +58,7 @@ class InviteFinishActivity : private fun initEnterBtnClickListener() { binding.btnInviteFinishEnter.setOnSingleClickListener { - Intent(this, PreferenceTagActivity::class.java).apply { + Intent(this, EnterPreferenceActivity::class.java).apply { startActivity(this) } } diff --git a/presentation/src/main/java/com/going/presentation/preferencetag/PreferenceTagAdapter.kt b/presentation/src/main/java/com/going/presentation/preferencetag/PreferenceTagAdapter.kt index b074ce1f..89a1ec66 100644 --- a/presentation/src/main/java/com/going/presentation/preferencetag/PreferenceTagAdapter.kt +++ b/presentation/src/main/java/com/going/presentation/preferencetag/PreferenceTagAdapter.kt @@ -1,8 +1,10 @@ package com.going.presentation.preferencetag import android.content.Context +import android.provider.MediaStore.Audio.Radio import android.view.LayoutInflater import android.view.ViewGroup +import android.widget.RadioButton import com.going.domain.entity.PreferenceData import androidx.recyclerview.widget.ListAdapter import com.going.presentation.databinding.ItemPreferenceTagBinding @@ -17,7 +19,7 @@ class PreferenceTagAdapter( private val inflater by lazy { LayoutInflater.from(context) } interface OnPreferenceSelectedListener { - fun onPreferenceSelected(preference: PreferenceData) + fun onPreferenceSelected(item: PreferenceData, checkedIndex: Int) } override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): PreferenceTagViewHolder { diff --git a/presentation/src/main/java/com/going/presentation/preferencetag/PreferenceTagViewHolder.kt b/presentation/src/main/java/com/going/presentation/preferencetag/PreferenceTagViewHolder.kt index b03d3226..9231f7be 100644 --- a/presentation/src/main/java/com/going/presentation/preferencetag/PreferenceTagViewHolder.kt +++ b/presentation/src/main/java/com/going/presentation/preferencetag/PreferenceTagViewHolder.kt @@ -1,6 +1,5 @@ package com.going.presentation.preferencetag -import androidx.appcompat.widget.AppCompatButton import androidx.recyclerview.widget.RecyclerView import com.going.domain.entity.PreferenceData import com.going.presentation.R @@ -27,8 +26,9 @@ class PreferenceTagViewHolder( R.id.rb_preference_5 ) - if (checkedId in selectedButtonIdList) { - listener.onPreferenceSelected(item) + val checkedIndex = selectedButtonIdList.indexOf(checkedId) + if (checkedIndex != -1) { + listener.onPreferenceSelected(item, checkedIndex) } } } diff --git a/presentation/src/main/java/com/going/presentation/preferencetag/PreferenceTagViewModel.kt b/presentation/src/main/java/com/going/presentation/preferencetag/PreferenceTagViewModel.kt index a507dc88..158dab8e 100644 --- a/presentation/src/main/java/com/going/presentation/preferencetag/PreferenceTagViewModel.kt +++ b/presentation/src/main/java/com/going/presentation/preferencetag/PreferenceTagViewModel.kt @@ -8,7 +8,7 @@ class PreferenceTagViewModel : ViewModel() { val preferenceTagList = listOf( PreferenceData( number = "01", - question = "계획은 얼만큼 짤까요?", + question = "계획은 어느정도로 세울까요?", leftPrefer = "철저하게", rightPrefer = "즉흥으로" ), @@ -20,19 +20,19 @@ class PreferenceTagViewModel : ViewModel() { ), PreferenceData( number = "03", - question = "음식을 고를 때 무엇을 더 중요시 하나요?", - leftPrefer = "철저한 계획", - rightPrefer = "무계획" + question = "어느 식당을 갈까요?", + leftPrefer = "유명 맛집", + rightPrefer = "가까운 곳" ), PreferenceData( number = "04", - question = "멋진 풍경이 보이면?", + question = "기억하고 싶은 순간에!", leftPrefer = "사진 필수", rightPrefer = "눈에 담기" ), PreferenceData( number = "05", - question = "스케줄 구성은 어떻게 할까요?", + question = "하루 일정을 어떻게 채우나요?", leftPrefer = "알차게", rightPrefer = "여유롭게" ), diff --git a/presentation/src/main/java/com/going/presentation/preferencetag/entertrip/EnterPreferenceActivity.kt b/presentation/src/main/java/com/going/presentation/preferencetag/entertrip/EnterPreferenceActivity.kt new file mode 100644 index 00000000..b212d458 --- /dev/null +++ b/presentation/src/main/java/com/going/presentation/preferencetag/entertrip/EnterPreferenceActivity.kt @@ -0,0 +1,110 @@ +package com.going.presentation.preferencetag.entertrip + +import android.os.Bundle +import androidx.activity.viewModels +import androidx.core.content.ContextCompat +import com.going.domain.entity.PreferenceData +import com.going.presentation.R +import com.going.presentation.databinding.ActivityEnterPreferenceBinding +import com.going.presentation.preferencetag.PreferenceTagAdapter +import com.going.presentation.preferencetag.PreferenceTagDecoration +import com.going.presentation.preferencetag.PreferenceTagViewModel +import com.going.presentation.starttrip.createtrip.CreateTripActivity.Companion.END_DAY +import com.going.presentation.starttrip.createtrip.CreateTripActivity.Companion.END_MONTH +import com.going.presentation.starttrip.createtrip.CreateTripActivity.Companion.END_YEAR +import com.going.presentation.starttrip.createtrip.CreateTripActivity.Companion.NAME +import com.going.presentation.starttrip.createtrip.CreateTripActivity.Companion.START_DAY +import com.going.presentation.starttrip.createtrip.CreateTripActivity.Companion.START_MONTH +import com.going.presentation.starttrip.createtrip.CreateTripActivity.Companion.START_YEAR +import com.going.ui.base.BaseActivity +import com.going.ui.extension.setOnSingleClickListener + +class EnterPreferenceActivity : + BaseActivity(R.layout.activity_enter_preference), + PreferenceTagAdapter.OnPreferenceSelectedListener { + + private var _adapter: PreferenceTagAdapter? = null + private val adapter get() = requireNotNull(_adapter) { getString(R.string.adapter_not_initialized_error_msg) } + + private val viewModel by viewModels() + + private val preferenceAnswers = MutableList(5) { Int.MAX_VALUE } + + private var title: String? = "" + private var startDate: String? = "" + private var endDate: String? = "" + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + + initAdapter() + initItemDecoration() + initBackClickListener() + getCreateTripInfo() + sendStyleInfo() + + } + + private fun initAdapter() { + _adapter = PreferenceTagAdapter(this, this) + binding.rvPreferenceTag.adapter = adapter + adapter.submitList(viewModel.preferenceTagList) + } + + private fun initItemDecoration() { + val itemDeco = PreferenceTagDecoration(this) + binding.rvPreferenceTag.addItemDecoration(itemDeco) + } + + private fun initBackClickListener() { + binding.btnPreferenceStart.setOnSingleClickListener { + sendStyleInfo() + } + } + + private fun isButtonValid() { + val isValid = preferenceAnswers.all { it != Int.MAX_VALUE } + + if (isValid) { + binding.btnPreferenceStart.isEnabled = isValid + binding.btnPreferenceStart.setTextColor( + ContextCompat.getColorStateList(this, R.color.white_000) + ) + } + } + + private fun getCreateTripInfo() { + val serverList = getIntent() + + if (serverList != null) { + title = intent.getStringExtra(NAME) + val startYear = intent.getIntExtra(START_YEAR, 0) + val startMonth = intent.getIntExtra(START_MONTH, 0) + val startDay = intent.getIntExtra(START_DAY, 0) + val endYear = intent.getIntExtra(END_YEAR, 0) + val endMonth = intent.getIntExtra(END_MONTH, 0) + val endDay = intent.getIntExtra(END_DAY, 0) + + startDate = String.format(SERVER_DATE, startYear, startMonth, startDay) + endDate = String.format(SERVER_DATE, endYear, endMonth, endDay) + } + + } + + private fun sendStyleInfo() { + var styleA = preferenceAnswers[0] + } + + override fun onPreferenceSelected(item: PreferenceData, checkList: Int) { + preferenceAnswers[item.number.toInt() - 1] = checkList + isButtonValid() + } + + override fun onDestroy() { + super.onDestroy() + _adapter = null + } + + companion object { + const val SERVER_DATE = "%s.%s.%s" + } +} \ No newline at end of file diff --git a/presentation/src/main/java/com/going/presentation/preferencetag/PreferenceTagActivity.kt b/presentation/src/main/java/com/going/presentation/preferencetag/invitefinish/FinishPreferenceActivity.kt similarity index 68% rename from presentation/src/main/java/com/going/presentation/preferencetag/PreferenceTagActivity.kt rename to presentation/src/main/java/com/going/presentation/preferencetag/invitefinish/FinishPreferenceActivity.kt index aa826a97..b53f3e57 100644 --- a/presentation/src/main/java/com/going/presentation/preferencetag/PreferenceTagActivity.kt +++ b/presentation/src/main/java/com/going/presentation/preferencetag/invitefinish/FinishPreferenceActivity.kt @@ -1,15 +1,18 @@ -package com.going.presentation.preferencetag +package com.going.presentation.preferencetag.invitefinish import android.os.Bundle import androidx.activity.viewModels import com.going.domain.entity.PreferenceData import com.going.presentation.R -import com.going.presentation.databinding.ActivityPreferenceTagBinding +import com.going.presentation.databinding.ActivityFinishPreferenceBinding +import com.going.presentation.preferencetag.PreferenceTagAdapter +import com.going.presentation.preferencetag.PreferenceTagDecoration +import com.going.presentation.preferencetag.PreferenceTagViewModel import com.going.ui.base.BaseActivity import com.going.ui.extension.setOnSingleClickListener -class PreferenceTagActivity : - BaseActivity(R.layout.activity_preference_tag), +class FinishPreferenceActivity : + BaseActivity(R.layout.activity_finish_preference), PreferenceTagAdapter.OnPreferenceSelectedListener { private var _adapter: PreferenceTagAdapter? = null @@ -37,18 +40,18 @@ class PreferenceTagActivity : binding.rvPreferenceTag.addItemDecoration(itemDeco) } - private fun initBackClickListener(){ + private fun initBackClickListener() { binding.btnPreferenceBack.setOnSingleClickListener { finish() } } - override fun onPreferenceSelected(preference: PreferenceData) { - // 선택된 취향 태그 처리 + override fun onPreferenceSelected(item: PreferenceData, checkList: Int) { + } override fun onDestroy() { super.onDestroy() _adapter = null } -} \ No newline at end of file +} 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 23bfe80f..accfc4c7 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,7 +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.preferencetag.entertrip.EnterPreferenceActivity import com.going.presentation.starttrip.StartTripSplashActivity import com.going.ui.base.BaseActivity import com.going.ui.extension.setOnSingleClickListener @@ -175,15 +175,14 @@ class CreateTripActivity : private fun initNextBtnClickListener() { binding.btnCreateTripNext.setOnSingleClickListener { - Intent(this, PreferenceTagActivity::class.java).apply { + Intent(this, EnterPreferenceActivity::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) + putExtra(START_YEAR, viewModel.startYear.value) + putExtra(START_MONTH, viewModel.startMonth.value) + putExtra(START_DAY, viewModel.startDay.value) + putExtra(END_YEAR, viewModel.endYear.value) + putExtra(END_MONTH, viewModel.endMonth.value) + putExtra(END_DAY, viewModel.endDay.value) startActivity(this) } } @@ -191,8 +190,12 @@ class CreateTripActivity : companion object { const val NAME = "name" - const val START = "start" - const val END = "end" + const val START_YEAR = "startYear" + const val START_MONTH = "startMonth" + const val START_DAY = "startDay" + const val END_YEAR = "endYear" + const val END_MONTH = "endMonth" + const val END_DAY = "endDay" } } diff --git a/presentation/src/main/java/com/going/presentation/starttrip/finishtrip/FinishTripActivity.kt b/presentation/src/main/java/com/going/presentation/starttrip/finishtrip/FinishTripActivity.kt index 211438fa..6e11bf5c 100644 --- a/presentation/src/main/java/com/going/presentation/starttrip/finishtrip/FinishTripActivity.kt +++ b/presentation/src/main/java/com/going/presentation/starttrip/finishtrip/FinishTripActivity.kt @@ -8,7 +8,7 @@ import android.os.Bundle import androidx.activity.viewModels import com.going.presentation.R import com.going.presentation.databinding.ActivityFinishTripBinding -import com.going.presentation.preferencetag.PreferenceTagActivity +import com.going.presentation.preferencetag.entertrip.EnterPreferenceActivity import com.going.ui.base.BaseActivity import com.going.ui.extension.setOnSingleClickListener @@ -42,7 +42,7 @@ class FinishTripActivity : private fun initEnterTripBtnClickListener() { binding.btnFinishTripEnterTrip.setOnSingleClickListener { - Intent(this, PreferenceTagActivity::class.java).apply { + Intent(this, EnterPreferenceActivity::class.java).apply { startActivity(this) //입장 코드 받아서 보내기 } diff --git a/presentation/src/main/res/drawable/sel_button_text_color_preference.xml b/presentation/src/main/res/drawable/sel_button_text_color_preference.xml new file mode 100644 index 00000000..5aa981d7 --- /dev/null +++ b/presentation/src/main/res/drawable/sel_button_text_color_preference.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/presentation/src/main/res/drawable/sel_radiobutton.xml b/presentation/src/main/res/drawable/sel_radio_button.xml similarity index 100% rename from presentation/src/main/res/drawable/sel_radiobutton.xml rename to presentation/src/main/res/drawable/sel_radio_button.xml diff --git a/presentation/src/main/res/drawable/sel_rounded_corner_button_preference.xml b/presentation/src/main/res/drawable/sel_rounded_corner_button_preference.xml new file mode 100644 index 00000000..3f54da81 --- /dev/null +++ b/presentation/src/main/res/drawable/sel_rounded_corner_button_preference.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/presentation/src/main/res/drawable/sel_rounded_corner_preference_tag_button.xml b/presentation/src/main/res/drawable/sel_rounded_corner_radio_button_preference.xml similarity index 100% rename from presentation/src/main/res/drawable/sel_rounded_corner_preference_tag_button.xml rename to presentation/src/main/res/drawable/sel_rounded_corner_radio_button_preference.xml diff --git a/presentation/src/main/res/layout/activity_preference_tag.xml b/presentation/src/main/res/layout/activity_enter_preference.xml similarity index 89% rename from presentation/src/main/res/layout/activity_preference_tag.xml rename to presentation/src/main/res/layout/activity_enter_preference.xml index d4865293..6e00cf38 100644 --- a/presentation/src/main/res/layout/activity_preference_tag.xml +++ b/presentation/src/main/res/layout/activity_enter_preference.xml @@ -5,13 +5,19 @@ + + + + + tools:context=".preferencetag.entertrip.EnterPreferenceActivity"> diff --git a/presentation/src/main/res/layout/activity_finish_preference.xml b/presentation/src/main/res/layout/activity_finish_preference.xml index 13544084..6340fee5 100644 --- a/presentation/src/main/res/layout/activity_finish_preference.xml +++ b/presentation/src/main/res/layout/activity_finish_preference.xml @@ -1,6 +1,89 @@ - + - + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/presentation/src/main/res/layout/item_preference_tag.xml b/presentation/src/main/res/layout/item_preference_tag.xml index 57e044c3..f5b3143a 100644 --- a/presentation/src/main/res/layout/item_preference_tag.xml +++ b/presentation/src/main/res/layout/item_preference_tag.xml @@ -61,7 +61,7 @@ android:layout_height="16dp" android:layout_marginEnd="4dp" android:layout_weight="1" - android:background="@drawable/sel_rounded_corner_preference_tag_button" + android:background="@drawable/sel_rounded_corner_radio_button_preference" android:textAppearance="@style/TextAppearance.Doorip.Body3.Medi" /> + android:background="@drawable/sel_rounded_corner_radio_button_preference" /> + android:background="@drawable/sel_rounded_corner_radio_button_preference" /> + android:background="@drawable/sel_rounded_corner_radio_button_preference" /> + android:background="@drawable/sel_rounded_corner_radio_button_preference" /> diff --git a/presentation/src/main/res/values/strings.xml b/presentation/src/main/res/values/strings.xml index 89c4d7af..820a996b 100644 --- a/presentation/src/main/res/values/strings.xml +++ b/presentation/src/main/res/values/strings.xml @@ -98,7 +98,8 @@ 이번 여행은! - 다음 + 여행 만들기 + 저장하고 여행 시작하기 상관없어 diff --git a/presentation/src/main/res/values/themes.xml b/presentation/src/main/res/values/themes.xml index 7c54f2d5..fd2a21fe 100644 --- a/presentation/src/main/res/values/themes.xml +++ b/presentation/src/main/res/values/themes.xml @@ -54,7 +54,7 @@ @null false 3dp - @drawable/sel_rounded_corner_preference_tag_button + @drawable/sel_rounded_corner_radio_button_preference @style/TextAppearance.Doorip.Body3.Medi