[Feature/#105] : 대댓글 UI, API

core/data/src/main/java/com/teamwable/data/mapper/toData/PostCommentModelMapper.kt

@@ -2,5 +2,5 @@ package com.teamwable.data.mapper.toData
 
 import com.teamwable.network.dto.request.RequestPostCommentDto
 
-internal fun Pair<String, String>.toPostCommentDto(): RequestPostCommentDto =
-    RequestPostCommentDto(first, second)
+internal fun Triple<String, Long, Long>.toPostCommentDto(): RequestPostCommentDto =
+    RequestPostCommentDto(commentText = first, parentCommentId = second, parentCommentWriterId = third)

core/data/src/main/java/com/teamwable/data/mapper/toModel/ResponseCommentDtoMapper.kt

@@ -17,5 +17,18 @@ internal fun ResponseCommentDto.toComment(): Comment =
         this.time,
         this.memberFanTeam,
         this.contentId,
-        this.isBlind ?: false,
+        this.isBlind,
+        this.parentCommentId,
     )
+
+internal fun ResponseCommentDto.toComments(): List<Comment> {
+    val comments = mutableListOf<Comment>()
+
+    comments.add(this.toComment())
+
+    this.childComments?.forEach { child ->
+        comments.addAll(child.toComments())
+    }
+
+    return comments
+}

core/data/src/main/java/com/teamwable/data/repository/CommentRepository.kt

@@ -12,7 +12,7 @@ interface CommentRepository {
 
     suspend fun deleteComment(commentId: Long): Result<Unit>
 
-    suspend fun postComment(contentId: Long, commentText: String): Result<Unit>
+    suspend fun postComment(contentId: Long, commentInfo: Triple<String, Long, Long>): Result<Unit>
 
     suspend fun postGhost(request: Ghost): Result<Unit>
 

core/data/src/main/java/com/teamwable/data/repositoryimpl/DefaultCommentRepository.kt

@@ -3,11 +3,13 @@ package com.teamwable.data.repositoryimpl
 import androidx.paging.Pager
 import androidx.paging.PagingConfig
 import androidx.paging.PagingData
+import androidx.paging.flatMap
 import androidx.paging.map
 import com.teamwable.data.mapper.toData.toPostCommentDto
 import com.teamwable.data.mapper.toData.toPostCommentLikeDto
 import com.teamwable.data.mapper.toData.toPostGhostDto
 import com.teamwable.data.mapper.toModel.toComment
+import com.teamwable.data.mapper.toModel.toComments
 import com.teamwable.data.repository.CommentRepository
 import com.teamwable.model.Comment
 import com.teamwable.model.Ghost
@@ -28,7 +30,7 @@ internal class DefaultCommentRepository @Inject constructor(
                 getNextCursor = { comments -> comments.lastOrNull()?.commentId },
             )
         }.flow.map { pagingData ->
-            pagingData.map { it.toComment() }
+            pagingData.flatMap { it.toComments() }
         }
     }
 
@@ -50,9 +52,8 @@ internal class DefaultCommentRepository @Inject constructor(
         return it.handleThrowable()
     }
 
