From 6e658acee9297dcd9dd5e8cbcd5ffab8299509e0 Mon Sep 17 00:00:00 2001 From: SsongSik Date: Sat, 24 Jun 2023 02:21:56 +0900 Subject: [PATCH] [feat] : #15 FriendRecord Emoji Bottom Sheet Design Modify --- .../friend/FriendDetailRecordClickListener.kt | 5 ++++ .../presentation/friend/FriendFragment.kt | 5 ++++ .../friend/FriendGetRecordViewHolder.kt | 4 +++ ...ome_friend_emotion_bottom_sheet_dialog.xml | 30 ++++++++++--------- 4 files changed, 30 insertions(+), 14 deletions(-) diff --git a/app/src/main/java/com/teampome/pome/presentation/friend/FriendDetailRecordClickListener.kt b/app/src/main/java/com/teampome/pome/presentation/friend/FriendDetailRecordClickListener.kt index 65a0a601..b2c0b06c 100644 --- a/app/src/main/java/com/teampome/pome/presentation/friend/FriendDetailRecordClickListener.kt +++ b/app/src/main/java/com/teampome/pome/presentation/friend/FriendDetailRecordClickListener.kt @@ -1,7 +1,12 @@ package com.teampome.pome.presentation.friend +import com.teampome.pome.model.response.FriendEmotionResponse + //친구 기록 클릭 리스너 interface FriendDetailRecordClickListener { fun onFriendDetailMoreClick(recordId : Int) + + fun onFriendDetailEmojiClick(emojiList : List) + } \ No newline at end of file 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 edbc3d86..c58a2c84 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 @@ -13,6 +13,7 @@ import com.teampome.pome.databinding.FragmentFriendBinding import com.teampome.pome.databinding.PomeCalendarBottomSheetDialogBinding 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 import com.teampome.pome.util.base.CoroutineErrorHandler @@ -212,4 +213,8 @@ class FriendFragment : BaseFragment(R.layout.fragment_fri makeFriendSettingBottomDialog(recordId) friendSettingBottomSheetDialog.show() } + + override fun onFriendDetailEmojiClick(emojiList: List) { + + } } \ No newline at end of file diff --git a/app/src/main/java/com/teampome/pome/presentation/friend/FriendGetRecordViewHolder.kt b/app/src/main/java/com/teampome/pome/presentation/friend/FriendGetRecordViewHolder.kt index f08a5018..c8072350 100644 --- a/app/src/main/java/com/teampome/pome/presentation/friend/FriendGetRecordViewHolder.kt +++ b/app/src/main/java/com/teampome/pome/presentation/friend/FriendGetRecordViewHolder.kt @@ -72,6 +72,10 @@ class FriendGetRecordViewHolder( .circleCrop() .into(friendDetailProfileIv) } + + friendDetailCardLastFriendEmotionAiv.setOnClickListener { + friendDetailRecordClickListener.onFriendDetailEmojiClick(getFriedRecord.emotionResponse.friendEmotions) + } } } 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 index 8ec20185..5f359e39 100644 --- 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 @@ -19,71 +19,73 @@ android:id="@+id/friend_detail_profile_iv" android:layout_width="34dp" android:layout_height="34dp" - android:layout_marginLeft="19dp" + android:layout_marginStart="19dp" android:layout_marginBottom="20dp" android:src="@drawable/ic_friend_all_on" app:layout_constraintBottom_toTopOf="@+id/friend_detail_all_emotion_tv" - app:layout_constraintLeft_toLeftOf="parent" /> + app:layout_constraintStart_toStartOf="parent" /> + app:layout_constraintStart_toEndOf="@+id/friend_detail_profile_iv" + app:layout_constraintEnd_toStartOf="@+id/friend_detail_emoji_what_iv"/> + app:layout_constraintStart_toEndOf="@+id/friend_detail_emoji_love_iv" + app:layout_constraintEnd_toStartOf="@+id/friend_detail_emoji_merong_iv"/> + app:layout_constraintStart_toEndOf="@+id/friend_detail_emoji_what_iv" + app:layout_constraintEnd_toStartOf="@+id/friend_detail_emoji_glass_iv"/> + app:layout_constraintStart_toEndOf="@+id/friend_detail_emoji_merong_iv" + app:layout_constraintEnd_toStartOf="@+id/friend_detail_emoji_sad_iv"/> + app:layout_constraintStart_toEndOf="@+id/friend_detail_emoji_glass_iv" + app:layout_constraintEnd_toStartOf="@+id/friend_detail_emoji_happy_iv" + /> + app:layout_constraintLeft_toRightOf="@id/friend_detail_emoji_sad_iv" + app:layout_constraintEnd_toEndOf="parent"/>