🐛 Fix: 모임 일정 편집 모드 참석자 선택 후 업데이트 이슈 확인

- registerForActivityResult 설정 Related to: #347
Namo-log · Feb 16, 2025 · 04162a8 · 04162a8
1 parent 869a54f
commit 04162a8
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 23 deletions.
diff --git a/app/src/main/java/com/mongmong/namo/presentation/ui/community/moim/MoimFragment.kt b/app/src/main/java/com/mongmong/namo/presentation/ui/community/moim/MoimFragment.kt
@@ -19,6 +19,7 @@ import com.mongmong.namo.presentation.ui.community.moim.diary.MoimDiaryDetailAct
 import com.mongmong.namo.presentation.ui.community.moim.schedule.FriendInviteActivity
 import com.mongmong.namo.presentation.ui.community.moim.schedule.FriendInviteActivity.Companion.MOIM_INVITE_KEY
 import com.mongmong.namo.presentation.ui.community.moim.schedule.MoimScheduleActivity
+import com.mongmong.namo.presentation.ui.community.moim.schedule.MoimScheduleActivity.Companion.MOIM_ID_KEY
 import dagger.hilt.android.AndroidEntryPoint
 
 @AndroidEntryPoint
@@ -88,7 +89,7 @@ class MoimFragment : BaseFragment<FragmentMoimBinding>(R.layout.fragment_moim),
             override fun onItemClick(position: Int) {
                 // 모임 일정 편집 화면으로 이동
                 val intent = Intent(context, MoimScheduleActivity::class.java)
-                    .putExtra("moimScheduleId", viewModel.moimPreviewList.value!![position].moimId)
+                    .putExtra(MOIM_ID_KEY, viewModel.moimPreviewList.value!![position].moimId)
                 getMoimResultData.launch(intent)
             }
         })

diff --git a/...in/java/com/mongmong/namo/presentation/ui/community/moim/schedule/FriendInviteActivity.kt b/...in/java/com/mongmong/namo/presentation/ui/community/moim/schedule/FriendInviteActivity.kt
@@ -9,12 +9,9 @@ import androidx.activity.viewModels
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.mongmong.namo.R
 import com.mongmong.namo.databinding.ActivityFriendInviteBinding
-import com.mongmong.namo.domain.model.MoimCreateInfo
 import com.mongmong.namo.presentation.config.BaseActivity
-import com.mongmong.namo.presentation.enums.SuccessType
 import com.mongmong.namo.presentation.ui.MainActivity
 import com.mongmong.namo.presentation.ui.common.ConfirmDialog
-import com.mongmong.namo.presentation.ui.community.moim.MoimFragment.Companion.MOIM_CREATE_KEY
 import com.mongmong.namo.presentation.ui.community.moim.MoimFragment.Companion.MOIM_EDIT_KEY
 import com.mongmong.namo.presentation.ui.community.moim.schedule.adapter.FriendInvitePreparatoryRVAdapter
 import com.mongmong.namo.presentation.ui.community.moim.schedule.adapter.FriendInviteRVAdapter
