From 21ffecbeef3b383c9de17d44902e5a16654e2afa Mon Sep 17 00:00:00 2001 From: SsongSik Date: Sun, 28 May 2023 03:10:41 +0900 Subject: [PATCH] =?UTF-8?q?[feat]=20:=20#15=20=EC=B9=9C=EA=B5=AC=20?= =?UTF-8?q?=EA=B8=B0=EB=A1=9D=20=EC=9D=B4=EB=AA=A8=EC=A7=80=20=EC=B9=B4?= =?UTF-8?q?=EC=9A=B4=ED=8A=B8=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pome/model/response/GetFriendRecord.kt | 22 +++++++++++++--- .../presentation/friend/FriendFragment.kt | 2 +- .../friend/FriendRecordGetAdapter.kt | 24 +++++++++++++++++- app/src/main/res/drawable/emoji_mint_28.png | Bin 0 -> 645 bytes .../res/layout/item_friend_detail_card.xml | 2 +- 5 files changed, 43 insertions(+), 7 deletions(-) create mode 100644 app/src/main/res/drawable/emoji_mint_28.png 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 index 23b79df5..59742627 100644 --- 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 + val myEmotion : Int?, + val friendEmotions : List ) : 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? +//) : 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 index 53db5195..b9fea4af 100644 --- 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(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 index f5f73c5f..c872621f 100644 --- 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,10 +1,14 @@ 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 @@ -12,7 +16,8 @@ import com.teampome.pome.model.response.GetFriends //친구 기록 조회 class FriendRecordGetAdapter( - private val clickListener: FriendDetailRecordClickListener + private val clickListener: FriendDetailRecordClickListener, + private val context : Context? ) : ListAdapter(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 new file mode 100644 index 0000000000000000000000000000000000000000..f769b2af933dc2d40a22dfcf9e21a74128a0fd82 GIT binary patch literal 645 zcmV;00($+4P)TF z%}hUfJ|3-64T_=|u{q%e>nrzEwHswU)s8mwyU;Z4yc%1p5Mj_+lBT2OGNxr5(`uE= zca~|AX$o>2n+(H{zC6zfZ{H~_44iU#r zl5~X4hz!U41=KgNu^1;HJj{BS%6EiINhmW6(riV2W0lKej&?_9juTVJ8kHt;|gt~7E=n<@=-v7lyHD~+HQh`#V=X{9u6@S{re?>h)xcNgYD=Q?9z+t#G5`fmd$ zmEZ~vW#jtybn5O6LzH)218e7U<;J(icz#nRK5>~ie~7$~G_eVg8OZc%nOGwA*fu&;CX>B1~As(|qJLDE9HwGcV6}