From c7409e4decf19deafb7657cd7629fad52dc5b733 Mon Sep 17 00:00:00 2001
From: klaus <klaus@vividnext.co.kr>
Date: Wed, 16 Oct 2024 02:25:55 +0900
Subject: [PATCH] =?UTF-8?q?=EB=9D=BC=EC=9D=B4=EB=B8=8C=20=EB=B0=A9=20-=20?=
=?UTF-8?q?=EC=B1=84=ED=8C=85=EC=B0=BD=20=EB=84=88=EB=B9=84=20=EC=B6=95?=
=?UTF-8?q?=EC=86=8C=20-=20=EC=98=A4=EB=A5=B8=EC=AA=BD=20=ED=95=98?=
=?UTF-8?q?=EB=8B=A8=20=EC=98=B5=EC=85=98=20=EB=B2=84=ED=8A=BC=20baseline?=
=?UTF-8?q?=EC=9D=B4=20=EC=B1=84=ED=8C=85=EC=B0=BD=20baseline=EA=B3=BC=20?=
=?UTF-8?q?=EB=8F=99=EC=9D=BC=ED=95=98=EA=B2=8C=20=EC=84=A4=EC=A0=95=20-?=
=?UTF-8?q?=20=EC=A2=8B=EC=95=84=EC=9A=94(=EB=88=84=EB=A5=B4=EB=A9=B4=201?=
=?UTF-8?q?=EC=BA=94=20=ED=9B=84=EC=9B=90)=20=EB=B2=84=ED=8A=BC=20?=
=?UTF-8?q?=EC=B6=94=EA=B0=80=20-=20=EC=A2=8B=EC=95=84=EC=9A=94=20?=
=?UTF-8?q?=EA=B0=9C=EC=88=98=20UI=20-=20=ED=9B=84=EC=9B=90=20=EC=BA=94=20?=
=?UTF-8?q?=EC=99=BC=EC=AA=BD=EC=97=90=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../sodalive/live/room/LiveRoomActivity.kt | 24 ++++
.../sodalive/live/room/LiveRoomViewModel.kt | 4 +
.../res/drawable-xxhdpi/ic_heart_pink.png | Bin 0 -> 10727 bytes
.../main/res/layout/activity_live_room.xml | 113 +++++++++++++-----
4 files changed, 109 insertions(+), 32 deletions(-)
create mode 100644 app/src/main/res/drawable-xxhdpi/ic_heart_pink.png
diff --git a/app/src/main/java/kr/co/vividnext/sodalive/live/room/LiveRoomActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/live/room/LiveRoomActivity.kt
index 8f538b3..ae63523 100644
--- a/app/src/main/java/kr/co/vividnext/sodalive/live/room/LiveRoomActivity.kt
+++ b/app/src/main/java/kr/co/vividnext/sodalive/live/room/LiveRoomActivity.kt
@@ -21,6 +21,7 @@ import android.text.method.LinkMovementMethod
import android.text.style.ClickableSpan
import android.view.LayoutInflater
import android.view.View
+import android.view.inputmethod.EditorInfo
import android.view.inputmethod.InputMethodManager
import android.widget.TextView
import android.widget.Toast
@@ -467,6 +468,15 @@ class LiveRoomActivity : BaseActivity<ActivityLiveRoomBinding>(ActivityLiveRoomB
binding.ivSpeakerMute.setImageResource(R.drawable.ic_speaker_on)
}
}
+
+ binding.etChat.setOnEditorActionListener { _, actionId, _ ->
+ if (actionId == EditorInfo.IME_ACTION_DONE || actionId == EditorInfo.IME_ACTION_SEND) {
+ inputChat()
+ true
+ } else {
+ false
+ }
+ }
binding.ivSend.setOnClickListener { inputChat() }
binding.flDonation.setOnClickListener {
val dialog = LiveRoomDonationDialog(
@@ -894,6 +904,7 @@ class LiveRoomActivity : BaseActivity<ActivityLiveRoomBinding>(ActivityLiveRoomB
binding.ivCreatorFollow.visibility = View.GONE
}
+ initLikeHeartButton(isHost = response.creatorId == SharedPreferenceManager.userId)
initRouletteSettingButton(isHost = response.creatorId == SharedPreferenceManager.userId)
activatingRouletteButton(
isHost = response.creatorId == SharedPreferenceManager.userId,
@@ -974,11 +985,24 @@ class LiveRoomActivity : BaseActivity<ActivityLiveRoomBinding>(ActivityLiveRoomB
binding.tvTotalCan.text = it.moneyFormat()
}
+ viewModel.totalLikeHeart.observe(this) {
+ binding.tvTotalHeart.text = it.moneyFormat()
+ }
+
viewModel.coverImageUrlLiveData.observe(this) {
binding.ivCover.loadUrl(it)
}
}
+ private fun initLikeHeartButton(isHost: Boolean) {
+ if (!isHost) {
+ binding.flLikeHeart.visibility = View.VISIBLE
+ binding.flLikeHeart.setOnClickListener { }
+ } else {
+ binding.flLikeHeart.visibility = View.GONE
+ }
+ }
+
private fun initRouletteSettingButton(isHost: Boolean) {
if (isHost) {
binding.flRouletteSettings.visibility = View.VISIBLE
diff --git a/app/src/main/java/kr/co/vividnext/sodalive/live/room/LiveRoomViewModel.kt b/app/src/main/java/kr/co/vividnext/sodalive/live/room/LiveRoomViewModel.kt
index 006238e..532ec7e 100644
--- a/app/src/main/java/kr/co/vividnext/sodalive/live/room/LiveRoomViewModel.kt
+++ b/app/src/main/java/kr/co/vividnext/sodalive/live/room/LiveRoomViewModel.kt
@@ -64,6 +64,10 @@ class LiveRoomViewModel(
val totalDonationCan: LiveData<Int>
get() = _totalDonationCan
+ private val _totalLikeHeart = MutableLiveData(0)
+ val totalLikeHeart: LiveData<Int>
+ get() = _totalLikeHeart
+
private val _userProfileLiveData = MutableLiveData<GetLiveRoomUserProfileResponse>()
val userProfileLiveData: LiveData<GetLiveRoomUserProfileResponse>
get() = _userProfileLiveData
diff --git a/app/src/main/res/drawable-xxhdpi/ic_heart_pink.png b/app/src/main/res/drawable-xxhdpi/ic_heart_pink.png
new file mode 100644
index 0000000000000000000000000000000000000000..5c165adf3dda922647a99b81d9d03b52bd4145f4
GIT binary patch
literal 10727
zcmb_?2{hF2_y5?JgzRg^mL<#Bv&+86*w<!^!7yf+8EYszAyG02WsNL}5GhN9EJax&
zEmDMJDNErus6N%F&tKnj{?2*NJaeDd>pu71XS?@(#G9Gw9i--<1^@sD4fM6agl|{E
zV?#+!_*|lSX#)Td2_dw!%)GSpw9rU2#=-{*gCBQAyTHMEno^32#{dA~6c_{o))y1*
zgfc)NoxMjzs4)THxVS_x<aA4Odviaq4{{%P8Sm)$l8ydl8-NtV!5q@q(M*{qIUCW_
zdhx-5dN4TQLih>~u+LONSQH9@^Z;(AJv5@$m^%z~5D?+)aR#`s5^+<yqKT>odFL1*
za`d0MZ)Bbax&yzEobOF1b(0C7du<eZgG>W?tqBO6#;4|9ECnnz#at~cj6M<{2Bb6u
zA2rmd!G;}&o4W<;#z*jj3c$=N%c-AmOo=p!#%ydFuV~FT73sNh5?$QsT`14cXYsc*
zzr1%bJba2yv!@_E92!nbLb7cch0o+Ai9Dl5(soy|t564S24l-eWM`vXB(mi)#A=sP
zR1-pmhua#snV0}X2~ng393UbGkPuo#0Aj)i?an7am++(#F?^E~5#$^IvRw=SFha!n
zqy3Ud_$RK^E|-dcn<kRpZ8H(tOGL`MZ5DzS@(BEHo0ib#ibViO_jD5NSOU<8LoqlY
z)&uGT2V!vum=_!)288+H;6NWJ76(TH{h>%W3Wq?!k6^IAerRPZ5Qaqf?2!E7FdP~K
z#KLhq3dO!@-TlTu1AGvHa3laA4U(2p0x2qiWPu=%k_<>mP8RUJR|1Ci21)`o{je^6
zSOEAN2WX6Ql>h)J&J!MjPEwGxjMRD3@17Awr4a4OiHJ!6SH5GUK%gtc-#r7kULpC>
zwkh}?X@atyzh5mP7$vI+P%Ky#Cv;Ky=-Xid015t`hbXX6-5&s;&qr9=;%rTfl?c{K
zKzEk8M4-3Nt}2y4B|_61j)MXNy^$!aQlKi|E<%aW-Vsak0e2xdFI7HU6EmO|8UqK)
zOMoOmd}`D{AW#M4>ZSzN*8N5&{8Hufz~Ow9Bqaj^0we-tB+wXlNy45|lmtmjN=u6q
z5aQS%6b>3Fj>7WqDfzBP8;*rx5I#5r8U@_Z3w1&J;Z*tfb_V+Kw`Zp-?8i7hei-EL
zD6TL`I1=tnm~5=1l!TPzpLhgse-KgFZ_yycMKTcTLm+|vNWvl9{&DLU)=tlV(%^xJ
z|Df&k{3p%F1C2vtJ<$JQ=#TC_1-rAb7aSE=m=X*FhZ5HGPf|kP?j%{jeSejH??58d
z{<xl1BzNY3(ECgH_oTlnQ<41R$UFA9{xhY&>Df_!9Etl?`j1UJ3rYzIMY*f;1&X`E
z-JpI*9G}|%u-T#BKFa^S;s0OG{c6>&bANVY$3YCj-2;dH)r;MD|ElHN4DChq&%XU~
zeEg60{mY6S({KnJ68`_gGJh$MjFh;Gi#XN`j)QspkGB18#*S%NKNnBJ;rj>UG@<Ul
zO8;3BYA%HJ;046)+}3}#;TNpm{va3{iG;etf!~geeU<Lu31$<{r@w)sF>ZdyzXk$b
zpfE3Y4B8Lniv0_cPtacm0*3Yp`n!<rT$=ljymPaDyJz<WyTV~;4D_$!Mc82o_x;1V
z2m9*@`v(6z|6LJK3?Zs}ImG_HA>0u-DDtoI?nnd<2gmHI_Zu!~e;^v^`d1+M{$X{;
zKz%$Au>I9x;D4dbV<#osSJy6TFLB!!i$Eg%u(-cmN}gyx4C;TF86?_&|8-AT$0+yx
zVS72}zW(?iP+t3j2zlxLn4P@$FHi_?@4r}kSdU%Y{%eo0p)g*^zrg+FX2QV(2|4^<
z9qd2Sd7=G}$)B)5SLpuc{*3?Ib6~HC*mnv7JP?0zx(30KNOZuTmF-D?y&rdzlYd{P
zDugswNoy|^v_zwkKN36@$=`eaN$z$@V8UsQa#xez1AhDU8)jEATpNmmtL>B`;vhwF
zkgO%44%sb5j)D{jjh_bEL;j}21nr7&3;KhO-2!Wm{S)RV_D;&J1cqbLNWYzn#R`SM
zsY$Cy{z?2h%WNmJCR8;T1k3<MIE#HSgbHUz$qxnpjrd*H2@HZzXza12z77Ag?03A~
zKPIcm?8Il+;Gd<xGi?9J_*wcBW2d4}GTW(G?X(eu5(vBFl`IHEFzt_Bzf*Mxd}}yn
zm$p-{exv;?{+*(Q_Vz)ecB(BcG|CO(?zeY5|C+t+TY3;i`cs+lQzl24+<g!-`yvSO
z{*#V9>F>qNZou~UPURc!`wJvBc{w>5xo?5{=e^QT@z`VR&XVmfvqUg&SK04fzlU5G
z3B`I4KtE=R@YdiP_4lsdsTMFe3a$n9!TDj}mO(ynweQ4#b^OHqQEToTCa#2y_8*1f
zzi{7l?8R66w;FIyN_c6YMorl0-(NteQCq5T7ytk)j0W1rEdz<>oem^AwFl*7U|%#E
zxtcL^*_-QU))eU&WEJog2nq<Mok^{wA}3>h>Nyg7kP^ATQS6C*E-F4DC*Zd^;v~d-
zB29wXJk64nnT)|K(OyKPpmr<@Ky-F8^EG7QLuii7=3PbizU))06#=Ugjk9Dgs#g0h
z2W@R{_kI!4p-Ag{muA~I#Hg2SIL*-@xxC(NqIrN<XIoqIj^I+Yn+b5Za@9%wC}POo
zNJ=pSl8J#_x%s5#(|zrMsF{UILy;EeQ--yS<CF@y=`PQe6m!i!<tHDxzuYf$zeIu4
zWoq6gJ+rW+xJYFY;8;{ar_^FwEnD_{W_n1O?rYx1uL(Lp2@TT*4Uew|*(~-fQI8~#
zvfmMi3NB&0##$Y4@D60MprVq3&XVp71*!B~!L1t7xGpPY|G?K4xl2y3nANKnUTa%z
z#uQHpYR=Xn3MB_1l=lVoo$&ZA_7(S*X&K6p`@>s<Gu~O}>Ty}A<mcNrK0#>Ilncb3
z3*WNhoLbDzU2x!kXamglS`1*HJ8dWGckZK^2h*Da4{gKQ4*`li$>wG*+}JK*S-LW?
z#QQ2<=*>{LP1(th&0tp9A^M?EwdW=%HFdwwMR7`2hp?7czJ3DFCWmjlNG-86420@R
z-T#8}CXMMV@S})qu%!ep6*rIYixPFD7A|y+p%n^+UEfplF57evm+`w%@hByy22a;t
zqKkS8ThG~CSR!7eVvkc#omsKhvS997TZ?>jTqLed-2hgw7JZsNlgTigu2UskeM6Et
zjJBBKsJ(GP?ZHh4E`i(=L>F&vI_sZg00ysqz=@Srk))I7DFI?osZF71mx@DE4A^u1
zJQqM`lcDh?kB%50M0R|rF^sdcj}s_;jj@|HT&GkCu_{c>O%E8yBrev^ES)OpK3MtS
zvl9m?rV;#JH{~Ifxfu1ljd(BhYk5nKR4R=~K0PT-ULK-0{b<KaT~Ui<Ep;L6;}^Il
z)+i%qzgil`wLNXWcuA2;zJTZSP1hTbmDd$c_01Xu2bswMPi>^;9Xk*c^47zZos!k1
zE~O*tK~)s_Y@g&BuZEhYxv)V-muQMUwJP>KTzo2L^7WGs%dxTUICYNxx}JFfS#77)
z`1-<;CgpZxZ8L3=&0%|rfbN`$D13(7vw|$yQw3d*yu#k+QOTrwp;fi&bV<oU5!n$J
zdp>o7uvR=5!~7b*zA0DN^bsj4dJ^JYZj!Q?ZOzN5Uj>U5Xb2wOdO<<YC_Q}YDxQq~
zxS94#QhK0;>5!uLMJ$(i1TZsAo2<Yq!?@@msJ->HL3zxS{<eY%hsRe|m+rOe`KOjt
zl|J4B9N%mZX5wq`JG=g@bCg-0<N^3C#S_gJDY>1Tv&z=y?4yJH+E6#8M;j7o*GcDK
z*wdf}(Y2a0H-;gzj;cyk27#V*v-VD+yvNI%%~a{-<sV*w-+y+2&*pLNC#_TXUU#;;
ziF6_sGXk^ISL{a@l4!gO>Z0*3#m&}qTYZbiS9Di9aUFy0F2;2Rt%Vm3IlyObzNna(
zcDt8d&v$7g(7Nzlp^mg*gyyR-t7HBbx<<^sCw0AgX~rz8I6bj>>J8h2q8By`gs<Lx
z%Hc$lf@Bhy^Yoms^>TK(z$sBn3W_5!#g%84maTGyd%hjZd$1ihUW0gMebtm6hLcHA
zmk+D!{)}WKyXeM!L&*SWzoLHGtl(*wWHd^MnsFj27G>`E2w%Z;dm<_)TTM7LG->?q
zBI$LAqGG`K;Kiumq9Ywv748}*a$P5N2F$hbE|H!b7LmEpYVVTMC9EtJ4OEq}1#c3r
zSC7T!xWh!2XD1IEhaTbJu^1h<cEUq#X-(e^m}Jg0Fg-i*?nQ%nooHf~JiNvUp(?Xk
zb5V8SLYqSW4c2%Di{VIDEyrSd@L40;Ea6QjMrA7r1)!TL5u6dLYEg6Zv|m-t+N%zD
zs+LNDz}&pRrygVWq^-)rv_Nq3xozqe%2S|^t#%RmSG5-`o0>@5KHtt7G})Ht=B($=
z_GRx<T-04@6Dcn~kp}24wC`8zbft_jQkZu+vIe!>GEe^G=!e_REyekh#%;tg&XawW
zH|mL*EtoLY*XNWi(5^B&KRTCXP8Mpku+=KbX4bRP&Rj&1uea(A&KRe}*Foy}<IfvD
z)DuF~`lk3B-Fpgc_hj&v(8$m=m{|vv4w^H*fg8&ymeQWTLFr`ow6SA2NYgYTs3Qu+
za<);KStDjVDw|Rng@jNWxIebY)Jgy1;w1JQJun%<MxLBj6?!kW<=J8Xc36YctFijB
z3162JJW$HB`oIfbG!8MJ`WCN`oWn~5G0Bog={y*6S9-J>k5h_Ad1t7K=tgaMBqe3e
ztT5HgdJa|vGx2nGg_rPYtOKze$~?iih4mcklT*fkaidEg@T8ovPhqiedD#MrXTr;(
zdK-BAjk3d>vr>}<KBevDH-|DL%G8zaYPp@7NDxU9H9Ri*Aq99OpMxO|nSQc*CgPmW
zc%FsFSZDK%)BWKl_Q5A*tn3OMBZhIt3L-FDqwOUNB?U4gWhYG~1~w&2c#*pka04Yr
zG*lsXw<meNeEQUp7w61ZPeV9>2{WWC#;%SLE=A*=?~XKu$R`n#aj*4HTwqY7X%?MM
zvguZvyQ2ufrHT$bE~OEpqe*VzfBOiW2M*R<d;ff?B7Atn_1ca2W5ylYFJbn)S^R9m
z+)%ZGP-BhjQF#4lYgL*)gR$IO*n%X}hsMzmV019(nf}em<6V(fvPLOS3SF!Us?m(j
zHztmiI}|gsx*M;0%{A+=Nj+~?#OpsD3E;1;a5t<pXJ$E#i-)%B<lXS{dS2qNoRRm`
zq%Qn$2<9ytHqcdT!nhK7AWefVng@S-v%Y6)2(rPBHMlv%jLonYZ?5l2;T>Rp+Yp?c
zSPq73cd^s;ltb%7Zy(MM5i&UV<%0#=qUXBQAs-Z7f~a<XR9t=472D8TAcJ5r`ihK|
za(R2Fpj5Sxd@D$r1B0rn^rJ1g8d}czcczXKs-H|(%3hiaakdRimReQ3bXxZ09~sbn
zo{6~65!uX_172zqP$bo!nbjswkh68>_4J+bA@1;Bd1^Ip0PJ3TVkRWm8m+o05xS5r
z0XlP~_|xHPT$fwX^-Cv-t-G~JEx>G^q_*2L*Egyc%<vt3Et?@MoY$V!!`8c$zJNUj
zSlE#D_GfPeAup|&2s$&~qsC8&iWW7_wnN3vy628qUxe|a``q%im<66riJEORan0n-
z>T9=t&Ogv`HiE%~4En(65eZ-=Nd6OBY(3sKz2fd=2FiAEDF`cbw0SH$n}mDB^ZG1(
zVBcmftFbNdoauY{Nt1$G#MY+bu1St0mgDTBR_@lswKuNhCM@yZmR##$z||I`j3{gE
zptUwZBW~E*gf~5l=x$<ny|%()8_?~-+;&Y$;noNjR=i9s4fv8$pk@$QwU;||B%)vZ
zs$1ArBKVW8=^cYX2sKf<vZ$aeaN~>N<*X2*ET`Oe{(6x6f{!ZfQB)(D!ey1jNQE?f
z|AzWXaIO`mEr!op#~F0WUomW<bShor;;fd5bz3ViteHgp6|#~(xvH(5*D#Ut;OEHT
zy6GB<i)n%|-yV-6HKPqo)3MX80Q2w=wlA0KBcd<Jm^@37V7q8_>a4T?Jqt}pTPIcu
zA*Jlpeia{^p>fRg-t;(6bBI}iFL7K}=K7dbcKR89TaKzr&WAF@&ZHziY}}xeIu5T*
zcBvy_p)Sq~j<@*8@*vpKt2SHcGcvBqIgIFY#OrHp?<U$=yVL>}mK|@mlnZxnmnBqJ
zc9U8g_8gMY)1<w5&U?6?iK-r=k<)yY<1nA-*J6Cywrf6^m}0`t@Mc?`Dn(gQ9!u`E
zr+GJuBtX`v^4Y62L5B~088t~zlUOFHehXk&g<s_@t~YT2FGfl^;Z;SNNaby_c#USM
z0<>ZnuHd|5D!T5ci*QvPWy%4g87_2eOq)+W1cYZNz)|u2$QNs6m)<*LjWfPfk26Rq
z4A`$YSu~M4+TE6>34JWrm7++?GTw2a_w9&3;c%FPKc2i^xg>VkjJ0Cjp+>O(^$kJv
z$>vS&n)y;egXZqUyntpZcuA0KvV+b-8h@P%s<d=EkF@9zNvnm0xoU?DZvcK&FKHCw
z-#1QrN!xC?It|bQkY~2EIwqtTs?XH-95wE9H0G1m^Rr5|)f8%*Qm00indJN9jhzyt
zg)F&3f@pf+N3-9CTo#MIbPcBs`RI)I>96Tv7T_m&f%d<nEWw*JbMz##&6`@iojr!;
zb$h(P0}95o3|M5Nt_`uZ+Ih~zaY=5U0AUn!y*O#4kk7k`SJD*p&P<R}2`*rY;RIix
zWt32Arb$UXDX#aHv1iK_V~@8i*BvD*cr(_|DyY;5F<1?@FDss5>wi3=jpF_~+`JkP
zS2nu(kaD~rFR;;GjA)3jB5F<CywO#folA7%m60>_Ojui~=)FLVo)OaGAhwY)`HK%m
z-bh_8Gt9irdc-9ytNxa9mY>aGa;}wY4Dqt2hS_4XFE>s;yK|fVFwbQNE4wN=NnRg0
zAqU@KMpeV?2C7IrEFu7k@O}^CJnnQZPP|`Ji=WMnE4C2=Ne*gFcCYpRy5MuiyfG**
z<KkPgsGQz2DX~Gdo1+hpdELt4ym|Y{0kdN(l_Kf*%=u9mW}R-TRpyPotJK8DNQbG9
z&G#U|-Hwd6&YPJYpd`sJxH#G=R7V@eS{#B(=u3%eB4@oA4Gzw4P#_|)wbVIL$=cHw
z#-du<1kj2PnV`AD%Fq^Z22V*&UaC_5@UW&CKI44TyN}Z0((<_M(8!K;Y2JB7+d+@}
z*w8MBzgzd1d|)wI^F_8Vz8s<EXYidv>X5Im`$~^XoqB(Wi@qIVzN}lDdGmJrd%1Ll
zoOqR`N?Kt2m|(DU{mR?1iH|Q2x;`sYkaJ8k`m+8c4*-QIt4SRyJj&CqDje&J)g;$m
z%&W@G)N<{eIS9kZINq1kK9d@5Y>y8$B=1res4RN!Q6GljWv|b3?5y-vP$e^tVfGLG
z(26q)0w1w>H~C0yR<A5f(OgW?O$eFqD;GYuM5)wULn+}mc>@sZc3PUh{mVv7?ACC1
zNlIGuT?dA&z8C2!>j!n39*)D;RI9_l<saSLvF0Y1g<%U(Amu}P#+IBhMUX4vy{=$3
zuRFpdpTZnd7KtypSj^GfN*&0%E~bDXA#e0`__F=nX5!X}htQ4Dguzc~idbjy;~$D@
z4SP&l9&tsJBn}*vE>VXxUvac2jl5hdC~*o6@xy&37n7bqqe6}dU%UIZhqms*!!fEc
zDwVA87J2>*!~BLYvV;nr)HcpsdF&bSah`?L5inKNA^gKSkgh=@%@#lE%}8@v2R)53
zd%c+g$hGaB#0vSde0dT`0ab_ZINfp>3HiclBqL3CzPLuBhT@@kPI*Rtt&=p}Q)35(
zkw)XAuZE8vGiioYGOVf<`FgI)Wtj1#US^Q;_Vn`Bg%u$=>17C<Vyd$W(rc@LDOyLx
z`>Cz%cprr(c%o8E)r+JjWkn0*941}ONsjfVD$!Z2TY3UdrZCIRbZzS*bIBjhdvekb
zv`n3JCh1FZ223qP49w*wAStQesMl>^jErO1W;|pi*b3wd>I4Su#(k}njxe+=boXw?
z_VkojAD*D%P!i=Zt$b1;$n!#&p`_`~dBEp+xs_U1zlh1`*B$^8V$E%BR^NFjOO|?$
zNa@SS+u~WybJ`>miA>mj7nxY=Ior_VRk~o?@n<&N&uu<iz6O|*UmY&23d(y$`{0~g
zthKOzt1Jn(f2Ye7ePU~};oSyN1(lW8y#C%4<n|oy$3*1i{F&&B=p%3Xi=VVu<04NM
zEXxnEvpy;^zkF%%$Q4;eT?<V5Xe#c>(K9JVFw!lj4E@sr%6DG9D?isfo1eXXo!?s@
zwo-KU!DkkWvbxWw+a=S{_w9ha51gB2PO4uMIZAqc*wMQ0O_9m7`ZmTBCpz!mWhyO+
zee&@o^HSdwMI=pQ-b_8f%;c&`5RC$SIdyXJp^w&-0_dhHojb>@<Vu~T8E9w@ER)+b
zTg+U2fV7R@`|GNK!r>D0V=~KriYja77VkMfWS|9aw@2AsVsK%U7Zf~QC?eAJswJ{s
zd;2+Hl2YjPONv>M$NpB-9n9yvYE#6k`%vPRWF}W)v!g}v*%SG?F<Zw-Bhg_vx64)Z
zoV@G@*599LoKKtnI^mpc@uInKg@?YLf*T%JIo8uO@w6}zaQnslz#t&-SVyyE92k*v
z>%Oh${jpl##IAZtiJGiAmsUwHDqkv4*4a_zE_CKr-(1!8h?yCYJ4Ed!j7)x;w$VgR
zSIbG+0v}V@T%T0Sd7nfYseJ7AN_X#J37&`E9|W!^<jL9BNIB`Aez$cGJUVw$o38z%
z@bmGRFFNfFlqV#bQvxicdo1HJ)YQWnFx;lCYAplfbLKrd1p~F|%oI^fV|FgE3Ax9~
z7S|Zv*4mXLZ$E-_^`LF72-%ULc$*9|RD}y<b>mHD>ycWXhuTY?x7Qi_@vHhv!!V#%
zU$3@y+2tY81aFJZ20Jdbvfhd>r;b#%x2#uA#@V!vi-zlU02`mpUo-Bd#+5KR(DR+m
z{~RGnNGD5XGK5^|9o=(yrL8=}?8rkBm~9_W#3Y#D{bU-`&)aCCX13jeaIfnarv}s^
z*<160GH3e%i&R7Q%tOEtvO&aK9!M((=Yz+A#UF=8dR9pN-DssNt_}L?wg9=04qcO}
z(ruRzG^Ff5Rs<f&*}i~V2j6jv>9|X=T7eh&y5Y1cAK})Ddh2Gy=m+bd=3z;rOgJeq
z;o|?OnQBHzsp=Bcz(cQ2ppH>bul1Rb3>!Pg7xBPwH`Yqir&D|rBrO)laWCmaYR|}m
zUrd`Wd?fK|!28h{M{+%o=utO7aR=kGa-!GzQeRxxaeP?BVP{_(#ll#{ef<%dte@zW
z;iWGh<EF@t6}#|IdQ4P+&KzL6clGt>h_`pKDxvS+OiGua&IizP!AtH>c8`$wxN)Gh
zAQy72$S7xIk~ZTRyAvHghs>xTm&k=xPXpcD9??>S3`ZR}*;gpGjA;kA#ByH<k&+c=
zR*zIH5hraHPcqTWHNS2}L0L#-U??SZXm~a-262?KiL>~&3bKxhhe4MUCZJc<C@Lm0
z%>)SpU1)E5-;PkHkBs-$I+?Ff$JEeboe*S2>=F$#G+HTAIvLc#{>0bV)Y&aZq4c$5
z)p-L;qqnMK^b~`Rkh47f*)Hu2lL<mq<x6jSI$tJ_`tVO!J$1HKa|*R0aiM~T_U9k^
z+7X%R@Yrc0oXClm*d1{kah}UKlU1fFTPAw`@*TZ5gCks9=|_5~d!I;``#+r}rk9=>
z`cl{^Bxw-bBHTA{(%T+&C;prcDAD85QLPdU<tp~Uw-jwYa-cEhA;YNC&jBt`Ub?Gz
z?sG-0pGNM>35z>CYTc&IOnv90|H)Zuv)Vvr!(Gzzxzg!EAqpGf8msh}jIY>ht%I-8
oQzS`4XT2thU=VR<y^U=WYpU1=%lS;9oqt+0&@t7n(1b+%AB2NK1^@s6
literal 0
HcmV?d00001
diff --git a/app/src/main/res/layout/activity_live_room.xml b/app/src/main/res/layout/activity_live_room.xml
index d256418..6e828c7 100644
--- a/app/src/main/res/layout/activity_live_room.xml
+++ b/app/src/main/res/layout/activity_live_room.xml
@@ -403,7 +403,7 @@
android:paddingVertical="5.3dp"
android:text="공지"
android:textColor="@color/color_bbbbbb"
- android:textSize="12sp"
+ android:textSize="11sp"
tools:ignore="SmallSp" />
<TextView
@@ -419,8 +419,7 @@
android:paddingVertical="5.3dp"
android:text="메뉴판"
android:textColor="@color/color_bbbbbb"
- android:textSize="12sp"
- android:visibility="gone"
+ android:textSize="11sp"
tools:ignore="SmallSp" />
<LinearLayout
@@ -431,12 +430,42 @@
tools:ignore="RelativeOverlap">
<LinearLayout
- android:id="@+id/ll_donation"
+ android:id="@+id/ll_heart"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/bg_round_corner_5_3_transparent_bbbbbb"
android:gravity="center"
- android:paddingHorizontal="10dp"
+ android:paddingHorizontal="8dp"
+ android:paddingVertical="5.3dp"
+ tools:ignore="RelativeOverlap">
+
+ <ImageView
+ android:layout_width="14dp"
+ android:layout_height="14dp"
+ android:contentDescription="@null"
+ android:src="@drawable/ic_heart_pink" />
+
+ <TextView
+ android:id="@+id/tv_total_heart"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="6.7dp"
+ android:fontFamily="@font/gmarket_sans_medium"
+ android:gravity="center_vertical"
+ tools:text="999,999"
+ android:textColor="@color/color_bbbbbb"
+ android:textSize="11sp"
+ tools:ignore="SmallSp" />
+ </LinearLayout>
+
+ <LinearLayout
+ android:id="@+id/ll_donation"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="5.3dp"
+ android:background="@drawable/bg_round_corner_5_3_transparent_bbbbbb"
+ android:gravity="center"
+ android:paddingHorizontal="8dp"
android:paddingVertical="5.3dp"
tools:ignore="RelativeOverlap">
@@ -454,9 +483,9 @@
android:fontFamily="@font/gmarket_sans_medium"
android:gravity="center_vertical"
android:textColor="@color/color_bbbbbb"
- android:textSize="12sp"
+ android:textSize="11sp"
tools:ignore="SmallSp"
- tools:text="999,999,999,999" />
+ tools:text="999,999" />
</LinearLayout>
<LinearLayout
@@ -466,7 +495,7 @@
android:layout_marginStart="5.3dp"
android:background="@drawable/bg_round_corner_5_3_transparent_bbbbbb"
android:orientation="horizontal"
- android:paddingHorizontal="11dp"
+ android:paddingHorizontal="8dp"
android:paddingVertical="5.3dp"
tools:ignore="RelativeOverlap">
@@ -476,7 +505,7 @@
android:fontFamily="@font/gmarket_sans_medium"
android:text="참여자"
android:textColor="@color/color_bbbbbb"
- android:textSize="12sp"
+ android:textSize="11sp"
tools:ignore="SmallSp" />
<TextView
@@ -486,9 +515,9 @@
android:layout_marginStart="6.7dp"
android:fontFamily="@font/gmarket_sans_bold"
android:textColor="@color/color_bbbbbb"
- android:textSize="12sp"
+ android:textSize="11sp"
tools:ignore="RelativeOverlap,SmallSp"
- tools:text="18" />
+ tools:text="777" />
</LinearLayout>
</LinearLayout>
</RelativeLayout>
@@ -512,7 +541,7 @@
android:layout_height="0dp"
android:paddingStart="6.7dp"
android:paddingEnd="13.3dp"
- app:layout_constraintBottom_toTopOf="@+id/rl_input_chat"
+ app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/fl_margin">
@@ -539,6 +568,24 @@
android:src="@drawable/ic_speaker_on" />
</FrameLayout>
+ <FrameLayout
+ android:id="@+id/fl_like_heart"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="13.3dp"
+ android:background="@drawable/bg_round_corner_10_99525252"
+ android:padding="10dp"
+ android:visibility="gone">
+
+ <ImageView
+ android:id="@+id/iv_like_heart"
+ android:layout_width="24dp"
+ android:layout_height="24dp"
+ android:layout_gravity="center"
+ android:contentDescription="@null"
+ android:src="@drawable/ic_heart_pink" />
+ </FrameLayout>
+
<FrameLayout
android:id="@+id/fl_roulette"
android:layout_width="wrap_content"
@@ -573,24 +620,6 @@
android:src="@drawable/ic_roulette_settings" />
</FrameLayout>
- <FrameLayout
- android:id="@+id/fl_microphone_mute"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginBottom="13.3dp"
- android:background="@drawable/bg_round_corner_10_99525252"
- android:padding="10dp"
- android:visibility="gone">
-
- <ImageView
- android:id="@+id/iv_microphone_mute"
- android:layout_width="24dp"
- android:layout_height="24dp"
- android:layout_gravity="center"
- android:contentDescription="@null"
- android:src="@drawable/ic_mic_on" />
- </FrameLayout>
-
<FrameLayout
android:id="@+id/fl_donation_message_list"
android:layout_width="wrap_content"
@@ -614,7 +643,8 @@
android:layout_height="wrap_content"
android:layout_marginBottom="13.3dp"
android:background="@drawable/bg_round_corner_10_99525252"
- android:padding="10dp">
+ android:padding="10dp"
+ android:visibility="gone">
<ImageView
android:layout_width="24dp"
@@ -623,6 +653,24 @@
android:contentDescription="@null"
android:src="@drawable/ic_donation" />
</FrameLayout>
+
+ <FrameLayout
+ android:id="@+id/fl_microphone_mute"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="13.3dp"
+ android:background="@drawable/bg_round_corner_10_99525252"
+ android:padding="10dp"
+ android:visibility="gone">
+
+ <ImageView
+ android:id="@+id/iv_microphone_mute"
+ android:layout_width="24dp"
+ android:layout_height="24dp"
+ android:layout_gravity="center"
+ android:contentDescription="@null"
+ android:src="@drawable/ic_mic_on" />
+ </FrameLayout>
</LinearLayout>
</RelativeLayout>
@@ -650,7 +698,7 @@
android:layout_marginBottom="13.3dp"
android:paddingHorizontal="13.3dp"
app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintEnd_toStartOf="@+id/rl_option_buttons"
app:layout_constraintStart_toStartOf="parent">
<EditText
@@ -661,6 +709,7 @@
android:fontFamily="@font/gmarket_sans_medium"
android:gravity="center_vertical"
android:hint="채팅을 입력하세요"
+ android:imeOptions="actionSend"
android:importantForAutofill="no"
android:inputType="text|textMultiLine"
android:paddingVertical="16.7dp"