Merge branch 'develop' into feature/fix-get-notification

team-winey · Aug 23, 2023 · 673057c · 673057c
2 parents 27e59d0 + 9368b13
commit 673057c
Show file tree

Hide file tree

Showing 15 changed files with 277 additions and 146 deletions.
diff --git a/...ain/java/com/android/go/sopt/winey/data/model/remote/response/ResponseDeleteCommentDto.kt b/...ain/java/com/android/go/sopt/winey/data/model/remote/response/ResponseDeleteCommentDto.kt
@@ -0,0 +1,10 @@
+package com.android.go.sopt.winey.data.model.remote.response
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class ResponseDeleteCommentDto(
+    @SerialName("commentId")
+    val commentId: Long
+)
diff --git a/...n/java/com/android/go/sopt/winey/data/model/remote/response/ResponseDeleteWineyFeedDto.kt b/...n/java/com/android/go/sopt/winey/data/model/remote/response/ResponseDeleteWineyFeedDto.kt
diff --git a/app/src/main/java/com/android/go/sopt/winey/data/repository/FeedRepositoryImpl.kt b/app/src/main/java/com/android/go/sopt/winey/data/repository/FeedRepositoryImpl.kt
@@ -5,6 +5,7 @@ import androidx.paging.PagingConfig
 import androidx.paging.PagingData
 import com.android.go.sopt.winey.data.model.remote.request.RequestPostCommentDto
 import com.android.go.sopt.winey.data.model.remote.request.RequestPostLikeDto
+import com.android.go.sopt.winey.data.model.remote.response.ResponseDeleteCommentDto
 import com.android.go.sopt.winey.data.model.remote.response.ResponsePostWineyFeedDto
 import com.android.go.sopt.winey.data.service.FeedService
 import com.android.go.sopt.winey.data.source.FeedDataSource
@@ -68,6 +69,11 @@ class FeedRepositoryImpl @Inject constructor(
             feedDataSource.postComment(feedId, requestPostCommentDto).data?.toComment()
         }
 
+    override suspend fun deleteComment(commentId: Long): Result<ResponseDeleteCommentDto?> =
+        runCatching {
+            feedDataSource.deleteComment(commentId).data
+        }
+
     companion object {
         const val WINEYFEED_PAGE_SIZE = 20
         const val MYFEED_PAGE_SIZE = 10

diff --git a/app/src/main/java/com/android/go/sopt/winey/data/service/FeedService.kt b/app/src/main/java/com/android/go/sopt/winey/data/service/FeedService.kt
@@ -2,6 +2,7 @@ package com.android.go.sopt.winey.data.service
 
 import com.android.go.sopt.winey.data.model.remote.request.RequestPostCommentDto
 import com.android.go.sopt.winey.data.model.remote.request.RequestPostLikeDto
+import com.android.go.sopt.winey.data.model.remote.response.ResponseDeleteCommentDto
 import com.android.go.sopt.winey.data.model.remote.response.ResponseGetFeedDetailDto
 import com.android.go.sopt.winey.data.model.remote.response.ResponseGetWineyFeedListDto
 import com.android.go.sopt.winey.data.model.remote.response.ResponsePostCommentDto
@@ -59,4 +60,9 @@ interface FeedService {
         @Path("feedId") feedId: Int,
         @Body requestPostCommentDto: RequestPostCommentDto
     ): BaseResponse<ResponsePostCommentDto>
+
+    @DELETE("comment/{commentId}")
+    suspend fun deleteComment(
+        @Path("commentId") commentId: Long
+    ): BaseResponse<ResponseDeleteCommentDto>
 }
diff --git a/app/src/main/java/com/android/go/sopt/winey/data/source/FeedDataSource.kt b/app/src/main/java/com/android/go/sopt/winey/data/source/FeedDataSource.kt
@@ -2,6 +2,7 @@ package com.android.go.sopt.winey.data.source
 
 import com.android.go.sopt.winey.data.model.remote.request.RequestPostCommentDto
 import com.android.go.sopt.winey.data.model.remote.request.RequestPostLikeDto
+import com.android.go.sopt.winey.data.model.remote.response.ResponseDeleteCommentDto
 import com.android.go.sopt.winey.data.model.remote.response.ResponseGetFeedDetailDto
 import com.android.go.sopt.winey.data.model.remote.response.ResponsePostCommentDto
 import com.android.go.sopt.winey.data.model.remote.response.ResponsePostLikeDto
@@ -40,4 +41,7 @@ class FeedDataSource @Inject constructor(
         requestPostCommentDto: RequestPostCommentDto
     ): BaseResponse<ResponsePostCommentDto> =
         feedService.postComment(feedId, requestPostCommentDto)
+
+    suspend fun deleteComment(commentId: Long): BaseResponse<ResponseDeleteCommentDto> =
+        feedService.deleteComment(commentId)
 }
diff --git a/app/src/main/java/com/android/go/sopt/winey/domain/repository/FeedRepository.kt b/app/src/main/java/com/android/go/sopt/winey/domain/repository/FeedRepository.kt
@@ -3,6 +3,7 @@ package com.android.go.sopt.winey.domain.repository
 import androidx.paging.PagingData
 import com.android.go.sopt.winey.data.model.remote.request.RequestPostCommentDto
 import com.android.go.sopt.winey.data.model.remote.request.RequestPostLikeDto
