diff --git a/app/src/debug/res/drawable/rect27_white.xml b/app/src/debug/res/drawable/rect27_white.xml new file mode 100644 index 00000000..2d7cdba8 --- /dev/null +++ b/app/src/debug/res/drawable/rect27_white.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file 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 c872621f..b27dc614 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 @@ -10,9 +10,7 @@ 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( @@ -69,6 +67,14 @@ class FriendRecordGetAdapter( Glide.with(context).load(R.drawable.emoji_mint_28).into(friendDetailCardFirstFriendEmotionAiv) } } + + friendDetailCardFirstFriendEmotionAiv.setOnClickListener { + if(friendEmojiRegisterCl.visibility == View.VISIBLE) { + friendEmojiRegisterCl.visibility = View.GONE + } else { + friendEmojiRegisterCl.visibility = View.VISIBLE + } + } } } diff --git a/app/src/main/res/drawable/emoji_mint_38.png b/app/src/main/res/drawable/emoji_mint_38.png new file mode 100644 index 00000000..91cce585 Binary files /dev/null and b/app/src/main/res/drawable/emoji_mint_38.png differ diff --git a/app/src/main/res/drawable/emoji_mint_38_2.png b/app/src/main/res/drawable/emoji_mint_38_2.png new file mode 100644 index 00000000..9220bfab Binary files /dev/null and b/app/src/main/res/drawable/emoji_mint_38_2.png differ diff --git a/app/src/main/res/drawable/emoji_mint_38_3.png b/app/src/main/res/drawable/emoji_mint_38_3.png new file mode 100644 index 00000000..3a225f2b Binary files /dev/null and b/app/src/main/res/drawable/emoji_mint_38_3.png differ diff --git a/app/src/main/res/drawable/emoji_mint_38_4.png b/app/src/main/res/drawable/emoji_mint_38_4.png new file mode 100644 index 00000000..c8b67899 Binary files /dev/null and b/app/src/main/res/drawable/emoji_mint_38_4.png differ diff --git a/app/src/main/res/drawable/emoji_mint_38_5.png b/app/src/main/res/drawable/emoji_mint_38_5.png new file mode 100644 index 00000000..07c276d8 Binary files /dev/null and b/app/src/main/res/drawable/emoji_mint_38_5.png differ diff --git a/app/src/main/res/drawable/emoji_mint_38_6.png b/app/src/main/res/drawable/emoji_mint_38_6.png new file mode 100644 index 00000000..66d7872d Binary files /dev/null and b/app/src/main/res/drawable/emoji_mint_38_6.png differ diff --git a/app/src/main/res/drawable/emoji_mint_38_7.png b/app/src/main/res/drawable/emoji_mint_38_7.png new file mode 100644 index 00000000..91cce585 Binary files /dev/null and b/app/src/main/res/drawable/emoji_mint_38_7.png differ diff --git a/app/src/main/res/layout/item_friend_detail_card.xml b/app/src/main/res/layout/item_friend_detail_card.xml index c18d12c3..b3c7af84 100644 --- a/app/src/main/res/layout/item_friend_detail_card.xml +++ b/app/src/main/res/layout/item_friend_detail_card.xml @@ -1,15 +1,17 @@ + xmlns:bind="http://schemas.android.com/tools" + xmlns:tools="http://schemas.android.com/tools"> + + @@ -17,35 +19,32 @@ android:layout_width="match_parent" android:layout_height="wrap_content" app:cardBackgroundColor="@color/white" - app:cardPreventCornerOverlap="true" - > + app:cardPreventCornerOverlap="true"> + android:layout_height="wrap_content"> + app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toTopOf="@id/friend_detail_profile_iv" + tools:text="성식" /> + app:layout_constraintTop_toTopOf="parent" + bind:remindFirstEmotionDrawable="@{CommonUtil.INSTANCE.numToEmotion(getFriendRecord.emotionResponse.firstEmotion)}" + tools:src="@drawable/emoji_mint_fiter_sad" /> + app:layout_constraintTop_toTopOf="@id/friend_detail_content_first_emotion_aiv" + tools:text="후회해요" /> + app:layout_constraintTop_toTopOf="parent" + bind:remindFirstEmotionDrawable="@{CommonUtil.INSTANCE.numToEmotion(getFriendRecord.emotionResponse.secondEmotion)}" + tools:src="@drawable/emoji_pink_fiter_happy" /> + app:layout_constraintTop_toTopOf="@id/friend_detail_card_last_emotion_aiv" + tools:text="행복해요" /> @@ -146,13 +145,13 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="12dp" - tools:text="16,000원" + android:layout_marginRight="24dp" android:text="@{@string/use_price_text(CommonUtil.INSTANCE.makePriceStyle(String.valueOf(getFriendRecord.usePrice)))}" android:textColor="@color/grey_8" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="@id/friend_detail_content_first_emotion_cl" app:layout_constraintTop_toBottomOf="@id/friend_detail_content_first_emotion_cl" - android:layout_marginRight="24dp"/> + tools:text="16,000원" /> + app:layout_constraintTop_toBottomOf="@id/friend_detail_card_title_tv" + tools:text="아휴 힘빠져 이젠 진짜 포기다 포기 도대체 뭐가 문제일까 현실을 되돌아볼 필요를 느낀다ㅠ 이정도 노력했으면 된거 아닌가 진짜 개 힘빠지네 그래서 오늘은 물 대신 라떼 한잔을 마셨습니다 ㅋ 라뗴 존맛탱~~ 다들 나흐바 시그니쳐 커피를 마셔주세요 설탕 솔솔 뿌려서 개맛있음" /> + app:layout_constraintTop_toBottomOf="@id/friend_detail_card_content_tv"> + app:layout_constraintTop_toTopOf="@+id/friend_detail_friends_emotion_container_cl" /> + + + + + + + + + + + + + + + + \ No newline at end of file