From 82cf1658cb80c94cef5a976f9278702df919e251 Mon Sep 17 00:00:00 2001 From: klaus Date: Mon, 15 Jan 2024 23:11:08 +0900 Subject: [PATCH] =?UTF-8?q?=EB=9D=BC=EC=9D=B4=EB=B8=8C=20=EB=B0=A9=20-=20?= =?UTF-8?q?=EB=A7=90=ED=95=98=EB=8A=94=20=EC=82=AC=EB=9E=8C=20=EB=B0=B0?= =?UTF-8?q?=EA=B2=BD=20=EB=B3=80=EA=B2=BD=20-=20=EB=B0=B0=EA=B2=BD=20On/Of?= =?UTF-8?q?f=20=EC=83=89=EC=83=81=20=EB=B3=80=EA=B2=BD=20-=20=EC=B0=B8?= =?UTF-8?q?=EC=97=AC=EC=9E=90=20=EC=88=AB=EC=9E=90=20=EC=83=89=EC=83=81=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD,=20=ED=8F=B0=ED=8A=B8=20Bold?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sodalive/live/room/LiveRoomActivity.kt | 6 ++---- .../res/drawable-xxhdpi/ic_notice_normal.png | Bin 2695 -> 2478 bytes .../drawable-xxhdpi/ic_notice_selected.png | Bin 2262 -> 0 bytes ..._round_corner_13_3_transparent_3bb9f1.xml} | 2 +- ..._round_corner_46_7_transparent_3bb9f1.xml} | 2 +- .../main/res/layout/activity_live_room.xml | 7 ++++--- .../res/layout/item_live_room_profile.xml | 2 +- 7 files changed, 9 insertions(+), 10 deletions(-) delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_notice_selected.png rename app/src/main/res/drawable/{bg_round_corner_13_3_transparent_9970ff.xml => bg_round_corner_13_3_transparent_3bb9f1.xml} (84%) rename app/src/main/res/drawable/{bg_round_corner_46_7_transparent_9970ff.xml => bg_round_corner_46_7_transparent_3bb9f1.xml} (84%) 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 5afa85d..aa25a89 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 @@ -622,11 +622,11 @@ class LiveRoomActivity : BaseActivity(ActivityLiveRoomB binding.tvBgSwitch.setTextColor( ContextCompat.getColor( applicationContext, - R.color.color_9970ff + R.color.color_3bb9f1 ) ) binding.tvBgSwitch - .setBackgroundResource(R.drawable.bg_round_corner_13_3_transparent_9970ff) + .setBackgroundResource(R.drawable.bg_round_corner_13_3_transparent_3bb9f1) } else { binding.ivCover.visibility = View.GONE binding.tvBgSwitch.text = "배경 OFF" @@ -837,10 +837,8 @@ class LiveRoomActivity : BaseActivity(ActivityLiveRoomB viewModel.isShowNotice.observe(this) { if (it) { - binding.ivNotification.setImageResource(R.drawable.ic_notice_selected) binding.rlNotice.visibility = View.VISIBLE } else { - binding.ivNotification.setImageResource(R.drawable.ic_notice_normal) binding.rlNotice.visibility = View.GONE } } diff --git a/app/src/main/res/drawable-xxhdpi/ic_notice_normal.png b/app/src/main/res/drawable-xxhdpi/ic_notice_normal.png index 830880cfdd6abb25612360bccf4fe65b5fee121a..e523fa4dac944ceef3b9543f19907c8f3f89e1b1 100644 GIT binary patch delta 2453 zcmV;G32OF-6|NH@iBL{Q4GJ0x0000DNk~Le0001$0000$2nGNE025I)(~%)Ge+ffL zL_t(|0qvb#RvT9m$E&L4kHHyRT0!I$n7r9&CWtx5gY6gO*#NMCfHyFP6#y#;tN?hJ zV8{c?1W4Y%D~P-TVI128)K#gvw1iOfg(O4^-`_z;Qmger_rL4bt*U!3LYrh)i^-F_ zkV6bc0c98v(jbro&&>qkP|t4xe-ID!K7Z>|xSoHRI&AN)EqJ_9OcT5h?MTaa2U`dJ?~ir%&EYZ!!Vrx^?9n$?7i6RLr;f-*J_ofFyy7g zF)Vr!eYu!%NdQbS(Il#2*?oHdRik~e(FYLGHVLmMKEs?Blc$VnBLJ8Kf1=Tld90Py za*S*hhetNw|CV`EoCS}k0hu3)vl-Qi>80t8ra}|c$VPDrJf0SqPE1&)o9gXUeqcV7 zHF+q!wD&x<3?5GloKDo=4pcX$pYryKsLUxx?K9}e`KoM3_4M%`I^(%(@I;OyvI{Rek^q;+6)qc>)c^>TjNnD zRMhU_LoX^%r$jp1zx9c~p_60CiMEMeP@ZluYXyP@OXX<>hO(mDz~ku>hHxE`M$M;s z6bKxE$I~Sks&OJ1CaX5kyq*`8r)zExK>-BPpb=34kEchNo(Mdie;(sS<>@&IxM5gS z7Xz9g#^F#}7nD_F8F%Dh2Cj(9{+@2I!T<#IZxm!6+j*YKL!Y=2qWZ^1G0R9fSDgy3 z%vq15013PUtNm#c3Lz;ZQ*cEj1XlE}P`kYseyuRiYl3$UV!%L(s$4G*6igsWRs@nQ z>!Lk3!`^Pa?Tnt!%bvwJo&KEYneAk+uD?8?Xf0pUkyU7TVF)wN=`!1{gEFYsiz;Gdqd3>jeis~P4Ze=ljCpGZ z4U8~C z8mahHCg9BG(IgB2-cm)_Xd>tncaK{;?B=BZH54O@8c2S-_wQ7!n?f(Dh`5a=k^r)G zf}Tm#K=R{_;#izVKY3AI0?S7p--TqNPB7QP1-+aIe-4o-mYC)g@U3jx8Q@I_~v z&n!zCoK?eWCtL4jdF00r>Ak0aZ#eah8t8X_!ol`*O=}wxkf2iJlp<<=!KFK9!Te z^4|DG!Q8sdvnMAsTB$#eq2t~cQSCf)sfxO$+W8NJ+m#In2dHMA1#%eRs9p8YCvFi8 zSC;{{J*Q-T%M{7AVcv+ds4UyIP;HdTy{ny{VmS&H@ur5YT?baVJ{U ze@?_$T+%q#?o+AXF?HcN^EPg40n`;%7`415J2W2!hv0DAy4xp9L?u{p3 z?v6h|8*ZfCp%uA;+M?TcVa@qZ5vN16e{Yr)I>1fHyLGgBA%GbK+qL_ZSgn_wHIWVz z6!2IpKgo`XxfPWS>bQ6MTYF949d#2DS7PqqEy;6d{MuvylfAbqv zt2103d@up*K20^R5*5jZEYs~ax#m`6-W)vwl3}x4yL}wn*Nnc3%1k|1JEAq1$%ji2 zUCnk|vcP0G1X-0eXJf3o&LnmNo-QyQ9g?j+ z`SIS(8SLq~K1#=6E7lf>ncpTDvf%M_iH-izZt;PIjq*gn1b94MpuPFC(LacJa``Ti zwD+q#U1C{>oGsu@Zm}BSfAy0gh-DR_C;pg~B1%kJ{g(xPT}VMw5sL^k1Sl-IxE9lU;zwrlce}HixNmo! zr7A^(6;YXQrQwA!8*er!!>c{lhgm3PQZ3X>$o#MB*Zxw7;^yZRe_B=Ned!m!p0cL~ z^}B7oZDhpnOi+USpV}(by3RX$FTtvRM zsU{g=sg-eQ`=C@N%h!i)6fR=A?V;c|i!WnVcdM-zDS+UC`q%%zeGF^u8j(K%sc&GZ T+^Fl}00000NkvXXu0mjf_$H$p delta 2672 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 ktje + android:color="@color/color_3bb9f1" /> diff --git a/app/src/main/res/drawable/bg_round_corner_46_7_transparent_9970ff.xml b/app/src/main/res/drawable/bg_round_corner_46_7_transparent_3bb9f1.xml similarity index 84% rename from app/src/main/res/drawable/bg_round_corner_46_7_transparent_9970ff.xml rename to app/src/main/res/drawable/bg_round_corner_46_7_transparent_3bb9f1.xml index 70de629..86872ac 100644 --- a/app/src/main/res/drawable/bg_round_corner_46_7_transparent_9970ff.xml +++ b/app/src/main/res/drawable/bg_round_corner_46_7_transparent_3bb9f1.xml @@ -4,5 +4,5 @@ + android:color="@color/color_3bb9f1" /> diff --git a/app/src/main/res/layout/activity_live_room.xml b/app/src/main/res/layout/activity_live_room.xml index 6620e76..fb1d4d8 100644 --- a/app/src/main/res/layout/activity_live_room.xml +++ b/app/src/main/res/layout/activity_live_room.xml @@ -241,6 +241,7 @@ 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" android:textColor="@color/color_bbbbbb" tools:text="999,999,999,999" /> @@ -263,7 +264,7 @@ android:layout_height="wrap_content" android:fontFamily="@font/gmarket_sans_medium" android:text="참여자" - android:textColor="@color/color_eeeeee" + android:textColor="@color/color_bbbbbb" android:textSize="12sp" /> diff --git a/app/src/main/res/layout/item_live_room_profile.xml b/app/src/main/res/layout/item_live_room_profile.xml index 759e211..9ae6c1d 100644 --- a/app/src/main/res/layout/item_live_room_profile.xml +++ b/app/src/main/res/layout/item_live_room_profile.xml @@ -23,7 +23,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:contentDescription="@null" - android:src="@drawable/bg_round_corner_46_7_transparent_9970ff" /> + android:src="@drawable/bg_round_corner_46_7_transparent_3bb9f1" />