[feat] : #15 Friend Emotion Image Add, Bottom Connect

PomeTeam · Jul 8, 2023 · 02a5c58 · 02a5c58
1 parent e1dfbca
commit 02a5c58
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 6 deletions.
diff --git a/...src/main/java/com/teampome/pome/presentation/friend/BottomEmojiGridSpaceItemDecoration.kt b/...src/main/java/com/teampome/pome/presentation/friend/BottomEmojiGridSpaceItemDecoration.kt
@@ -5,7 +5,8 @@ import android.view.View
 import androidx.recyclerview.widget.RecyclerView
 import com.teampome.pome.util.common.CommonUtil
 
-class BottomEmojiGridSpaceItemDecoration(private val spanCount: Int): RecyclerView.ItemDecoration() {
+class BottomEmojiGridSpaceItemDecoration(private val spanCount: Int) :
+    RecyclerView.ItemDecoration() {
     // 3, 20
     override fun getItemOffsets(
         outRect: Rect,
@@ -28,5 +29,9 @@ class BottomEmojiGridSpaceItemDecoration(private val spanCount: Int): RecyclerVi
         } else if (column == 2) {
             outRect.left = spaceInPx
         }
+
+        if (position >= 3) {
+            outRect.top = CommonUtil.dpToPx(parent.context, 30)
+        }
     }
 }
diff --git a/app/src/main/java/com/teampome/pome/presentation/friend/FriendEmotionAdapter.kt b/app/src/main/java/com/teampome/pome/presentation/friend/FriendEmotionAdapter.kt
@@ -3,6 +3,7 @@ package com.teampome.pome.presentation.friend
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
+import com.teampome.pome.R
 import com.teampome.pome.databinding.ItemBottomEmojiBinding
 import com.teampome.pome.model.response.FriendEmotionResponse
 
@@ -30,7 +31,20 @@ class FriendEmotionAdapter(
         private val binding: ItemBottomEmojiBinding
     ) : RecyclerView.ViewHolder(binding.root) {
         fun bind(friendEmotion: FriendEmotionResponse) {
-            binding.friendEmotionHappyTv.text = friendEmotion.nickname
+            with(binding) {
+                friendEmotionHappyTv.text = friendEmotion.nickname
+
+                val imageResource = when(friendEmotion.emotionId) {
+                    0 -> R.drawable.emotion_happy_54
+                    1 -> R.drawable.emotion_what_54
+                    2 -> R.drawable.emotion_sad_54
+                    3 -> R.drawable.emotion_funny_54
+                    4 -> R.drawable.emotion_smile_54
+                    else -> R.drawable.emotion_flex_54
+                }
+
+                friendEmotionHappyAiv.setImageResource(imageResource)
+            }
         }
     }
 }
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
@@ -5,16 +5,13 @@ import android.view.View
 import android.widget.Toast
 import androidx.fragment.app.viewModels
 import androidx.navigation.fragment.findNavController
-import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.teampome.pome.R
 import com.teampome.pome.databinding.FragmentFriendBinding
-import com.teampome.pome.databinding.PomeCalendarBottomSheetDialogBinding
 import com.teampome.pome.databinding.PomeFriendEmotionBottomSheetDialogBinding
 import com.teampome.pome.databinding.PomeFriendSettingBottomSheetDialogBinding
-import com.teampome.pome.databinding.PomeRecordMoreGoalBottomSheetDialogBinding
 import com.teampome.pome.model.response.FriendEmotionResponse
 import com.teampome.pome.util.base.ApiResponse
 import com.teampome.pome.util.base.BaseFragment

diff --git a/app/src/main/res/drawable/emotion_flex_54.png b/app/src/main/res/drawable/emotion_flex_54.png
diff --git a/app/src/main/res/drawable/emotion_funny_54.png b/app/src/main/res/drawable/emotion_funny_54.png
diff --git a/app/src/main/res/drawable/emotion_happy_54.png b/app/src/main/res/drawable/emotion_happy_54.png
diff --git a/app/src/main/res/drawable/emotion_sad_54.png b/app/src/main/res/drawable/emotion_sad_54.png
diff --git a/app/src/main/res/drawable/emotion_smile_54.png b/app/src/main/res/drawable/emotion_smile_54.png
diff --git a/app/src/main/res/drawable/emotion_what_54.png b/app/src/main/res/drawable/emotion_what_54.png
diff --git a/app/src/main/res/layout/pome_friend_emotion_bottom_sheet_dialog.xml b/app/src/main/res/layout/pome_friend_emotion_bottom_sheet_dialog.xml
@@ -101,7 +101,7 @@
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/friend_bottom_emoji_rv"
             android:layout_width="match_parent"
-            android:layout_height="0dp"
+            android:layout_height="256dp"
             android:layout_marginStart="10dp"
             android:layout_marginTop="20dp"
             android:layout_marginEnd="20dp"