From 8af8e8af5c998f19275cdaf3275f865e6df86464 Mon Sep 17 00:00:00 2001 From: Seyeon CHO <135544903+crownjoe@users.noreply.github.com> Date: Fri, 22 Mar 2024 10:17:15 +0900 Subject: [PATCH 1/4] =?UTF-8?q?[FIX/#267]=20=EC=9D=B8=ED=85=90=ED=8A=B8=20?= =?UTF-8?q?=EB=A1=9C=EC=A7=81=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DetailTripActivity.kt} | 13 +++++++------ .../DetailTripViewModel.kt} | 5 ++--- .../{info => editinfo}/EditTripInfoActivity.kt | 8 +++++--- .../presentation/todo/ourtodo/OurTodoFragment.kt | 13 +++++++++++-- 4 files changed, 25 insertions(+), 14 deletions(-) rename presentation/src/main/java/com/going/presentation/todo/edittrip/{edit/EditTripActivity.kt => detail/DetailTripActivity.kt} (90%) rename presentation/src/main/java/com/going/presentation/todo/edittrip/{edit/EditTripViewModel.kt => detail/DetailTripViewModel.kt} (93%) rename presentation/src/main/java/com/going/presentation/todo/edittrip/{info => editinfo}/EditTripInfoActivity.kt (94%) diff --git a/presentation/src/main/java/com/going/presentation/todo/edittrip/edit/EditTripActivity.kt b/presentation/src/main/java/com/going/presentation/todo/edittrip/detail/DetailTripActivity.kt similarity index 90% rename from presentation/src/main/java/com/going/presentation/todo/edittrip/edit/EditTripActivity.kt rename to presentation/src/main/java/com/going/presentation/todo/edittrip/detail/DetailTripActivity.kt index 95192468..b4d58ed0 100644 --- a/presentation/src/main/java/com/going/presentation/todo/edittrip/edit/EditTripActivity.kt +++ b/presentation/src/main/java/com/going/presentation/todo/edittrip/detail/DetailTripActivity.kt @@ -1,4 +1,4 @@ -package com.going.presentation.todo.edittrip.edit +package com.going.presentation.todo.edittrip.detail import android.app.Activity import android.os.Bundle @@ -6,10 +6,10 @@ import androidx.activity.viewModels import androidx.lifecycle.flowWithLifecycle import androidx.lifecycle.lifecycleScope import com.going.presentation.R -import com.going.presentation.databinding.ActivityEditTripBinding +import com.going.presentation.databinding.ActivityDetailTripBinding import com.going.presentation.entertrip.invitetrip.invitecode.EnterTripActivity.Companion.TRIP_ID import com.going.presentation.todo.edittrip.QuitTripDialogFragment -import com.going.presentation.todo.edittrip.info.EditTripInfoActivity +import com.going.presentation.todo.edittrip.editinfo.EditTripInfoActivity import com.going.ui.base.BaseActivity import com.going.ui.extension.setOnSingleClickListener import com.going.ui.extension.toast @@ -19,9 +19,9 @@ import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach @AndroidEntryPoint -class EditTripActivity : - BaseActivity(R.layout.activity_edit_trip) { - private val viewModel by viewModels() +class DetailTripActivity : + BaseActivity(R.layout.activity_detail_trip) { + private val viewModel by viewModels() private var quitDialog: QuitTripDialogFragment? = null override fun onCreate(savedInstanceState: Bundle?) { @@ -109,6 +109,7 @@ class EditTripActivity : } } + override fun onDestroy() { super.onDestroy() if (quitDialog?.isAdded == true) quitDialog?.dismiss() diff --git a/presentation/src/main/java/com/going/presentation/todo/edittrip/edit/EditTripViewModel.kt b/presentation/src/main/java/com/going/presentation/todo/edittrip/detail/DetailTripViewModel.kt similarity index 93% rename from presentation/src/main/java/com/going/presentation/todo/edittrip/edit/EditTripViewModel.kt rename to presentation/src/main/java/com/going/presentation/todo/edittrip/detail/DetailTripViewModel.kt index 3443e6a8..187e1d44 100644 --- a/presentation/src/main/java/com/going/presentation/todo/edittrip/edit/EditTripViewModel.kt +++ b/presentation/src/main/java/com/going/presentation/todo/edittrip/detail/DetailTripViewModel.kt @@ -1,11 +1,10 @@ -package com.going.presentation.todo.edittrip.edit +package com.going.presentation.todo.edittrip.detail import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import com.going.domain.entity.response.TripInfoModel import com.going.domain.repository.EditTripRepository -import com.going.ui.extension.getGraphemeLength import com.going.ui.state.UiState import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.MutableSharedFlow @@ -16,7 +15,7 @@ import kotlinx.coroutines.launch import javax.inject.Inject @HiltViewModel -class EditTripViewModel @Inject constructor( +class DetailTripViewModel @Inject constructor( private val editTripRepository: EditTripRepository ) : ViewModel() { diff --git a/presentation/src/main/java/com/going/presentation/todo/edittrip/info/EditTripInfoActivity.kt b/presentation/src/main/java/com/going/presentation/todo/edittrip/editinfo/EditTripInfoActivity.kt similarity index 94% rename from presentation/src/main/java/com/going/presentation/todo/edittrip/info/EditTripInfoActivity.kt rename to presentation/src/main/java/com/going/presentation/todo/edittrip/editinfo/EditTripInfoActivity.kt index bb7ca0e4..fffbe0c8 100644 --- a/presentation/src/main/java/com/going/presentation/todo/edittrip/info/EditTripInfoActivity.kt +++ b/presentation/src/main/java/com/going/presentation/todo/edittrip/editinfo/EditTripInfoActivity.kt @@ -1,8 +1,9 @@ -package com.going.presentation.todo.edittrip.info +package com.going.presentation.todo.edittrip.editinfo import android.app.Activity import android.content.Context import android.content.Intent +import android.content.Intent.FLAG_ACTIVITY_CLEAR_TOP import android.os.Bundle import androidx.activity.viewModels import androidx.core.widget.doAfterTextChanged @@ -11,7 +12,7 @@ import androidx.lifecycle.lifecycleScope import com.going.presentation.R import com.going.presentation.databinding.ActivityEditTripInfoBinding import com.going.presentation.entertrip.invitetrip.invitecode.EnterTripActivity.Companion.TRIP_ID -import com.going.presentation.todo.edittrip.edit.EditTripActivity +import com.going.presentation.todo.edittrip.detail.DetailTripActivity import com.going.ui.base.BaseActivity import com.going.ui.extension.setOnSingleClickListener import com.going.ui.extension.toast @@ -104,8 +105,9 @@ class EditTripInfoActivity : private fun initEditBtnClickListener() { binding.btnEditTripSave.setOnSingleClickListener { viewModel.patchTripInfoFromServer() - Intent(this, EditTripActivity::class.java).apply { + Intent(this, DetailTripActivity::class.java).apply { putExtra(TRIP_ID, viewModel.tripId) + addFlags(FLAG_ACTIVITY_CLEAR_TOP) startActivity(this) } } diff --git a/presentation/src/main/java/com/going/presentation/todo/ourtodo/OurTodoFragment.kt b/presentation/src/main/java/com/going/presentation/todo/ourtodo/OurTodoFragment.kt index 3fd6b29c..e1be068d 100644 --- a/presentation/src/main/java/com/going/presentation/todo/ourtodo/OurTodoFragment.kt +++ b/presentation/src/main/java/com/going/presentation/todo/ourtodo/OurTodoFragment.kt @@ -15,13 +15,14 @@ import androidx.lifecycle.lifecycleScope import androidx.viewpager2.widget.ViewPager2 import com.going.domain.entity.response.TripParticipantModel import com.going.presentation.R +import com.going.presentation.dashboard.DashBoardActivity import com.going.presentation.databinding.FragmentOurTodoBinding import com.going.presentation.entertrip.invitetrip.invitecode.EnterTripActivity.Companion.TRIP_ID import com.going.presentation.profile.participant.ParticipantProfileActivity import com.going.presentation.todo.TodoActivity.Companion.EXTRA_TRIP_ID import com.going.presentation.todo.create.TodoCreateActivity import com.going.presentation.todo.ourtodo.checkfriends.CheckFriendsActivity -import com.going.presentation.todo.edittrip.edit.EditTripActivity +import com.going.presentation.todo.edittrip.detail.DetailTripActivity import com.going.presentation.todo.ourtodo.friendlist.OurTodoFriendAdapter import com.going.presentation.todo.ourtodo.invite.FriendInviteDialog import com.going.presentation.todo.ourtodo.todolist.OurTodoViewPagerAdapter @@ -125,8 +126,16 @@ class OurTodoFragment() : BaseFragment(R.layout.fragment } } + private fun sendTripId() { + Intent(requireActivity(), DashBoardActivity::class.java).apply { + putExtra(TRIP_ID, viewModel.tripId) + startActivity(this) + } + } + private fun initBackBtnClickListener() { binding.btnOurTodoBack.setOnSingleClickListener { + sendTripId() requireActivity().finish() } } @@ -143,7 +152,7 @@ class OurTodoFragment() : BaseFragment(R.layout.fragment private fun initTripInfoBtnClickListener() { binding.btnOurTodoTripInfo.setOnSingleClickListener { - Intent(requireActivity(), EditTripActivity::class.java).apply { + Intent(requireActivity(), DetailTripActivity::class.java).apply { putExtra(TRIP_ID, viewModel.tripId) startActivity(this) } From 979d7daae386d46ba582618609d6990468d6f2c2 Mon Sep 17 00:00:00 2001 From: Seyeon CHO <135544903+crownjoe@users.noreply.github.com> Date: Fri, 22 Mar 2024 10:17:34 +0900 Subject: [PATCH 2/4] =?UTF-8?q?[FIX/#267]=20=EB=84=A4=EC=9D=B4=EB=B0=8D=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/AndroidManifest.xml | 4 ++-- .../com/going/presentation/dashboard/DashBoardActivity.kt | 8 ++++++++ .../presentation/todo/edittrip/QuitTripDialogFragment.kt | 4 ++-- .../edittrip/{info => editinfo}/EditDateBottomSheet.kt | 2 +- .../edittrip/{info => editinfo}/EditTripInfoViewModel.kt | 2 +- .../{activity_edit_trip.xml => activity_detail_trip.xml} | 4 ++-- .../src/main/res/layout/activity_edit_trip_info.xml | 4 ++-- 7 files changed, 18 insertions(+), 10 deletions(-) rename presentation/src/main/java/com/going/presentation/todo/edittrip/{info => editinfo}/EditDateBottomSheet.kt (98%) rename presentation/src/main/java/com/going/presentation/todo/edittrip/{info => editinfo}/EditTripInfoViewModel.kt (99%) rename presentation/src/main/res/layout/{activity_edit_trip.xml => activity_detail_trip.xml} (98%) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7a08c658..6481d6e4 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -173,13 +173,13 @@ android:screenOrientation="portrait" /> 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 a6ca2e91..96afae29 100644 --- a/presentation/src/main/java/com/going/presentation/dashboard/DashBoardActivity.kt +++ b/presentation/src/main/java/com/going/presentation/dashboard/DashBoardActivity.kt @@ -78,6 +78,14 @@ class DashBoardActivity : } } + private fun setChangeTripInfo() { + val progress = DashBoardViewModel.COMPLETED + viewModel.getTravelerNameFromServer(progress) + viewModel.name.observe(this) { travelerName -> + binding.tvDashboardTitle.text = getString(R.string.dashboard_tv_title, travelerName) + } + } + private fun initSettingBtnClickListener() { binding.btnDashboardSetting.setOnSingleClickListener { navigateToScreen(isFinish = false) diff --git a/presentation/src/main/java/com/going/presentation/todo/edittrip/QuitTripDialogFragment.kt b/presentation/src/main/java/com/going/presentation/todo/edittrip/QuitTripDialogFragment.kt index 329576ed..e5ebce7c 100644 --- a/presentation/src/main/java/com/going/presentation/todo/edittrip/QuitTripDialogFragment.kt +++ b/presentation/src/main/java/com/going/presentation/todo/edittrip/QuitTripDialogFragment.kt @@ -8,14 +8,14 @@ import androidx.fragment.app.activityViewModels import com.going.presentation.R import com.going.presentation.dashboard.DashBoardActivity import com.going.presentation.databinding.FragmentQuitTripDialogBinding -import com.going.presentation.todo.edittrip.edit.EditTripViewModel +import com.going.presentation.todo.edittrip.detail.DetailTripViewModel import com.going.ui.base.BaseDialog import com.going.ui.extension.setOnSingleClickListener class QuitTripDialogFragment : BaseDialog(R.layout.fragment_quit_trip_dialog) { - private val viewModel by activityViewModels() + private val viewModel by activityViewModels() override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) diff --git a/presentation/src/main/java/com/going/presentation/todo/edittrip/info/EditDateBottomSheet.kt b/presentation/src/main/java/com/going/presentation/todo/edittrip/editinfo/EditDateBottomSheet.kt similarity index 98% rename from presentation/src/main/java/com/going/presentation/todo/edittrip/info/EditDateBottomSheet.kt rename to presentation/src/main/java/com/going/presentation/todo/edittrip/editinfo/EditDateBottomSheet.kt index bc9bd269..94e579ec 100644 --- a/presentation/src/main/java/com/going/presentation/todo/edittrip/info/EditDateBottomSheet.kt +++ b/presentation/src/main/java/com/going/presentation/todo/edittrip/editinfo/EditDateBottomSheet.kt @@ -1,4 +1,4 @@ -package com.going.presentation.todo.edittrip.info +package com.going.presentation.todo.edittrip.editinfo import android.os.Bundle import android.view.View diff --git a/presentation/src/main/java/com/going/presentation/todo/edittrip/info/EditTripInfoViewModel.kt b/presentation/src/main/java/com/going/presentation/todo/edittrip/editinfo/EditTripInfoViewModel.kt similarity index 99% rename from presentation/src/main/java/com/going/presentation/todo/edittrip/info/EditTripInfoViewModel.kt rename to presentation/src/main/java/com/going/presentation/todo/edittrip/editinfo/EditTripInfoViewModel.kt index a0bd8978..ab3b577c 100644 --- a/presentation/src/main/java/com/going/presentation/todo/edittrip/info/EditTripInfoViewModel.kt +++ b/presentation/src/main/java/com/going/presentation/todo/edittrip/editinfo/EditTripInfoViewModel.kt @@ -1,4 +1,4 @@ -package com.going.presentation.todo.edittrip.info +package com.going.presentation.todo.edittrip.editinfo import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel diff --git a/presentation/src/main/res/layout/activity_edit_trip.xml b/presentation/src/main/res/layout/activity_detail_trip.xml similarity index 98% rename from presentation/src/main/res/layout/activity_edit_trip.xml rename to presentation/src/main/res/layout/activity_detail_trip.xml index 47566efd..da02ae0e 100644 --- a/presentation/src/main/res/layout/activity_edit_trip.xml +++ b/presentation/src/main/res/layout/activity_detail_trip.xml @@ -7,14 +7,14 @@ + type="com.going.presentation.todo.edittrip.detail.DetailTripViewModel" /> + tools:context=".todo.edittrip.detail.DetailTripActivity"> + type="com.going.presentation.todo.edittrip.editinfo.EditTripInfoViewModel" /> + tools:context=".todo.edittrip.editinfo.EditTripInfoActivity"> Date: Fri, 22 Mar 2024 10:28:20 +0900 Subject: [PATCH 3/4] =?UTF-8?q?[FIX/#267]=20=ED=8C=A8=ED=82=A4=EC=A7=95=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/AndroidManifest.xml | 4 ++-- .../{todo => entertrip}/edittrip/QuitTripDialogFragment.kt | 4 ++-- .../edittrip/detail/DetailTripActivity.kt | 6 +++--- .../edittrip/detail/DetailTripViewModel.kt | 2 +- .../edittrip/editinfo/EditDateBottomSheet.kt | 2 +- .../edittrip/editinfo/EditTripInfoActivity.kt | 4 ++-- .../edittrip/editinfo/EditTripInfoViewModel.kt | 2 +- .../com/going/presentation/todo/ourtodo/OurTodoFragment.kt | 2 +- presentation/src/main/res/layout/activity_detail_trip.xml | 4 ++-- .../src/main/res/layout/activity_edit_trip_info.xml | 4 ++-- 10 files changed, 17 insertions(+), 17 deletions(-) rename presentation/src/main/java/com/going/presentation/{todo => entertrip}/edittrip/QuitTripDialogFragment.kt (92%) rename presentation/src/main/java/com/going/presentation/{todo => entertrip}/edittrip/detail/DetailTripActivity.kt (94%) rename presentation/src/main/java/com/going/presentation/{todo => entertrip}/edittrip/detail/DetailTripViewModel.kt (97%) rename presentation/src/main/java/com/going/presentation/{todo => entertrip}/edittrip/editinfo/EditDateBottomSheet.kt (98%) rename presentation/src/main/java/com/going/presentation/{todo => entertrip}/edittrip/editinfo/EditTripInfoActivity.kt (97%) rename presentation/src/main/java/com/going/presentation/{todo => entertrip}/edittrip/editinfo/EditTripInfoViewModel.kt (99%) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 6481d6e4..e7589f2e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -173,13 +173,13 @@ android:screenOrientation="portrait" /> diff --git a/presentation/src/main/java/com/going/presentation/todo/edittrip/QuitTripDialogFragment.kt b/presentation/src/main/java/com/going/presentation/entertrip/edittrip/QuitTripDialogFragment.kt similarity index 92% rename from presentation/src/main/java/com/going/presentation/todo/edittrip/QuitTripDialogFragment.kt rename to presentation/src/main/java/com/going/presentation/entertrip/edittrip/QuitTripDialogFragment.kt index e5ebce7c..a11e4eb1 100644 --- a/presentation/src/main/java/com/going/presentation/todo/edittrip/QuitTripDialogFragment.kt +++ b/presentation/src/main/java/com/going/presentation/entertrip/edittrip/QuitTripDialogFragment.kt @@ -1,4 +1,4 @@ -package com.going.presentation.todo.edittrip +package com.going.presentation.entertrip.edittrip import android.content.Intent import android.os.Bundle @@ -8,7 +8,7 @@ import androidx.fragment.app.activityViewModels import com.going.presentation.R import com.going.presentation.dashboard.DashBoardActivity import com.going.presentation.databinding.FragmentQuitTripDialogBinding -import com.going.presentation.todo.edittrip.detail.DetailTripViewModel +import com.going.presentation.entertrip.edittrip.detail.DetailTripViewModel import com.going.ui.base.BaseDialog import com.going.ui.extension.setOnSingleClickListener diff --git a/presentation/src/main/java/com/going/presentation/todo/edittrip/detail/DetailTripActivity.kt b/presentation/src/main/java/com/going/presentation/entertrip/edittrip/detail/DetailTripActivity.kt similarity index 94% rename from presentation/src/main/java/com/going/presentation/todo/edittrip/detail/DetailTripActivity.kt rename to presentation/src/main/java/com/going/presentation/entertrip/edittrip/detail/DetailTripActivity.kt index b4d58ed0..9561fc3f 100644 --- a/presentation/src/main/java/com/going/presentation/todo/edittrip/detail/DetailTripActivity.kt +++ b/presentation/src/main/java/com/going/presentation/entertrip/edittrip/detail/DetailTripActivity.kt @@ -1,4 +1,4 @@ -package com.going.presentation.todo.edittrip.detail +package com.going.presentation.entertrip.edittrip.detail import android.app.Activity import android.os.Bundle @@ -8,8 +8,8 @@ import androidx.lifecycle.lifecycleScope import com.going.presentation.R import com.going.presentation.databinding.ActivityDetailTripBinding import com.going.presentation.entertrip.invitetrip.invitecode.EnterTripActivity.Companion.TRIP_ID -import com.going.presentation.todo.edittrip.QuitTripDialogFragment -import com.going.presentation.todo.edittrip.editinfo.EditTripInfoActivity +import com.going.presentation.entertrip.edittrip.QuitTripDialogFragment +import com.going.presentation.entertrip.edittrip.editinfo.EditTripInfoActivity import com.going.ui.base.BaseActivity import com.going.ui.extension.setOnSingleClickListener import com.going.ui.extension.toast diff --git a/presentation/src/main/java/com/going/presentation/todo/edittrip/detail/DetailTripViewModel.kt b/presentation/src/main/java/com/going/presentation/entertrip/edittrip/detail/DetailTripViewModel.kt similarity index 97% rename from presentation/src/main/java/com/going/presentation/todo/edittrip/detail/DetailTripViewModel.kt rename to presentation/src/main/java/com/going/presentation/entertrip/edittrip/detail/DetailTripViewModel.kt index 187e1d44..c833918c 100644 --- a/presentation/src/main/java/com/going/presentation/todo/edittrip/detail/DetailTripViewModel.kt +++ b/presentation/src/main/java/com/going/presentation/entertrip/edittrip/detail/DetailTripViewModel.kt @@ -1,4 +1,4 @@ -package com.going.presentation.todo.edittrip.detail +package com.going.presentation.entertrip.edittrip.detail import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel diff --git a/presentation/src/main/java/com/going/presentation/todo/edittrip/editinfo/EditDateBottomSheet.kt b/presentation/src/main/java/com/going/presentation/entertrip/edittrip/editinfo/EditDateBottomSheet.kt similarity index 98% rename from presentation/src/main/java/com/going/presentation/todo/edittrip/editinfo/EditDateBottomSheet.kt rename to presentation/src/main/java/com/going/presentation/entertrip/edittrip/editinfo/EditDateBottomSheet.kt index 94e579ec..f2aed46b 100644 --- a/presentation/src/main/java/com/going/presentation/todo/edittrip/editinfo/EditDateBottomSheet.kt +++ b/presentation/src/main/java/com/going/presentation/entertrip/edittrip/editinfo/EditDateBottomSheet.kt @@ -1,4 +1,4 @@ -package com.going.presentation.todo.edittrip.editinfo +package com.going.presentation.entertrip.edittrip.editinfo import android.os.Bundle import android.view.View diff --git a/presentation/src/main/java/com/going/presentation/todo/edittrip/editinfo/EditTripInfoActivity.kt b/presentation/src/main/java/com/going/presentation/entertrip/edittrip/editinfo/EditTripInfoActivity.kt similarity index 97% rename from presentation/src/main/java/com/going/presentation/todo/edittrip/editinfo/EditTripInfoActivity.kt rename to presentation/src/main/java/com/going/presentation/entertrip/edittrip/editinfo/EditTripInfoActivity.kt index fffbe0c8..5790bbc7 100644 --- a/presentation/src/main/java/com/going/presentation/todo/edittrip/editinfo/EditTripInfoActivity.kt +++ b/presentation/src/main/java/com/going/presentation/entertrip/edittrip/editinfo/EditTripInfoActivity.kt @@ -1,4 +1,4 @@ -package com.going.presentation.todo.edittrip.editinfo +package com.going.presentation.entertrip.edittrip.editinfo import android.app.Activity import android.content.Context @@ -12,7 +12,7 @@ import androidx.lifecycle.lifecycleScope import com.going.presentation.R import com.going.presentation.databinding.ActivityEditTripInfoBinding import com.going.presentation.entertrip.invitetrip.invitecode.EnterTripActivity.Companion.TRIP_ID -import com.going.presentation.todo.edittrip.detail.DetailTripActivity +import com.going.presentation.entertrip.edittrip.detail.DetailTripActivity import com.going.ui.base.BaseActivity import com.going.ui.extension.setOnSingleClickListener import com.going.ui.extension.toast diff --git a/presentation/src/main/java/com/going/presentation/todo/edittrip/editinfo/EditTripInfoViewModel.kt b/presentation/src/main/java/com/going/presentation/entertrip/edittrip/editinfo/EditTripInfoViewModel.kt similarity index 99% rename from presentation/src/main/java/com/going/presentation/todo/edittrip/editinfo/EditTripInfoViewModel.kt rename to presentation/src/main/java/com/going/presentation/entertrip/edittrip/editinfo/EditTripInfoViewModel.kt index ab3b577c..2d7cdc27 100644 --- a/presentation/src/main/java/com/going/presentation/todo/edittrip/editinfo/EditTripInfoViewModel.kt +++ b/presentation/src/main/java/com/going/presentation/entertrip/edittrip/editinfo/EditTripInfoViewModel.kt @@ -1,4 +1,4 @@ -package com.going.presentation.todo.edittrip.editinfo +package com.going.presentation.entertrip.edittrip.editinfo import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel diff --git a/presentation/src/main/java/com/going/presentation/todo/ourtodo/OurTodoFragment.kt b/presentation/src/main/java/com/going/presentation/todo/ourtodo/OurTodoFragment.kt index e1be068d..630145f8 100644 --- a/presentation/src/main/java/com/going/presentation/todo/ourtodo/OurTodoFragment.kt +++ b/presentation/src/main/java/com/going/presentation/todo/ourtodo/OurTodoFragment.kt @@ -22,7 +22,7 @@ import com.going.presentation.profile.participant.ParticipantProfileActivity import com.going.presentation.todo.TodoActivity.Companion.EXTRA_TRIP_ID import com.going.presentation.todo.create.TodoCreateActivity import com.going.presentation.todo.ourtodo.checkfriends.CheckFriendsActivity -import com.going.presentation.todo.edittrip.detail.DetailTripActivity +import com.going.presentation.entertrip.edittrip.detail.DetailTripActivity import com.going.presentation.todo.ourtodo.friendlist.OurTodoFriendAdapter import com.going.presentation.todo.ourtodo.invite.FriendInviteDialog import com.going.presentation.todo.ourtodo.todolist.OurTodoViewPagerAdapter diff --git a/presentation/src/main/res/layout/activity_detail_trip.xml b/presentation/src/main/res/layout/activity_detail_trip.xml index da02ae0e..f5b559d5 100644 --- a/presentation/src/main/res/layout/activity_detail_trip.xml +++ b/presentation/src/main/res/layout/activity_detail_trip.xml @@ -7,14 +7,14 @@ + type="com.going.presentation.entertrip.edittrip.detail.DetailTripViewModel" /> + tools:context=".entertrip.edittrip.detail.DetailTripActivity"> + type="com.going.presentation.entertrip.edittrip.editinfo.EditTripInfoViewModel" /> + tools:context=".entertrip.edittrip.editinfo.EditTripInfoActivity"> Date: Fri, 22 Mar 2024 10:44:44 +0900 Subject: [PATCH 4/4] =?UTF-8?q?[FIX/#267]=20=EC=95=88=EC=93=B0=EB=8A=94=20?= =?UTF-8?q?=ED=95=A8=EC=88=98=20=EC=A0=95=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/going/presentation/dashboard/DashBoardActivity.kt | 8 -------- 1 file changed, 8 deletions(-) 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 96afae29..a6ca2e91 100644 --- a/presentation/src/main/java/com/going/presentation/dashboard/DashBoardActivity.kt +++ b/presentation/src/main/java/com/going/presentation/dashboard/DashBoardActivity.kt @@ -78,14 +78,6 @@ class DashBoardActivity : } } - private fun setChangeTripInfo() { - val progress = DashBoardViewModel.COMPLETED - viewModel.getTravelerNameFromServer(progress) - viewModel.name.observe(this) { travelerName -> - binding.tvDashboardTitle.text = getString(R.string.dashboard_tv_title, travelerName) - } - } - private fun initSettingBtnClickListener() { binding.btnDashboardSetting.setOnSingleClickListener { navigateToScreen(isFinish = false)