🎨Design: 모임 초대 알림 화면 삭제

- 커뮤니티 알림 화면 통합
- 기획 변경에 따른 모임 알림 화면 삭제

Related to: #347

app/src/main/AndroidManifest.xml

@@ -103,7 +103,7 @@
             android:name=".presentation.ui.home.diary.PersonalDiaryDetailActivity"
             android:exported="false"
             android:windowSoftInputMode="adjustPan" />
-        <activity android:name=".presentation.ui.community.alert.CommunityAlertActivity"/>
+        <activity android:name=".presentation.ui.community.alert.FriendAlertActivity"/>
         <activity android:name=".presentation.ui.community.moim.schedule.FriendInviteActivity"/>
 
         <meta-data

app/src/main/java/com/mongmong/namo/presentation/ui/community/CommunityFragment.kt

@@ -5,7 +5,7 @@ import com.google.android.material.tabs.TabLayoutMediator
 import com.mongmong.namo.R
 import com.mongmong.namo.databinding.FragmentCommunityBinding
 import com.mongmong.namo.presentation.config.BaseFragment
-import com.mongmong.namo.presentation.ui.community.alert.CommunityAlertActivity
+import com.mongmong.namo.presentation.ui.community.alert.FriendAlertActivity
 import dagger.hilt.android.AndroidEntryPoint
 
 @AndroidEntryPoint
@@ -20,7 +20,7 @@ class CommunityFragment : BaseFragment<FragmentCommunityBinding>(R.layout.fragme
 
     private fun initClickListeners() {
         binding.communityAlertIv.setOnClickListener {
-            startActivity(Intent(requireActivity(), CommunityAlertActivity::class.java))
+            startActivity(Intent(requireActivity(), FriendAlertActivity::class.java))
         }
     }
 

app/src/main/java/com/mongmong/namo/presentation/ui/community/alert/AlertViewModel.kt

@@ -5,14 +5,11 @@ import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.mongmong.namo.domain.model.FriendRequest
-import com.mongmong.namo.domain.model.Moim
-import com.mongmong.namo.domain.model.Participant
 import com.mongmong.namo.domain.repositories.FriendRepository
 import com.mongmong.namo.domain.usecases.friend.AcceptFriendRequestUseCase
 import com.mongmong.namo.domain.usecases.friend.DenyFriendRequestUseCase
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.launch
-import org.joda.time.LocalDateTime
 import javax.inject.Inject
 
 @HiltViewModel
@@ -21,8 +18,6 @@ class AlertViewModel @Inject constructor(
     private val acceptFriendRequestUseCase: AcceptFriendRequestUseCase,
     private val denyFriendRequestUseCase: DenyFriendRequestUseCase
 ): ViewModel() {
-    private val _moimRequestList = MutableLiveData<List<Moim>>(emptyList())
-    val moimRequestList: LiveData<List<Moim>> = _moimRequestList
 
     private val _friendRequestList = MutableLiveData<List<FriendRequest>>(emptyList())
     val friendRequestList: LiveData<List<FriendRequest>> = _friendRequestList
@@ -31,13 +26,6 @@ class AlertViewModel @Inject constructor(
     val isComplete: LiveData<Boolean> = _isComplete
 
     init {
-        _moimRequestList.value = listOf(
-            Moim(
-                1, LocalDateTime.now(), "", "나모 모임 일정", "강남역",
-                listOf(
-                    Participant(participantId = 3, nickname = "코코아", colorId = 4)
-            ))
-        )
         getFriendRequests()
     }
 

app/src/main/java/com/mongmong/namo/presentation/ui/community/alert/FriendAlertFragment.kt → app/src/main/java/com/mongmong/namo/presentation/ui/community/alert/FriendAlertActivity.kt

@@ -1,24 +1,24 @@
 package com.mongmong.namo.presentation.ui.community.alert
 
-import androidx.fragment.app.activityViewModels
+import androidx.activity.viewModels
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.mongmong.namo.R
 import com.mongmong.namo.databinding.FragmentFriendAlertBinding
-import com.mongmong.namo.presentation.config.BaseFragment
+import com.mongmong.namo.presentation.config.BaseActivity
 import com.mongmong.namo.presentation.ui.community.alert.adapter.FriendAlertRVAdapter
 import com.mongmong.namo.presentation.ui.community.friend.FriendInfoDialog
 import com.mongmong.namo.presentation.ui.community.friend.OnFriendInfoChangedListener
 import dagger.hilt.android.AndroidEntryPoint
 
 @AndroidEntryPoint
-class FriendAlertFragment : BaseFragment<FragmentFriendAlertBinding>(R.layout.fragment_friend_alert), OnFriendInfoChangedListener {
+class FriendAlertActivity : BaseActivity<FragmentFriendAlertBinding>(R.layout.fragment_friend_alert), OnFriendInfoChangedListener {
 
-    private val viewModel: AlertViewModel by activityViewModels()
+    private val viewModel: AlertViewModel by viewModels()
 
     private lateinit var friendAdapter: FriendAlertRVAdapter
 
     override fun setup() {
-        binding.viewModel = this@FriendAlertFragment.viewModel
+        binding.viewModel = this@FriendAlertActivity.viewModel
 
         setAdapter()
         initObserve()
@@ -33,7 +33,7 @@ class FriendAlertFragment : BaseFragment<FragmentFriendAlertBinding>(R.layout.fr
         friendAdapter.setItemClickListener(object : FriendAlertRVAdapter.MyItemClickListener {
             override fun onFriendInfoClick(position: Int) {
                 // 친구 정보 화면으로 이동
-                FriendInfoDialog(null, viewModel.friendRequestList.value!![position], true, this@FriendAlertFragment).show(parentFragmentManager, "FriendInfoDialog")
+                FriendInfoDialog(null, viewModel.friendRequestList.value!![position], true, this@FriendAlertActivity).show(this@FriendAlertActivity.supportFragmentManager, "FiendDialog")
             }
 
             override fun onAcceptBtnClick(position: Int) {
@@ -49,7 +49,7 @@ class FriendAlertFragment : BaseFragment<FragmentFriendAlertBinding>(R.layout.fr
     }
 
     private fun initObserve() {
-        viewModel.friendRequestList.observe(viewLifecycleOwner) { friendRequestList ->
+        viewModel.friendRequestList.observe(this) { friendRequestList ->
             if (friendRequestList.isNotEmpty()) {
                 friendAdapter.addRequest(friendRequestList)
             }