+import com.android.go.sopt.winey.data.model.remote.response.ResponseDeleteCommentDto
 import com.android.go.sopt.winey.data.model.remote.response.ResponsePostWineyFeedDto
 import com.android.go.sopt.winey.domain.entity.Comment
 import com.android.go.sopt.winey.domain.entity.DetailFeed
@@ -32,4 +33,6 @@ interface FeedRepository {
         feedId: Int,
         requestPostCommentDto: RequestPostCommentDto
     ): Result<Comment?>
+
+    suspend fun deleteComment(commentId: Long): Result<ResponseDeleteCommentDto?>
 }
diff --git a/app/src/main/java/com/android/go/sopt/winey/presentation/main/MainActivity.kt b/app/src/main/java/com/android/go/sopt/winey/presentation/main/MainActivity.kt
@@ -29,6 +29,7 @@ class MainActivity : BindingActivity<ActivityMainBinding>(R.layout.activity_main
     private val isUploadSuccess by lazy { intent.extras?.getBoolean(EXTRA_UPLOAD_KEY, false) }
     private val isDeleteSuccess by lazy { intent.extras?.getBoolean(EXTRA_DELETE_KEY, false) }
     private val isReportSuccess by lazy { intent.extras?.getBoolean(EXTRA_REPORT_KEY, false) }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 

diff --git a/app/src/main/java/com/android/go/sopt/winey/presentation/main/feed/WineyFeedFragment.kt b/app/src/main/java/com/android/go/sopt/winey/presentation/main/feed/WineyFeedFragment.kt
@@ -2,7 +2,6 @@ package com.android.go.sopt.winey.presentation.main.feed
 
 import android.content.Intent
 import android.os.Bundle
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.WindowManager
@@ -19,6 +18,7 @@ import androidx.lifecycle.flowWithLifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
 import androidx.recyclerview.widget.ConcatAdapter
+import androidx.recyclerview.widget.SimpleItemAnimator
 import com.android.go.sopt.winey.R
 import com.android.go.sopt.winey.databinding.FragmentWineyFeedBinding
 import com.android.go.sopt.winey.domain.entity.User
@@ -63,14 +63,15 @@ class WineyFeedFragment :
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        Log.d("Fragment Lifecycle", "onViewCreated 호출됨")
+        removeRecyclerviewItemChangeAnimation()
+        binding.vm = mainViewModel
+        mainViewModel.getHasNewNoti()
+
         initAdapter()
         setSwipeRefreshListener()
         initFabClickListener()
         initPostLikeStateObserver()
         initGetFeedStateObserver()
-        binding.vm = mainViewModel
-        mainViewModel.getHasNewNoti()
         initNotificationButtonClickListener()
     }
 
@@ -80,6 +81,13 @@ class WineyFeedFragment :
         viewModel.getWineyFeed()
     }
 
+    private fun removeRecyclerviewItemChangeAnimation() {
+        val animator = binding.rvWineyfeedPost.itemAnimator
+        if (animator is SimpleItemAnimator) {
+            animator.supportsChangeAnimations = false
+        }
+    }
+
     private fun initAdapter() {
         wineyFeedHeaderAdapter = WineyFeedHeaderAdapter()
         wineyFeedLoadAdapter = WineyFeedLoadAdapter()
@@ -289,5 +297,6 @@ class WineyFeedFragment :
 
         private const val KEY_FEED_ID = "feedId"
         private const val KEY_FEED_WRITER_ID = "feedWriterId"
+        private const val KEY_SCROLL_POS = "KEY_SCROLL_POS"
     }
 }
diff --git a/app/src/main/java/com/android/go/sopt/winey/presentation/main/feed/detail/CommentAdapter.kt b/app/src/main/java/com/android/go/sopt/winey/presentation/main/feed/detail/CommentAdapter.kt
@@ -8,18 +8,18 @@ import com.android.go.sopt.winey.domain.entity.Comment
 import com.android.go.sopt.winey.util.view.ItemDiffCallback
 
 class CommentAdapter(
-    private val onPopupMenuClicked: (View, Int) -> Unit
+    private val onPopupMenuClicked: (View, Int, Long) -> Unit
 ) : ListAdapter<Comment, CommentAdapter.CommentViewHolder>(diffUtil) {
+
     inner class CommentViewHolder(
         private val binding: ItemDetailCommentBinding
     ) : RecyclerView.ViewHolder(binding.root) {
         fun onBind(comment: Comment) {
             binding.apply {
                 this.data = comment
 
-                // 팝업 메뉴 버튼을 클릭하면, 해당 버튼의 뷰와 댓글 작성자의 아이디를 전달한다.
                 ivCommentMore.setOnClickListener { view ->
-                    onPopupMenuClicked(view, comment.authorId)
+                    onPopupMenuClicked(view, comment.authorId, comment.commentId)
                 }
             }
         }
@@ -45,10 +45,12 @@ class CommentAdapter(
         return newList.size
     }
 
-    fun deleteItem(position: Int) {
+    fun deleteItem(commentId: Long): Int {
+        val comment = currentList.find { it.commentId == commentId }
         val newList = currentList.toMutableList()
-        newList.removeAt(position)
+        newList.remove(comment)
         submitList(newList)
+        return newList.size
     }
 
     companion object {