@@ -171,11 +168,17 @@ class FriendInviteActivity : BaseActivity<ActivityFriendInviteBinding>(R.layout.
         // API 호출 성공 여부
         viewModel.isSuccess.observe(this) { isSuccess ->
             if (isSuccess) {
-                // 편집여부 전달 (업데이트)
-                val intent = Intent(this, MainActivity::class.java).apply {
-                    putExtra(MOIM_EDIT_KEY, isSuccess) // 편집 여부
+                // 생성 및 편집 모드에서의 화면 진입 경로 구분
+                val mainIntent = Intent(this, MainActivity::class.java).apply {
+                    putExtra(MOIM_EDIT_KEY, isSuccess)
+                }
+                val scheduleIntent = Intent(this, MoimScheduleActivity::class.java).apply {
+                    putExtra(MOIM_EDIT_KEY, isSuccess)
+                }
+                val intents = arrayOf(mainIntent, scheduleIntent)
+                intents.forEach {
+                    setResult(Activity.RESULT_OK, it)
                 }
-                setResult(Activity.RESULT_OK, intent)
                 finish()
             }
         }

diff --git a/...in/java/com/mongmong/namo/presentation/ui/community/moim/schedule/MoimScheduleActivity.kt b/...in/java/com/mongmong/namo/presentation/ui/community/moim/schedule/MoimScheduleActivity.kt
@@ -65,6 +65,8 @@ class MoimScheduleActivity : BaseActivity<ActivityMoimScheduleBinding>(R.layout.
 
     private val viewModel : MoimScheduleViewModel by viewModels()
 
+    private lateinit var getInviteResultData: ActivityResultLauncher<Intent>
+
     override fun setup() {
         binding.viewModel = viewModel
 
@@ -73,6 +75,7 @@ class MoimScheduleActivity : BaseActivity<ActivityMoimScheduleBinding>(R.layout.
         setResultLocation()
         initClickListeners()
         initObserve()
+        initInviteResultData()
     }
 
     override fun onResume() {
@@ -91,7 +94,8 @@ class MoimScheduleActivity : BaseActivity<ActivityMoimScheduleBinding>(R.layout.
     }
 
     private fun initViews() {
-        viewModel.setMoimSchedule(intent.getLongExtra("moimScheduleId", 0L))
+        viewModel.moimScheduleId = intent.getLongExtra(MOIM_ID_KEY, 0L)
+        viewModel.setMoimSchedule()
 
         val slideAnimation = AnimationUtils.loadAnimation(this, R.anim.slide_in_up)
         binding.moimScheduleContainerLayout.startAnimation(slideAnimation)
@@ -116,13 +120,12 @@ class MoimScheduleActivity : BaseActivity<ActivityMoimScheduleBinding>(R.layout.
 
         // 친구 초대 버튼 클릭
         binding.moimScheduleAddParticipantTv.setOnClickListener {
-            // 친구 추가하기 화면으로 이동
-            startActivity(
-                Intent(this, FriendInviteActivity::class.java).apply {
-                    putExtra(MOIM_INVITE_KEY, viewModel.moimSchedule.value!!.moimId)
-                    if (viewModel.getParticipantUserIdList().isNotEmpty()) putExtra(MOIM_PARTICIPANT_ID_KEY, viewModel.getParticipantUserIdList().toLongArray())
-                }
-            )
+            // 친구 초대 화면으로 이동
+            val intent = Intent(this, FriendInviteActivity::class.java).apply {
+                putExtra(MOIM_INVITE_KEY, viewModel.moimSchedule.value!!.moimId)
+                if (viewModel.getParticipantUserIdList().isNotEmpty()) putExtra(MOIM_PARTICIPANT_ID_KEY, viewModel.getParticipantUserIdList().toLongArray())
+            }
+            getInviteResultData.launch(intent)
         }
 
         // 게스트 초대 버튼 클릭 (편집 모드)
@@ -186,6 +189,18 @@ class MoimScheduleActivity : BaseActivity<ActivityMoimScheduleBinding>(R.layout.
         }
     }
 
+    private fun initInviteResultData() {
+        getInviteResultData = registerForActivityResult(
+            ActivityResultContracts.StartActivityForResult()
+        ) { result ->
+            if (result.resultCode != Activity.RESULT_OK) return@registerForActivityResult
+
+            // 변경사항 확인
+            val isEdited = result.data?.getBooleanExtra(MOIM_EDIT_KEY, false)
+            if (isEdited == true) viewModel.getMoimScheduleDetailInfo() // 변경 사항이 있다면 업데이트
+        }
+    }
+
     /** 모임 일정 추가 */
     private fun insertSchedule() {
         viewModel.postMoimSchedule()
@@ -472,10 +487,16 @@ class MoimScheduleActivity : BaseActivity<ActivityMoimScheduleBinding>(R.layout.
     override fun onClickYesButton(id: Int) {
         when (id) {
             0 -> deleteSchedule() // 일정 삭제 진행
-            1 -> startActivity(
-                Intent(this, FriendInviteActivity::class.java)
-                    .putExtra(MOIM_INVITE_KEY, viewModel.moimSchedule.value!!.moimId)
-            ) // 친구 초대 화면으로 이동
+            1 -> { // 친구 초대 화면으로 이동
+                val intent = Intent(this, FriendInviteActivity::class.java).apply {
+                    putExtra(MOIM_INVITE_KEY, viewModel.moimSchedule.value!!.moimId)
+                }
+                getInviteResultData.launch(intent)
+            }
         }
     }
+
+    companion object {
+        const val MOIM_ID_KEY = "moimId"
+    }
 }
diff --git a/...n/java/com/mongmong/namo/presentation/ui/community/moim/schedule/MoimScheduleViewModel.kt b/...n/java/com/mongmong/namo/presentation/ui/community/moim/schedule/MoimScheduleViewModel.kt
@@ -27,6 +27,8 @@ class MoimScheduleViewModel @Inject constructor(
     private val repository: ScheduleRepository,
     private val uploadImageToS3UseCase: UploadImageToS3UseCase
 ) : ViewModel() {
+    var moimScheduleId: Long = -1
+
     private val _moimSchedule = MutableLiveData<MoimScheduleDetail>()
     val moimSchedule: LiveData<MoimScheduleDetail> = _moimSchedule
 
@@ -50,7 +52,7 @@ class MoimScheduleViewModel @Inject constructor(
     var successState: LiveData<SuccessState> = _successState
 
     /** 모임 일정 상세 조회 */
-    private fun getMoimSchedule(moimScheduleId: Long) {
+    fun getMoimScheduleDetailInfo() {
         viewModelScope.launch {
             _moimSchedule.value = repository.getMoimScheduleDetail(moimScheduleId)
             getGuestInvitationLink()
@@ -140,12 +142,12 @@ class MoimScheduleViewModel @Inject constructor(
     }
 
     // 모임 일정 기본 정보 세팅
-    fun setMoimSchedule(moimScheduleId: Long) {
+    fun setMoimSchedule() {
         if (moimScheduleId == 0L) { // 모임 일정 생성
             _moimSchedule.value = MoimScheduleDetail()
             return
         }
-        getMoimSchedule(moimScheduleId) // 모임 일정 편집
+        getMoimScheduleDetailInfo() // 모임 일정 편집
     }
 
     fun updateImage(uri: Uri?) {