-    override suspend fun postComment(contentId: Long, commentText: String): Result<Unit> = runCatching {
-        val request = Pair(commentText, "comment").toPostCommentDto()
-        apiService.postComment(contentId, request)
+    override suspend fun postComment(contentId: Long, commentInfo: Triple<String, Long, Long>): Result<Unit> = runCatching {
+        apiService.postComment(contentId, commentInfo.toPostCommentDto())
         Unit
     }.onFailure {
         return it.handleThrowable()

core/model/src/main/java/com/teamwable/model/Comment.kt

@@ -14,6 +14,7 @@ data class Comment(
     val postAuthorTeamTag: String,
     val feedId: Long?,
     val isBlind: Boolean,
+    val parentCommentId: Long?,
     val ghostColor: String = GhostColor.DEFAULT_0,
     val isAuth: Boolean = false,
 )

core/network/src/main/java/com/teamwable/network/datasource/CommentService.kt

@@ -14,7 +14,7 @@ import retrofit2.http.Path
 import retrofit2.http.Query
 
 interface CommentService {
-    @GET("api/v2/content/{contentId}/comments")
+    @GET("api/v3/content/{contentId}/comments")
     suspend fun getHomeDetailComments(
         @Path(value = "contentId") contentId: Long,
         @Query(value = "cursor") cursor: Long = -1,
@@ -31,7 +31,7 @@ interface CommentService {
         @Path(value = "commentId") commentId: Long,
     ): BaseUnitResponse<Unit>
 
-    @POST("api/v1/content/{contentId}/comment")
+    @POST("api/v3/content/{contentId}/comment")
     suspend fun postComment(
         @Path(value = "contentId") contentId: Long,
         @Body request: RequestPostCommentDto,

core/network/src/main/java/com/teamwable/network/dto/request/RequestPostCommentDto.kt

@@ -6,5 +6,6 @@ import kotlinx.serialization.Serializable
 @Serializable
 data class RequestPostCommentDto(
     @SerialName("commentText") val commentText: String,
-    @SerialName("notificationTriggerType") val notificationTriggerType: String,
+    @SerialName("parentCommentId") val parentCommentId: Long,
+    @SerialName("parentCommentWriterId") val parentCommentWriterId: Long,
 )

core/network/src/main/java/com/teamwable/network/dto/response/ResponseCommentDto.kt

@@ -19,5 +19,7 @@ data class ResponseCommentDto(
     @SerialName("commentImageUrl") val commentImageUrl: String? = null,
     @SerialName("memberFanTeam") val memberFanTeam: String,
     @SerialName("contentId") val contentId: Long? = null,
-    @SerialName("isBlind") val isBlind: Boolean? = null, // TODO::임시로 nullable 받음 대댓글 구현후 non-null 변경 예정
+    @SerialName("isBlind") val isBlind: Boolean,
+    @SerialName("parentCommentId") val parentCommentId: Long? = null, // -1 : 부모 댓글, null : profile의 comment, 이외 : 대댓글
+    @SerialName("childComments") val childComments: List<ResponseCommentDto>? = null, // null : 대댓글, [] : 부모 댓글의 대댓글 없음
 )

core/ui/src/main/java/com/teamwable/ui/component/Snackbar.kt

@@ -63,8 +63,8 @@ class Snackbar(private val view: View, private val type: SnackbarType) {
         }, duration)
     }
 
-    fun updateToCommentComplete() {
-        initLayout(SnackbarType.COMMENT_COMPLETE)
+    fun updateToCommentComplete(type: SnackbarType) {
+        initLayout(type)
         dismissSnackbar(1000)
     }
 

core/ui/src/main/java/com/teamwable/ui/extensions/ContextExt.kt

@@ -13,6 +13,7 @@ import android.util.TypedValue
 import android.view.View
 import android.view.WindowManager
 import android.view.inputmethod.InputMethodManager
+import android.widget.EditText
 import android.widget.Toast
 import androidx.annotation.ColorRes
 import androidx.annotation.DrawableRes
@@ -53,6 +54,12 @@ fun Context.hideKeyboard(view: View) {
     inputMethodManager.hideSoftInputFromWindow(view.windowToken, 0)
 }
 
+fun Context.showKeyboard(view: EditText) {
+    view.requestFocus()
+    val inputMethodManager = getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
+    inputMethodManager.showSoftInput(view, InputMethodManager.SHOW_IMPLICIT)
+}
+
 fun Context.openKeyboard(view: View) {
     val inputMethodManager = getSystemService(Activity.INPUT_METHOD_SERVICE) as InputMethodManager
     inputMethodManager.showSoftInput(view, 0)

core/ui/src/main/java/com/teamwable/ui/shareAdapter/ChildCommentViewHolder.kt

@@ -0,0 +1,72 @@
+package com.teamwable.ui.shareAdapter
+
+import android.graphics.Color
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import com.teamwable.model.Comment
+import com.teamwable.ui.databinding.ItemChildCommentBinding
+import com.teamwable.ui.extensions.load
+import com.teamwable.ui.extensions.visible
+
+class ChildCommentViewHolder private constructor(
+    private val binding: ItemChildCommentBinding,
+    commentClickListener: CommentClickListener,
+) : RecyclerView.ViewHolder(binding.root), LikeableViewHolder {
+    private lateinit var item: Comment
+    override val likeBtn = binding.btnChildCommentLike
+    override val likeCountTv = binding.tvChildCommentLikeCount
+
+    init {
+        setupClickListener(itemView, binding.tvChildCommentContent) { commentClickListener.onItemClick(item.feedId ?: return@setupClickListener) }
+        setupClickListener(binding.btnChildCommentGhost) { commentClickListener.onGhostBtnClick(item.postAuthorId, item.commentId) }
+        setupClickListener(binding.btnChildCommentLike) { commentClickListener.onLikeBtnClick(this, item) }
+        setupClickListener(binding.ivChildCommentProfileImg, binding.tvChildCommentNickname) { commentClickListener.onPostAuthorProfileClick(item.postAuthorId) }
+        setupClickListener(binding.btnChildCommentMore) { commentClickListener.onKebabBtnClick(item) }
+    }
+
+    private fun setupClickListener(vararg views: View, action: () -> Unit) {
+        views.forEach { view ->
+            view.setOnClickListener {
+                if (this::item.isInitialized) action()
+            }
+        }
+    }
+
+    fun bind(comment: Comment?) {
+        item = comment ?: return
+        with(binding) {
+            ivChildCommentProfileImg.load(comment.postAuthorProfile)
+            tvChildCommentNickname.text = comment.postAuthorNickname
+            tvChildCommentGhostLevel.text = comment.postAuthorGhost
+            tvChildCommentUploadTime.text = comment.uploadTime
+            tvChildCommentContent.text = comment.content
+            btnChildCommentLike.isChecked = comment.isLiked
+            tvChildCommentLikeCount.text = comment.likedNumber
+            tvTeamTag.teamName = comment.postAuthorTeamTag
+            btnChildCommentGhost.isEnabled = !comment.isPostAuthorGhost
+            viewChildCommentTransparentBg.setBackgroundColor(Color.parseColor(comment.ghostColor))
+            btnChildCommentGhost.visible(!comment.isAuth)
+            spacerChildComment.visible(!comment.isAuth)
+            setBlindVisible(comment.isBlind)
+        }
+    }
+
+    private fun setBlindVisible(isBlind: Boolean) = with(binding) {
+        tvChildCommentContent.visible(!isBlind)
+        tvChildCommentBlind.visible(isBlind)
+    }
+
+    companion object {
+        fun from(parent: ViewGroup, commentClickListener: CommentClickListener): ChildCommentViewHolder =
+            ChildCommentViewHolder(
+                ItemChildCommentBinding.inflate(
+                    LayoutInflater.from(parent.context),
+                    parent,
+                    false,
+                ),
+                commentClickListener,
+            )
+    }
+}

core/ui/src/main/java/com/teamwable/ui/shareAdapter/CommentAdapter.kt

@@ -1,26 +1,37 @@
 package com.teamwable.ui.shareAdapter
 
 import android.view.ViewGroup
-import androidx.paging.PagingData
 import androidx.paging.PagingDataAdapter
+import androidx.recyclerview.widget.RecyclerView.ViewHolder
 import com.teamwable.model.Comment
 import com.teamwable.ui.extensions.ItemDiffCallback
+import com.teamwable.ui.type.CommentType
 
-class CommentAdapter(private val commentClickListener: CommentClickListener) : PagingDataAdapter<Comment, CommentViewHolder>(commentDiffCallback) {
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): CommentViewHolder = CommentViewHolder.from(parent, commentClickListener)
+class CommentAdapter(private val commentClickListener: CommentClickListener) : PagingDataAdapter<Comment, ViewHolder>(commentDiffCallback) {
+    override fun getItemViewType(position: Int): Int {
+        return when (getItem(position)?.parentCommentId ?: PARENT_COMMENT_DEFAULT) {
+            PARENT_COMMENT_DEFAULT -> CommentType.PARENT.id
+            else -> CommentType.CHILD.id
+        }
+    }
 
-    override fun onBindViewHolder(holder: CommentViewHolder, position: Int) = holder.bind(getItem(position))
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
+        return when (viewType) {
+            CommentType.PARENT.id -> CommentViewHolder.from(parent, commentClickListener)
+            else -> ChildCommentViewHolder.from(parent, commentClickListener)
+        }
+    }
 
-    suspend fun removeComment(commentId: Long) {
-        val currentList = snapshot().items.toMutableList()
-        val indexToRemove = currentList.indexOfFirst { it.commentId == commentId }
-        if (indexToRemove != -1) {
-            currentList.removeAt(indexToRemove)
-            submitData(PagingData.from(currentList))
+    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
+        val data = getItem(position)
+        when (data?.parentCommentId ?: PARENT_COMMENT_DEFAULT) {
+            PARENT_COMMENT_DEFAULT -> (holder as? CommentViewHolder)?.run { bind(data) }
+            else -> (holder as? ChildCommentViewHolder)?.run { bind(data) }
         }
     }
 
     companion object {
+        const val PARENT_COMMENT_DEFAULT = -1L
         private val commentDiffCallback = ItemDiffCallback<Comment>(
             onItemsTheSame = { old, new -> old.commentId == new.commentId },
             onContentsTheSame = { old, new -> old == new },

core/ui/src/main/java/com/teamwable/ui/shareAdapter/CommentClickListener.kt

@@ -1,15 +1,24 @@
 package com.teamwable.ui.shareAdapter
 
+import android.widget.CheckBox
+import android.widget.TextView
 import com.teamwable.model.Comment
 
 interface CommentClickListener {
     fun onGhostBtnClick(postAuthorId: Long, commentId: Long)
 
-    fun onLikeBtnClick(viewHolder: CommentViewHolder, comment: Comment)
+    fun onLikeBtnClick(viewHolder: LikeableViewHolder, comment: Comment)
 
     fun onPostAuthorProfileClick(id: Long)
 
     fun onKebabBtnClick(comment: Comment)
 
     fun onItemClick(feedId: Long)
+
+    fun onChildCommentClick(comment: Comment)
+}
+
+interface LikeableViewHolder {
+    val likeBtn: CheckBox
+    val likeCountTv: TextView
 }

core/ui/src/main/java/com/teamwable/ui/shareAdapter/CommentViewHolder.kt

@@ -13,17 +13,18 @@ import com.teamwable.ui.extensions.visible
 class CommentViewHolder private constructor(
     private val binding: ItemCommentBinding,
     commentClickListener: CommentClickListener,
-) : RecyclerView.ViewHolder(binding.root) {
+) : RecyclerView.ViewHolder(binding.root), LikeableViewHolder {
     private lateinit var item: Comment
-    val likeBtn = binding.btnCommentLike
-    val likeCountTv = binding.tvCommentLikeCount
+    override val likeBtn = binding.btnCommentLike
+    override val likeCountTv = binding.tvCommentLikeCount
 
     init {
         setupClickListener(itemView, binding.tvCommentContent) { commentClickListener.onItemClick(item.feedId ?: return@setupClickListener) }
         setupClickListener(binding.btnCommentGhost) { commentClickListener.onGhostBtnClick(item.postAuthorId, item.commentId) }
         setupClickListener(binding.btnCommentLike) { commentClickListener.onLikeBtnClick(this, item) }
         setupClickListener(binding.ivCommentProfileImg, binding.tvCommentNickname) { commentClickListener.onPostAuthorProfileClick(item.postAuthorId) }
         setupClickListener(binding.btnCommentMore) { commentClickListener.onKebabBtnClick(item) }
+        setupClickListener(binding.btnCommentWriteChildComment, binding.tvCommentWriteChildCommentLabel) { commentClickListener.onChildCommentClick(item) }
     }
 
     private fun setupClickListener(vararg views: View, action: () -> Unit) {
@@ -50,6 +51,7 @@ class CommentViewHolder private constructor(
             btnCommentGhost.visible(!comment.isAuth)
             spacerComment.visible(!comment.isAuth)
             setBlindVisible(comment.isBlind)
+            groupCommentWriteChildComment.visible(comment.parentCommentId != null)
         }
     }
 

core/ui/src/main/java/com/teamwable/ui/shareAdapter/FeedClickListener.kt

@@ -15,5 +15,5 @@ interface FeedClickListener {
 
     fun onKebabBtnClick(feed: Feed)
 
-    fun onCommentBtnClick(feedId: Long)
+    fun onCommentBtnClick(postAuthorNickname: String)
 }

core/ui/src/main/java/com/teamwable/ui/shareAdapter/FeedViewHolder.kt

@@ -25,6 +25,7 @@ class FeedViewHolder private constructor(
         setupClickListener(binding.ivFeedProfileImg, binding.tvFeedNickname) { feedClickListener.onPostAuthorProfileClick(item.postAuthorId) }
         setupClickListener(binding.ivFeedImg) { feedClickListener.onFeedImageClick(item.image) }
         setupClickListener(binding.btnFeedMore) { feedClickListener.onKebabBtnClick(item) }
+        setupClickListener(binding.btnFeedComment) { feedClickListener.onCommentBtnClick(item.postAuthorNickname) }
     }
 
     private fun setupClickListener(vararg views: View, action: () -> Unit) {

core/ui/src/main/java/com/teamwable/ui/type/CommentType.kt

@@ -0,0 +1,6 @@
+package com.teamwable.ui.type
+
+enum class CommentType(val id: Int) {
+    PARENT(0),
+    CHILD(1),
+}

core/ui/src/main/java/com/teamwable/ui/type/SnackbarType.kt

@@ -12,6 +12,8 @@ enum class SnackbarType(
     GHOST(R.string.label_snack_bar_ghost),
     COMMENT_ING(R.string.label_snack_bar_comment_ing),
     COMMENT_COMPLETE(R.string.label_snack_bar_comment_complete),
+    CHILD_COMMENT_ING(R.string.label_snack_bar_child_comment_ing),
+    CHILD_COMMENT_COMPLETE(R.string.label_snack_bar_child_comment_complete),
     REPORT(R.string.label_snack_bar_report),
     BAN(R.string.label_snack_bar_ban),
 }

core/ui/src/main/java/com/teamwable/ui/util/CommentActionHandler.kt

@@ -12,7 +12,7 @@ import com.teamwable.model.LikeState
 import com.teamwable.ui.component.BottomSheet
 import com.teamwable.ui.component.TwoButtonDialog
 import com.teamwable.ui.component.TwoLabelBottomSheet
-import com.teamwable.ui.shareAdapter.CommentViewHolder
+import com.teamwable.ui.shareAdapter.LikeableViewHolder
 import com.teamwable.ui.type.BanTriggerType
 import com.teamwable.ui.type.BottomSheetType
 import com.teamwable.ui.type.DialogType
@@ -70,7 +70,7 @@ class CommentActionHandler(
         }
     }
 
-    fun onLikeBtnClick(viewHolder: CommentViewHolder, id: Long, saveLike: (Long, LikeState) -> Unit) {
+    fun onLikeBtnClick(viewHolder: LikeableViewHolder, id: Long, saveLike: (Long, LikeState) -> Unit) {
         val likeCount = viewHolder.likeCountTv.text.toString().toInt()
         val updatedLikeCount = if (viewHolder.likeBtn.isChecked) {
             trackEvent(CLICK_LIKE_COMMENT)

core/ui/src/main/res/anim/spinner_rotate.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <rotate xmlns:android="http://schemas.android.com/apk/res/android"
+    android:drawable="@drawable/iv_share_loading_spinner"
     android:duration="1000"
     android:fromDegrees="0"
     android:interpolator="@android:interpolator/linear"

core/ui/src/main/res/drawable/shape_purple_50_cursor.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <size android:width="2dp" />
+    <solid android:color="@color/purple_50" />
+    <corners android:radius="8dp" />
+</shape>