From 2920d2a7ae0a0548b82ca72fb10d17c4b0f3ee97 Mon Sep 17 00:00:00 2001 From: klaus Date: Fri, 17 May 2024 15:28:59 +0900 Subject: [PATCH] 9970ff -> 3bb9f1 --- .../modify/AudioContentModifyActivity.kt | 24 +++++++++--------- .../drawable-xxhdpi/ic_headphones_blue.png | Bin 0 -> 1466 bytes .../drawable-xxhdpi/ic_headphones_purple.png | Bin 1316 -> 0 bytes .../layout/activity_audio_content_modify.xml | 24 +++++++++--------- .../res/layout/activity_find_password.xml | 8 +++--- .../activity_live_reservation_cancel.xml | 4 +-- app/src/main/res/layout/activity_login.xml | 2 +- app/src/main/res/layout/activity_sign_out.xml | 2 +- .../layout/activity_text_message_detail.xml | 10 ++++---- .../layout/activity_text_message_write.xml | 4 +-- .../item_audio_content_comment_reply.xml | 2 +- 11 files changed, 40 insertions(+), 40 deletions(-) create mode 100644 app/src/main/res/drawable-xxhdpi/ic_headphones_blue.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_headphones_purple.png diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/modify/AudioContentModifyActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/modify/AudioContentModifyActivity.kt index 7730ef7..91d8194 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/modify/AudioContentModifyActivity.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/modify/AudioContentModifyActivity.kt @@ -173,17 +173,17 @@ class AudioContentModifyActivity : BaseActivity((ZHYWg1U~vMI8%QTGe!_MhBv%2IsytvW z5H=@}FjYwkG}Gx>K@3ulcBI`EinU)A56tW`JO51gO!o``IXO8wQw+kGsJv_y^%qd- z6x4k*FpGdQ*Xs%BloXr<+8lQP!rxX(A&h}c1^9liRWYd6xRq6Is0_mq0%8-juJ5mu znvfBx3t&h3{9a)L$!zkl79kxXF|^j(Y0r$*1jwl4{UFxT6e1M?=HH%eC@|GbJARXp zKfQYJ=<7NpB#{7i)GxjaUIJ0Y`z3@nKOeGKZT=cFBN0?1X0$>yre635 zcAAe%Z5V+_WS(fC)bkjj+k|H6@Tbyy7?Pm{i0ynd;%56`xwHc*var{B79+$+A`B&f z9g!eVN6yX@H8s(CR-2fv*#$2U$YmOBHirkpwC^oIoXsPc?fplkDvSZ%U{#4{gQGh9 z>@V}c*X$H{5-3%5b)Jk_A6MrsyfdtVHd~JBam5-5>;1)bAN_Y&w*`@w z%%JRA4MYJ7jxFyw>SLI2Y|cR{Kff194qX;NBPS&KY5zV#yghCr6BYabX+0}FFA5-f zf9zjkCKi&GLwQz<0+1N*(@0sJTY*s870yVHdWXa8T|@YvU`YSz`>ekJpD0r=K*9S- zh2_h{$PEI{@9P4DhhttL{!5<=U=ZB5j?4#t0XWNoN>zG`jct(IT6}XF^7grAI-Pn} zyT!iaH|6|R@Fh(XDDyc$l|$&pWga0_?1-P=RY$gsG>_o2@Bw8O;V4ZJx?6LPQ>YQh z$_W-(gw)~&o0H7y;5ExtU~b{p537(6>v*#m`74HSf>1kHp6N?NTgTM71Dj%IR%`qG zD@cM0R-@p&2X=(N6#j;)l=Yq8Yt?wxJOvN@1#ocr0o6ro^F57n9R3gzg2+ejz5VCG z*k3Mr<^AJG%>+meLzCOBVEdeyNi8dtZ-rsX$pwHZCl>&woLm5ya{L8Qa`NE{LUGfR zJdrA-xcOVkuE!VNoY~;%TkxddXw+tRZtkVY1~+HV4}bis?-)7?S5Y{HMM|C}vPWHb z^Cqf2@#Qw_K@fydM&@ICc1LPslD@$*V8lZmQ2~bqFddqDxf-^sBJlr2UW=F$y zRhCo@62eDa?^xVQPq7WR|A6lHJG@pthhXO9zr%eJaNZGGeEp%(tNf58y25%zrO_&0 zT&R;o`2a^GYjOGjd+kKJaNtimw@9KBU-|ZjFDIJZ?>hzPp0Sz7qljQ{kEMBw#NPg3 z^Ru1s&vte>Av8}04aC4zz^1wlPh-c;3kiEcdMS(BWA-+f0`r6wIDx@JQ1nC8U=#cy zE?qy=Rap$wsxti^mW(-72)kMSZ_jn2|3zZ=z|QfT-a4b;nDk^{5?GP)K~#7F?VC+< z(=Zgr|8_gTj+_9@2?!@3aDf6BfG&VxSTs2S?gD ztJIm)ezIj-c2nZtOxlTL%hKOZPtubDbaZrdtT6#v;^R>D{s03N;5rm;guvD1`~`4C zwK-G@2lO?0HVzWBK%)Y@8L9z2;2wRp=xc;>By`_&4(yQ_Q#6Ek0r*WH13UCahxD}v zKb(rO>)SHC3D8i(Gf;&mK85fi!26Nfp}rfV!G@wkeyikw@C z+h+7hl=*McqCkrmp@fJ&tf8_1B7lstA>Z;yi+D!?MszX1vI0{KGEs3CWrjDzneNofHb8qba0 zeL4=t@Cb?Vs6dEHB9s!qnEf|c8c$|ErO$R#lNj^-m#}w@8Cl(}GS7Dwps3F;v@?p) z0#ujSSc61zi9~Sib|Kt}VQ>6)Ta9PTvqqNeh({(k;v|6Se-AC$BdX8@EyF&Bg_rVp zSbjHDLx*CDyFi}lw`uk^a=OEey26d3uHa$;F=W&KeBO;`xDLEd5VCr|^t3#eTmj76 zmrS3>_z_lwx$X*?H%)cl;n`~5y+sxfi>WjZZ)?5of~m`{kX2{}VL|3?Avy7}2=R@X zcqQp{wt~F-tO9T_15)1)ELO1sEcALKP0zGNB+mjKi4RfuiWP;|9T0p$-l8hZ$;g;L zjjvx;sqd%ZA&(lHSqqquoQNoZ@tjenpul~GbzaQnZV=f<15p6-oP8-h&=K2JXDTKB z4n&783!r2HW>wbPZDYD<)(=o9Ub;TCBt}AVf{R0vPEeMGoXrAyLRzJ$&Up~Xv%;&= zwa&}o@B&!?Il`Z=*OrL~{Fkh~0GlPQjW{rpP7HN0GHH8+cu&FExn;QC0In;z;VgjC z;pu@T4-|n(D1UOSH!~A7!1DGRJL=G0S7&^7fru)`(V2Y{&-V(4<7s>S+X8;K;F|CO zC!uqnB5+xoZo5#WY03%qHsEjF5Ek!3)hW9fcsl)dq_$8K<9H)9gtHUmomlepnJ_dv zCJsAEk=an4grmNo2BBpsO9H>TO#VQM`jTjqoG|_w$_#@drUJ1PK(#EY$}&hN@XMeO zm{Z)p2%lYGDx~@7x0y0%{Pz}>>ZZb2b2=Qr}4AsnR^>@pqAGp zeW5Pmrp~72p`W3Tqn&|+5fqBzjmG7MMYf}|w3RkNO?cWXM4~tv^aFbOoh+sI7Zyuh z=r(2R2n*EE{gP*Z)6_b`dW!j>#UW~}D{L!S#_9viv6BSVpX%iliCJy#qB@83ocpZ; zaOEigc^?%-;L~G1Pm!1-aomV9@lNKD+VCLnMdXeG&neW+W^6fmA#rN @@ -209,7 +209,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" - android:background="@drawable/bg_round_corner_6_7_1f1734" + android:background="@drawable/bg_round_corner_6_7_13181b" android:gravity="center" android:paddingVertical="14.3dp"> @@ -228,7 +228,7 @@ android:layout_height="wrap_content" android:fontFamily="@font/gmarket_sans_bold" android:text="전체 연령" - android:textColor="@color/color_9970ff" + android:textColor="@color/color_3bb9f1" android:textSize="14.7sp" /> @@ -238,7 +238,7 @@ android:layout_height="wrap_content" android:layout_marginStart="13.3dp" android:layout_weight="1" - android:background="@drawable/bg_round_corner_6_7_1f1734" + android:background="@drawable/bg_round_corner_6_7_13181b" android:gravity="center" android:paddingVertical="14.3dp"> @@ -257,7 +257,7 @@ android:layout_height="wrap_content" android:fontFamily="@font/gmarket_sans_bold" android:text="19세 이상" - android:textColor="@color/color_9970ff" + android:textColor="@color/color_3bb9f1" android:textSize="14.7sp" /> @@ -300,7 +300,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" - android:background="@drawable/bg_round_corner_6_7_1f1734" + android:background="@drawable/bg_round_corner_6_7_13181b" android:gravity="center" android:paddingVertical="14.3dp"> @@ -319,7 +319,7 @@ android:layout_height="wrap_content" android:fontFamily="@font/gmarket_sans_bold" android:text="댓글 가능" - android:textColor="@color/color_9970ff" + android:textColor="@color/color_3bb9f1" android:textSize="14.7sp" /> @@ -329,7 +329,7 @@ android:layout_height="wrap_content" android:layout_marginStart="13.3dp" android:layout_weight="1" - android:background="@drawable/bg_round_corner_6_7_1f1734" + android:background="@drawable/bg_round_corner_6_7_13181b" android:gravity="center" android:paddingVertical="14.3dp"> @@ -348,7 +348,7 @@ android:layout_height="wrap_content" android:fontFamily="@font/gmarket_sans_bold" android:text="댓글 불가" - android:textColor="@color/color_9970ff" + android:textColor="@color/color_3bb9f1" android:textSize="14.7sp" /> @@ -368,11 +368,11 @@ android:layout_height="50dp" android:layout_marginEnd="6.7dp" android:layout_weight="1" - android:background="@drawable/bg_round_corner_6_7_1f1734_9970ff" + android:background="@drawable/bg_round_corner_6_7_13181b_3bb9f1" android:fontFamily="@font/gmarket_sans_bold" android:gravity="center" android:text="취소" - android:textColor="@color/color_9970ff" + android:textColor="@color/color_3bb9f1" android:textSize="18.3sp" /> + android:textColor="@color/color_3bb9f1" + app:drawableStartCompat="@drawable/ic_headphones_blue" /> diff --git a/app/src/main/res/layout/activity_live_reservation_cancel.xml b/app/src/main/res/layout/activity_live_reservation_cancel.xml index 1479cdc..9a66934 100644 --- a/app/src/main/res/layout/activity_live_reservation_cancel.xml +++ b/app/src/main/res/layout/activity_live_reservation_cancel.xml @@ -269,7 +269,7 @@ android:layout_marginHorizontal="13.3dp" android:layout_marginTop="90dp" android:layout_marginBottom="13.3dp" - android:background="@drawable/bg_round_corner_6_7_9970ff" + android:background="@drawable/bg_round_corner_6_7_3bb9f1" android:fontFamily="@font/gmarket_sans_bold" android:gravity="center" android:paddingVertical="16dp" @@ -324,7 +324,7 @@ android:gravity="center" android:paddingVertical="16dp" android:text="다른 라이브 예약하기" - android:textColor="@color/color_9970ff" + android:textColor="@color/color_3bb9f1" android:textSize="15sp" /> diff --git a/app/src/main/res/layout/activity_text_message_write.xml b/app/src/main/res/layout/activity_text_message_write.xml index f1063cc..9bd38db 100644 --- a/app/src/main/res/layout/activity_text_message_write.xml +++ b/app/src/main/res/layout/activity_text_message_write.xml @@ -30,7 +30,7 @@ android:layout_marginEnd="13.3dp" android:fontFamily="@font/gmarket_sans_medium" android:text="취소" - android:textColor="@color/color_9970ff" + android:textColor="@color/color_3bb9f1" android:textSize="16.7sp" /> @@ -117,7 +117,7 @@ android:layout_alignParentBottom="true" android:layout_marginHorizontal="13.3dp" android:layout_marginBottom="13.3dp" - android:background="@drawable/bg_round_corner_6_7_9970ff" + android:background="@drawable/bg_round_corner_6_7_3bb9f1" android:fontFamily="@font/gmarket_sans_bold" android:gravity="center" android:text="메시지 보내기" diff --git a/app/src/main/res/layout/item_audio_content_comment_reply.xml b/app/src/main/res/layout/item_audio_content_comment_reply.xml index 827ddd2..1cd6a32 100644 --- a/app/src/main/res/layout/item_audio_content_comment_reply.xml +++ b/app/src/main/res/layout/item_audio_content_comment_reply.xml @@ -130,7 +130,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentEnd="true" - android:background="@drawable/bg_round_corner_6_7_9970ff" + android:background="@drawable/bg_round_corner_6_7_3bb9f1" android:fontFamily="@font/gmarket_sans_bold" android:padding="13dp" android:text="수정"