From e12e0a04aa3bb725965dcadfcac612257240fd04 Mon Sep 17 00:00:00 2001 From: SsongSik Date: Sun, 28 May 2023 03:59:08 +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=EC=97=90=20=EA=B0=90=EC=A0=95=EB=A6=AC?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EB=B7=B0=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/debug/res/drawable/rect27_white.xml | 5 + .../friend/FriendRecordGetAdapter.kt | 10 +- app/src/main/res/drawable/emoji_mint_38.png | Bin 0 -> 3193 bytes app/src/main/res/drawable/emoji_mint_38_2.png | Bin 0 -> 1809 bytes app/src/main/res/drawable/emoji_mint_38_3.png | Bin 0 -> 1969 bytes app/src/main/res/drawable/emoji_mint_38_4.png | Bin 0 -> 2699 bytes app/src/main/res/drawable/emoji_mint_38_5.png | Bin 0 -> 1848 bytes app/src/main/res/drawable/emoji_mint_38_6.png | Bin 0 -> 1989 bytes app/src/main/res/drawable/emoji_mint_38_7.png | Bin 0 -> 3193 bytes .../res/layout/item_friend_detail_card.xml | 145 ++++++++++++++---- 10 files changed, 125 insertions(+), 35 deletions(-) create mode 100644 app/src/debug/res/drawable/rect27_white.xml create mode 100644 app/src/main/res/drawable/emoji_mint_38.png create mode 100644 app/src/main/res/drawable/emoji_mint_38_2.png create mode 100644 app/src/main/res/drawable/emoji_mint_38_3.png create mode 100644 app/src/main/res/drawable/emoji_mint_38_4.png create mode 100644 app/src/main/res/drawable/emoji_mint_38_5.png create mode 100644 app/src/main/res/drawable/emoji_mint_38_6.png create mode 100644 app/src/main/res/drawable/emoji_mint_38_7.png 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 0000000000000000000000000000000000000000..91cce585bd06e2271638a79a240a9436b22d81db GIT binary patch literal 3193 zcmV-<42JWGP)?3qoy5p(ubFmTrWG(4;^>0n)Gp$YK*a_Ve=WJim43-rI9$?kvx1>{tS%+-N-a z&D^<;1T;i>TWedC2GedG{ zcGAkUKwupVV}lgDk;I)%f(Rjb8w2aGxb^5jqVJg%b60c*-zOCs#@s%1Urq}s1*VL% zUvkNB>J@_}on{ssYH>RN+i@c;NK=ZO!Xeuj?ltlUuiL zwM|cxhMW|r?tK66KM?U-U(dd06Ty@L!A9gPvmPsiV|GO%gdcRR0L$k*$t2M#qx*I< z7~X2BMNuU7o93AdwrEYcj98$q@I-*xQ$6+cf?JQ}+s_-24xuzw+N5EFvVjp}auOxc z3z(*UGp)Y2=C-BbP**!XJ8$i`pW64-j$QZeN-SNv)Fp`mW}MKc!bP~c!|Fkbr_Udd zlv+GT0`3B%egbI>=2O5xzdjNLeJhp1ajP4rv)v`lE0=wp7!b+?HPsii2|>|n-59s} zrwNeb->%u&Os5ZZZEs~StYi`x9B_`a173emRX_S!2JffZi5=MGdR-JSF=@)$g(+0=n?D?F&3-aZ<44!PXkk3-=%Vr@mbkKQUjfv;#2JIQTbA6PE$Ylh^O@2o( z;KZOH8q<^kObZ~-hXN#F$0Xt1JFt-Bi6&yZOa^%Z_4FK$#}-?TEOh^@l~S2TtpeqW zIBBAwd5mcTBs8%tGhzNp#8Psk%CHVq#Hc-iq5cwk%4?ppm=8KsDRWn4j|!OQ{&1TXTlHB z!F`33Fh*DrnN|qn0a9&3qM%I~&q9w63NHh6E`^^e zInzlmoeKVT5pp3W5_w`u|K^?FtL4-Yt-Ni))IWmm}jr@@^BNb;mfc*G`}FQ zsx#+2@LL2j37^_sK*3Pq0YV`l)z9%f(pCnC;&0BL6sQ32+vlp9vL%Do5SH>fd@a5J z%X^}@rknbF4X*8;jTL<*_W5GjWV4zFf+X4Z!zYnTW=3ep%$Yc_?HQO^(=ju(_}&<; zArSjy;=pGZ=C=!-i^W}*)ZPSUxr$N5cJbaNu= zr##&8w@iNuM;?CJH#O~F?>_N5QfCHXL_$7TH+XB4v_a~_Ge0`oGo6r}wT=fWJX}j| z9;G6-6SY}uTqH0rMfekz!>@7_Hl;m^D3dbsjo} zWXAwne|&8~d+_KR8WeMbl;>Q|n4W9`JZ4=*7k_k4py2MtG$>WMp+7z}U%99?I=nRIw$a$Hz_zGh znPWOe?ODxmJSOeEj(eO6bNq2t-pd#Y03n#n>iDCJEY1QrrYyK-Jps@BJl~SqzW^PS ziCIZiY%D|=pVDoaEY9O08m8vR6-hj{z68%T8Azuyc%z)-!OusKEDmTS==4F>gZ_;` z3ZxU=d661yimk!g*dmm$DCS10adSm0)|R&rDfq;pf>{|=dvn5S$2e)ysKHm4oRnWN z(=v~ihN4aBaMqqBO;7A!Q-(KZ8|bPp)-lK57YQ$CE7X|Ba6;3za8j-6PzAQ&62!7< z;b&ucc>@+_V)Q$VOHqx685MYR;6=|TVn#95X7U{vR&1G2Q?6!JVM7S>xiT|mKdyvu zNvV5oNkK}3fChp-%b{3CFo#!L`E+jcZCBrRDo~XjwN2_%&TscUaEoPF_a!P);Z)QNY$4o0 zDz&S~F}DwX{BdFy0x{{b;|!a~+BzZ<_pA~aj7n7SQq;?8Drw1EzyHNM9z>yreBw!Ue+G3RV7UdbjW(d)& z0s0I?pqy7J2xf>QAF@bz3$*>T7e*~a$f9Q~12Hp#C@)GgE`OIX&AWef)3zWzjtgkY zpxk!XKX%NKX?C?_;zoK!18Jg3*MPd{(+ho+4*e?xen1%IZ{Pi;@7W)+ckJ0wm&#%Z zp}dSUTt+6S>SFW(9O}bwoX$sSv+(cq$@s3FckN8r(!2HLF-l_73Ti6NmCyd8KbX0D zxG}1((#>$(ALFEb@FxEd8q1$o&wIR1^@fb fg?6ERT-*Nv$oQRFmR_ zrSgFK(1(^j&Sr?&LC3GF!AC^ORL9*qC@GXU|BzZpT%(??Pq%4aA)8uk2+9LCeUv=O=?wRt%I}$ z(uiVT`L%l0a&0=*D=BJ2?UY6*i(-51c5I1mN>e}MBhjIw4Z#*<{s*2CPrl+#1qxLM zmetNyg{r2PAxu5214^sfgHrz1$Ov{Mw#yD4ePkp$_?K(I=5=mYS^7s#lqc;aSzH-- zZKdiUKAv9(R1i~H(oSHke-FY|*vy>$Lw~>ci=~c~I3@W4dr2Q-ztHe5v?&FqL!VxfJZs`RB{8q9{u(LAA4{ zR)Y%KQ$A`%v47*Y%9bxTaAw(iX2n9wQ2IJUnS8-3Vz!)#s!(Vjr?S0SvQw=prLQxT zuH~l-X|p5mvFU$9PA;th^-+^>Ba~W(Qq=xZC2L0hoGrCV6;*jn<9Vaj)JLIA43vcn zEp@+5IXcAT4KbdrC}p}gX{n^?)8X`&ap>$@OR4oupZWw!)yAL@wIb$z)~2EhF%}&y zpx9KY%2FAp{&ozD?_{y-(fg4YN!BT)uYtP!b{4Py>lB=>2=3Uw13bhVDph?@An7D% z+3UACJ?Wudt7~0Ko&NVp%)W6E@1C5&;om;nboyTT)BkaGHivf(p21tso?cU_>MQ`M z$Of8Debn})I+H|VeQS#L@%-sawL`Y~nv$-M{JFqQgA2ceu$dgXk zUe}u1_T9T6Dn1IAui^{iJDaYlJAZLMUVr*!MEhbG*}b_AO0NpV>2bU5E_l9oF7Pg< z^E3Kj<;B2cw7dI+kb$Djci-wzCLgmp@coSs;Pd^TWwyCj+oEkj`JRtc&m6bfMQnnOKop1yMvr z_+R2edOP##YGWwXc=s*LWCGh{IaUA{08*OKOT*mM#fBzfH7L~Ty<3_i)zlqi$K>t> zm20e&Zfp{ylmS=(XP^Q&lV@O@uUjdsz>_(0$~ip|h_Gj6fK( zf`wnbC{Obj8%(qeWzw0-B1Bw`a^ZUeF8sC*+fzE z$|QvpW@ip^+KnCy?zQJ7eDT5E=xD?{~PA_s@oV<3YuRfjRT?8f$aOszy3RmnB&173jwQ8rtHXS3 z+gM(B;_1FZ>{C_Bgi$^KPxyb{d)HVxcoX+6>*tZ8lOyFm6{Sq*W8LUMJk8w7@2b|2 zu5nV$Q|`BuS2|&N{H7}v)nN?Eq;Ng&d*gSHr&qwt^~jg^9g#xrPcBCMNXbGw{#5Hw zvJ+VV+>mQ}4pIYj2A-HM^WsD+IEGU;jp=t_c zD+@_4hPaI6NSz0N^^KoASI@EPr_PE0K9OQl{E|9<*zJ(qjgW_GQLuH;f(h!_W3YXW zNQDk=$-s5BE3^K5O9sJp1O!nFE(3Ur>V*VH)N>FPcFE%QAEE5WCdMAkf1F`eu;uG# z|CtyJd(PLTQr{s#hH2q#GG}z{<8Yc74pVrk?C_~SJn);WY4g*6PW0Jf`*uq1qWbsJ z!`((yLo^V5wZRqAmt0-E&{0rNO^i?E8;$(|hEI#Xl`lw700000NkvXXu0mjf2K|AS literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..3a225f2bf8cdae2925c677ff15c5bf234278284f GIT binary patch literal 1969 zcmV;i2Tu5jP)}$(BNgd|Qh3%>^2wff&qz(M$zXaXjq$4yo^Ctq4a1in4IpW{6zMAEY4*ib zg*ljX>6|YE8l_aPFAA!hqdwG{WS21F*qq#e55?DvNK@`xW%s7<6{b|zZnffp&Yg%T^Zx#1?~A%U)3?iNDg|a7I_}E(7)MO+vj;QkyJ)3X0)&ODLI|6YesSY7~l|mmnH~(kU<XSDDrI0ioEwL*WRgX3q@%|k0H6@jw%HhN_&m((z2A}-) zE_8gLb7@IYdg;_C&iwLqIGs({{K$5gjXOu7pZgPL zGBddH<~WW&b)@D(|NEgo!=1@vc<4MXzHnv{NvSF*ed~|)=t;h035b&&XsK&WMUqiu z{xKe^&rU=aLdj}4gPgC~(Q9G*Xmfm7NnyU+LFcAo;)Lb9xL`-Ey4KX4d$+=NY|Q-U z8aD2^d!eLM^_sftv7LD9cYi~yJ%Rom>nottqEIH;u6DZ#1#9kn=v`cxen&lDI0*sy zf45UhL6sK%-oDRcW9O|#c!&!bTCtl773QhEX3@bqo&IO1c7@5%)`YtH`bBD29K0#! zTz|QKE>-pBna|JU=gR9Txv76?C`w)7!52QxO`Pktq#10;%3Mt-!6i<7^Jn3#qPC5% zZu<->gA$^cG0iHs_}Q0^6gNwYgDuZ}eMu;t3dNBPXd*H;U`g)ZJ7Z**hLR-}la#it zNBZ;#Sd{$rO`9sH2z+LSoG1fka}%Yk{3w4abV$*4*P3OaFfZjXH;sYBnynVe>7I(ek69ITA`a^@S}pp>#e|n8f;c z|NT}V#JViY)wR$&Z|%cv4}KhDL+8+uNK{FTdxcP9Rx%N$r66J!)_r;-l09uTp>%%A zp9LBH)fNx@E-%XK+kKSY@wtzo#c^OuQ30mEYII)$)Abc#8+LEOnyt6h1*NljUI3S( zi!8tN$-U4jT^_2!B&^$hJMd6v7gMPgs(r1QT`JDXvE; zc&G|NPz2H{tsrXzO2;UD<&!E$twP|Rb*xy*HT=4br^_VrbiW5y)S3!S4)9C+xX4_&sxjl_({ow>*t zBc|1sx4gRD;mH_qaI=Zu4ls0PC4F`&jJ7ejR%7Z5RcN%L4apJZ6`n%n_W9|nhwcl6 zJbI~pnm~iPee`;cnOcBx6~zb9$73q8;~V$wKdFZ-A8L=>y?4m>{D<2zF&=eIEbY47 zC=?cf0-9w4t9cg`SC5vUsw7qlPY(Tf8=179=ba#xZSugGL~VbHW+;ng?QGT~DROJj z?kCYCVpDX+e(AfrzIC*cW6@uogD*Ujf)G#801p?)SotvtZc?<1#};WCRzSy(&k*(K zU!pL`R1}BOst!znfX00000NkvXXu0mjf DIbpn5 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..c8b678999a65680f883c0e15004923e4eaaeed73 GIT binary patch literal 2699 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 FV1kbm7!&{i literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..07c276d84b288a397dd04e7fb10e580b4d6aa3d0 GIT binary patch literal 1848 zcmV-82gmq{P)n3scv^%qN^YYvOJUh=b%dpCENoSKy0(%+99>#Ew(&z%T1C2BT&MWBGH1zQ%+c}$H ziHvEJS?*+%fB#zxbh{ zR@|=vN|p0TyBS~Y9D<|mhx+5aM@)TgE-9TI(3~ASTfA`Fp-ejGW${wx1ktcV6MCYx z3dV*0$)rdRTp=UB-B6|fG%n?*adz>1tIqRZ22+_Tqz1U{Tsm4fgJnOzAyB5CNzI%6 zMBgKYu+%-AS@uv$&TTl9DJw`96Zz?=3WfG^4ffcKoZna|MSYdaE-X(`2Wk(eg5IlT zgWo8nbR|#iC-W&|`S;j#duLu1HcqK3lu3cS??U^!)218#aZt)YnY?j%zE)wfF+Xi- zwqZ7A1z3y;@T>U!UI?#L*nMkjIk%}aRsr+;mz)PG($ zhJ`CRT=>Tr{`a@HN@LVfsx%A0mS~TubKLg1^>&9&Vl56?6pF~4oh~_9&KpjjIkNB0 z25C6qTnDvMDU|Qq?Ig9wzinF=PlqYKLe-X5Dpj$m!N)&`qAN&+EbiO8v!P9GfBHd; z{pAffEfMs6{;unwbWJF8-x7+$vc<(9x;U4+sE>HBQ;=6&SLkvhRK>_kZ@P)qEC^pT zgfcGa$^J*Mt@CacIB{S3)!+^{;q9v$w@ImNN9!Qsc5GFsO5U)T!yZka-(sRpkIwZj z35DD;=8Y|JhImg4BJHs%R1<~W_qW|^!f3pjIkhTOkr?viFHg^oZL%fgmL;{cE-2|q zyz#r^c<<#gL|USym3wXxpM3bU*!HcRL4W@FchUrVhQam zwB1%(?!IQg)}hpy11FGvdkPOe|1~7Hb_8`6Qwuoxv%`4vH^(vfo!w|=O&DLe3|AEq z;SSkazAlu>PZiQ=w&L4p@@ ztKKzCEv9K(H&0M|OvrRY zrAm3gqwOLowu#flGfVBwamZNHl28w-Qit56;=V6ux#l&X)H*_!j|!y`OG77&{?*# z(SlRoA>Tr!%$Z~fv>`DLukdrzT>!R^RHKmR(PTCPyU1@)O5Jj$9Qqd6tL_j*h;Qus z!oKk;m^r?^Yg#_d&G2$?Mby*Q|t!VYBR_t(t!7ySw+FtnjS(aQBN> ze|^6a`o(-q3@j!*NUqiZMNg<$Q0@nXsv(p`YiCY04RF!Qr?RpAu96h9Jy@pt^$GoEN5`ijm*s zK7D!xEPC^8$q^M{IKs-?JoH;A`?->-V|l0@CqhT literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..66d7872d367769bc1ef999efe0a1223952b985d0 GIT binary patch literal 1989 zcmV;$2RitPP)Cvof~b%|q4O4IVEGz8Kns%W5Ap&~p$O}3Q5miA^mX@OEr0Fk=y5Fv6z!Frk7c&&x3zglc=Qm8Va61Bd-vjXBP zF_Caa{TRl194VECP#gi+sHT;O+I5InVbtg{BMeZ0r>}9PixGbuED1K|C-zyC93JLlwSC@Yq=csjkdP+n-&|R%mCg0& zhR6cV^iNA)UnMg2*`I07mvkT9PbyRr2X|C$$A_FPgL<5vO-|FBMZvT>kNc88cQ)OR zQGX&gvB(Zq1WG~9Lo7Wn0;QzPmh~8$gUz@nvP*<%=*dk^^mog^##MZGTJXR8!+n=c zi5cBVlvL{Gq2|F%U4&KR;f8$(S{3_SDjJWO>ofX~s(33Td7;m{q@kv7DU``4yf}`= z-qII}!^XbzVANMX8urIpNAkL&*_G+V-PV4|8yg zPp+L(viS1lq4YH>S9fW4SU-_+FNGq_*E0rxYYe@RQfjWO`~N#RYDVg0LW+Kb2e_tD#jzl|t_P^=Dqe<-cD*XZJ4bIPg)t^M|+b z=O4dXP^lXl>c~?sWgOm)gLh;7_9mS9)d^huo{>FSI&()L2ipzIn zG>(z8L-^XOPs6DVWtMOAC%55+?q47|IgMb%S!7cKZ~hDG+8eR!sn6ynm#}Lbd~oU# z+8*dAs1$PNbu0qk7bnU2@qs9Ah@z&Ho2mLf*JdE*Bblaj3Zp!(tA0A#tJ2<32o@E(tZ< zH<+1dPKAXAybMUGydA0B=2?GxQ&A{WHqmdAyEs37KFT~!woK`*q8z1OKlBRHu9t}~ z$->xoX@IU46mt}mS$OC-j}?W=H0XSWC&4897~>*+@06M@Yxy>OWHW~Tc?pJ!EJ%fp zMa!mBL&wIFP^N5rWw#MR)sGIh1 z=IRxk8t%vNR9ufK(Y|jd>b5qOgfiucR05py7RI^X=mmJ$QNo80+@;+RuxBuU&u{6} zFA!|;8U{kRtNl)VQ>Q--zK7SM(`ebVqbw*>^z`eZkTS}IlAfNGDN=su(y{+eB$E=C z-%nxFRS%UZm46t_C_W?T-(X|x!4|Ysp=_w!AGi>b3Bh9)qm@2cT|6~a0UXxRRwpQFc%YibP z`Sg(H=@BY8|7(@!l=X^LD#-h9q0C<$t%2hFWh#94c{^n#EkRcO;!rGfxml>5qBRK`U? zPKP~kD$9V*ooj_)1mjRwI~@k#FE@E{a@L#uPj z4bb<0{)K18OrP(*)LYMjtV0)fYi0K8o7<`-G7+Ln6q(ewbxu>B2+hdndwY5l#peDG XG2A=Z+mIAz00000NkvXXu0mjf>Fmfl literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..91cce585bd06e2271638a79a240a9436b22d81db GIT binary patch literal 3193 zcmV-<42JWGP)?3qoy5p(ubFmTrWG(4;^>0n)Gp$YK*a_Ve=WJim43-rI9$?kvx1>{tS%+-N-a z&D^<;1T;i>TWedC2GedG{ zcGAkUKwupVV}lgDk;I)%f(Rjb8w2aGxb^5jqVJg%b60c*-zOCs#@s%1Urq}s1*VL% zUvkNB>J@_}on{ssYH>RN+i@c;NK=ZO!Xeuj?ltlUuiL zwM|cxhMW|r?tK66KM?U-U(dd06Ty@L!A9gPvmPsiV|GO%gdcRR0L$k*$t2M#qx*I< z7~X2BMNuU7o93AdwrEYcj98$q@I-*xQ$6+cf?JQ}+s_-24xuzw+N5EFvVjp}auOxc z3z(*UGp)Y2=C-BbP**!XJ8$i`pW64-j$QZeN-SNv)Fp`mW}MKc!bP~c!|Fkbr_Udd zlv+GT0`3B%egbI>=2O5xzdjNLeJhp1ajP4rv)v`lE0=wp7!b+?HPsii2|>|n-59s} zrwNeb->%u&Os5ZZZEs~StYi`x9B_`a173emRX_S!2JffZi5=MGdR-JSF=@)$g(+0=n?D?F&3-aZ<44!PXkk3-=%Vr@mbkKQUjfv;#2JIQTbA6PE$Ylh^O@2o( z;KZOH8q<^kObZ~-hXN#F$0Xt1JFt-Bi6&yZOa^%Z_4FK$#}-?TEOh^@l~S2TtpeqW zIBBAwd5mcTBs8%tGhzNp#8Psk%CHVq#Hc-iq5cwk%4?ppm=8KsDRWn4j|!OQ{&1TXTlHB z!F`33Fh*DrnN|qn0a9&3qM%I~&q9w63NHh6E`^^e zInzlmoeKVT5pp3W5_w`u|K^?FtL4-Yt-Ni))IWmm}jr@@^BNb;mfc*G`}FQ zsx#+2@LL2j37^_sK*3Pq0YV`l)z9%f(pCnC;&0BL6sQ32+vlp9vL%Do5SH>fd@a5J z%X^}@rknbF4X*8;jTL<*_W5GjWV4zFf+X4Z!zYnTW=3ep%$Yc_?HQO^(=ju(_}&<; zArSjy;=pGZ=C=!-i^W}*)ZPSUxr$N5cJbaNu= zr##&8w@iNuM;?CJH#O~F?>_N5QfCHXL_$7TH+XB4v_a~_Ge0`oGo6r}wT=fWJX}j| z9;G6-6SY}uTqH0rMfekz!>@7_Hl;m^D3dbsjo} zWXAwne|&8~d+_KR8WeMbl;>Q|n4W9`JZ4=*7k_k4py2MtG$>WMp+7z}U%99?I=nRIw$a$Hz_zGh znPWOe?ODxmJSOeEj(eO6bNq2t-pd#Y03n#n>iDCJEY1QrrYyK-Jps@BJl~SqzW^PS ziCIZiY%D|=pVDoaEY9O08m8vR6-hj{z68%T8Azuyc%z)-!OusKEDmTS==4F>gZ_;` z3ZxU=d661yimk!g*dmm$DCS10adSm0)|R&rDfq;pf>{|=dvn5S$2e)ysKHm4oRnWN z(=v~ihN4aBaMqqBO;7A!Q-(KZ8|bPp)-lK57YQ$CE7X|Ba6;3za8j-6PzAQ&62!7< z;b&ucc>@+_V)Q$VOHqx685MYR;6=|TVn#95X7U{vR&1G2Q?6!JVM7S>xiT|mKdyvu zNvV5oNkK}3fChp-%b{3CFo#!L`E+jcZCBrRDo~XjwN2_%&TscUaEoPF_a!P);Z)QNY$4o0 zDz&S~F}DwX{BdFy0x{{b;|!a~+BzZ<_pA~aj7n7SQq;?8Drw1EzyHNM9z>yreBw!Ue+G3RV7UdbjW(d)& z0s0I?pqy7J2xf>QAF@bz3$*>T7e*~a$f9Q~12Hp#C@)GgE`OIX&AWef)3zWzjtgkY zpxk!XKX%NKX?C?_;zoK!18Jg3*MPd{(+ho+4*e?xen1%IZ{Pi;@7W)+ckJ0wm&#%Z zp}dSUTt+6S>SFW(9O}bwoX$sSv+(cq$@s3FckN8r(!2HLF-l_73Ti6NmCyd8KbX0D zxG}1((#>$(ALFEb@FxEd8q1$o&wIR1^@fb fg?6ERT-*Nv$oQRFmR + 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