[MERGE] #267 -> develop

[FIX/#267] 세연 담당 뷰 / 2차 QA 이슈 대응
Team-Going · Mar 22, 2024 · 7d97114 · 7d97114
2 parents 26e0d38 + 4ad9e13
commit 7d97114
Show file tree

Hide file tree

Showing 10 changed files with 37 additions and 26 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -173,13 +173,13 @@
             android:screenOrientation="portrait" />
 
         <activity
-            android:name="com.going.presentation.todo.edittrip.info.EditTripInfoActivity"
+            android:name="com.going.presentation.entertrip.edittrip.editinfo.EditTripInfoActivity"
             android:exported="false"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustResize" />
 
         <activity
-            android:name="com.going.presentation.todo.edittrip.edit.EditTripActivity"
+            android:name="com.going.presentation.entertrip.edittrip.detail.DetailTripActivity"
             android:exported="false"
             android:screenOrientation="portrait" />
 

diff --git a/...n/todo/edittrip/QuitTripDialogFragment.kt → ...ertrip/edittrip/QuitTripDialogFragment.kt b/...n/todo/edittrip/QuitTripDialogFragment.kt → ...ertrip/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,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.entertrip.edittrip.detail.DetailTripViewModel
 import com.going.ui.base.BaseDialog
 import com.going.ui.extension.setOnSingleClickListener
 
 class QuitTripDialogFragment :
     BaseDialog<FragmentQuitTripDialogBinding>(R.layout.fragment_quit_trip_dialog) {
 
-    private val viewModel by activityViewModels<EditTripViewModel>()
+    private val viewModel by activityViewModels<DetailTripViewModel>()
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)

diff --git a/...on/todo/edittrip/edit/EditTripActivity.kt → ...rip/edittrip/detail/DetailTripActivity.kt b/...on/todo/edittrip/edit/EditTripActivity.kt → ...rip/edittrip/detail/DetailTripActivity.kt
@@ -1,15 +1,15 @@
-package com.going.presentation.todo.edittrip.edit
+package com.going.presentation.entertrip.edittrip.detail
 
 import android.app.Activity
 import android.os.Bundle
 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.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
@@ -19,9 +19,9 @@ import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 
 @AndroidEntryPoint
-class EditTripActivity :
-    BaseActivity<ActivityEditTripBinding>(R.layout.activity_edit_trip) {
-    private val viewModel by viewModels<EditTripViewModel>()
+class DetailTripActivity :
+    BaseActivity<ActivityDetailTripBinding>(R.layout.activity_detail_trip) {
+    private val viewModel by viewModels<DetailTripViewModel>()
     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/...n/todo/edittrip/edit/EditTripViewModel.kt → ...ip/edittrip/detail/DetailTripViewModel.kt b/...n/todo/edittrip/edit/EditTripViewModel.kt → ...ip/edittrip/detail/DetailTripViewModel.kt
@@ -1,11 +1,10 @@
-package com.going.presentation.todo.edittrip.edit
+package com.going.presentation.entertrip.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/...todo/edittrip/info/EditDateBottomSheet.kt → .../edittrip/editinfo/EditDateBottomSheet.kt b/...todo/edittrip/info/EditDateBottomSheet.kt → .../edittrip/editinfo/EditDateBottomSheet.kt
@@ -1,4 +1,4 @@
-package com.going.presentation.todo.edittrip.info
+package com.going.presentation.entertrip.edittrip.editinfo
 
 import android.os.Bundle
 import android.view.View

diff --git a/...odo/edittrip/info/EditTripInfoActivity.kt → ...edittrip/editinfo/EditTripInfoActivity.kt b/...odo/edittrip/info/EditTripInfoActivity.kt → ...edittrip/editinfo/EditTripInfoActivity.kt
@@ -1,8 +1,9 @@
-package com.going.presentation.todo.edittrip.info
+package com.going.presentation.entertrip.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.entertrip.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/...do/edittrip/info/EditTripInfoViewModel.kt → ...dittrip/editinfo/EditTripInfoViewModel.kt b/...do/edittrip/info/EditTripInfoViewModel.kt → ...dittrip/editinfo/EditTripInfoViewModel.kt
@@ -1,4 +1,4 @@
-package com.going.presentation.todo.edittrip.info
+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
@@ -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.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
@@ -125,8 +126,16 @@ class OurTodoFragment() : BaseFragment<FragmentOurTodoBinding>(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<FragmentOurTodoBinding>(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)
             }

diff --git a/...rc/main/res/layout/activity_edit_trip.xml → .../main/res/layout/activity_detail_trip.xml b/...rc/main/res/layout/activity_edit_trip.xml → .../main/res/layout/activity_detail_trip.xml
@@ -7,14 +7,14 @@
 
         <variable
             name="vm"
-            type="com.going.presentation.todo.edittrip.edit.EditTripViewModel" />
+            type="com.going.presentation.entertrip.edittrip.detail.DetailTripViewModel" />
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@color/white_000"
-        tools:context=".todo.edittrip.edit.EditTripActivity">
+        tools:context=".entertrip.edittrip.detail.DetailTripActivity">
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/tb_edit_info"

diff --git a/presentation/src/main/res/layout/activity_edit_trip_info.xml b/presentation/src/main/res/layout/activity_edit_trip_info.xml
@@ -7,14 +7,14 @@
 
         <variable
             name="viewModel"
-            type="com.going.presentation.todo.edittrip.info.EditTripInfoViewModel" />
+            type="com.going.presentation.entertrip.edittrip.editinfo.EditTripInfoViewModel" />
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@color/white_000"
-        tools:context=".todo.edittrip.info.EditTripInfoActivity">
+        tools:context=".entertrip.edittrip.editinfo.EditTripInfoActivity">
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/tb_edit_trip_info"