[feat] : #15 친구 기록 이모지 카운트 기능 추가

PomeTeam · May 27, 2023 · 21ffecb · 21ffecb
1 parent e1e6797
commit 21ffecb
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 7 deletions.
diff --git a/app/src/main/java/com/teampome/pome/model/response/GetFriendRecord.kt b/app/src/main/java/com/teampome/pome/model/response/GetFriendRecord.kt
@@ -13,17 +13,31 @@ data class GetFriendRecord(
     val useComment: String,
     val oneLineMind: String,
     val createdAt: String,
-    val emotionResponse: FriendEmotion
+    val emotionResponse: EmotionResponse
 ) : Parcelable
 
 @Parcelize
-data class FriendEmotion(
+data class EmotionResponse(
     val firstEmotion : Int,
     val secondEmotion : Int,
-    val myEmotion : Int,
-    val friendEmotion : List<Int>
+    val myEmotion : Int?,
+    val friendEmotions : List<FriendEmotionResponse>
 ) : Parcelable
 
+@Parcelize
+data class FriendEmotionResponse(
+    val nickname : String,
+    val emotionId : Int,
+) : Parcelable
+
+//@Parcelize
+//data class FriendEmotion(
+//    val firstEmotion : Int,
+//    val secondEmotion : Int,
+//    val myEmotion : Int?,
+//    val friendEmotions : List<Int>?
+//) : Parcelable
+
 /*
 "id": 3,
         "nickname": "찬영짱121",

diff --git a/app/src/main/java/com/teampome/pome/presentation/friend/FriendFragment.kt b/app/src/main/java/com/teampome/pome/presentation/friend/FriendFragment.kt
@@ -153,7 +153,7 @@ class FriendFragment : BaseFragment<FragmentFriendBinding>(R.layout.fragment_fri
 
     //친구 기록 조회 RV
     private fun friendRecordSetUpRecyclerView(){
-        friendRecordGetAdapter = FriendRecordGetAdapter(this)
+        friendRecordGetAdapter = FriendRecordGetAdapter(this, context)
         binding.friendDetailRv.apply {
 //            setHasFixedSize(true)
             layoutManager = LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, false)

diff --git a/app/src/main/java/com/teampome/pome/presentation/friend/FriendRecordGetAdapter.kt b/app/src/main/java/com/teampome/pome/presentation/friend/FriendRecordGetAdapter.kt
@@ -1,18 +1,23 @@
 package com.teampome.pome.presentation.friend
 
+import android.content.Context
 import android.view.LayoutInflater
+import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
+import com.bumptech.glide.Glide
+import com.teampome.pome.R
 import com.teampome.pome.databinding.ItemFriendDetailCardBinding
 import com.teampome.pome.databinding.ItemFriendsListBinding
 import com.teampome.pome.model.response.GetFriendRecord
 import com.teampome.pome.model.response.GetFriends
 
 //친구 기록 조회
 class FriendRecordGetAdapter(
-    private val clickListener: FriendDetailRecordClickListener
+    private val clickListener: FriendDetailRecordClickListener,
+    private val context : Context?
 ) : ListAdapter<GetFriendRecord, FriendRecordGetAdapter.FriendGetRecordViewHolder>(BookDiffCallback) {
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): FriendGetRecordViewHolder {
@@ -47,6 +52,23 @@ class FriendRecordGetAdapter(
                 friendDetailMoreSettingIv.setOnClickListener {
                     friendDetailRecordClickListener.onFriendDetailMoreClick(getFriedRecord.id)
                 }
+
+                if(getFriedRecord.emotionResponse.friendEmotions.isEmpty()) {
+                    friendDetailCardLastFriendEmotionCountTv.visibility = View.INVISIBLE
+                } else {
+                    val count = getFriedRecord.emotionResponse.friendEmotions.size
+                    if(count >= 10) {
+                        friendDetailCardLastFriendEmotionCountTv.text = "9+"
+                    } else {
+                        friendDetailCardLastFriendEmotionCountTv.text = "+$count"
+                    }
+                }
+
+                if(getFriedRecord.emotionResponse.myEmotion == null) {
+                    context?.let{ context ->
+                        Glide.with(context).load(R.drawable.emoji_mint_28).into(friendDetailCardFirstFriendEmotionAiv)
+                    }
+                }
             }
         }
 

diff --git a/app/src/main/res/drawable/emoji_mint_28.png b/app/src/main/res/drawable/emoji_mint_28.png
diff --git a/app/src/main/res/layout/item_friend_detail_card.xml b/app/src/main/res/layout/item_friend_detail_card.xml
@@ -189,7 +189,7 @@
                     android:layout_width="28dp"
                     android:layout_height="28dp"
                     android:scaleType="fitXY"
-                    android:src="@drawable/emoji_mint_fiter_what"
+                    android:src="@drawable/emoji_mint_28"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />