From 03de8eba868224b32df1a67401f1b23e2f4334e6 Mon Sep 17 00:00:00 2001
From: klaus <klaus@vividnext.co.kr>
Date: Fri, 28 Jul 2023 18:24:49 +0900
Subject: [PATCH] =?UTF-8?q?=EB=A7=88=EC=9D=B4=ED=8E=98=EC=9D=B4=EC=A7=80?=
 =?UTF-8?q?=20=EB=A9=94=EC=9D=B8=20-=20=EC=BD=94=EC=9D=B8(=EC=BA=94)=20?=
 =?UTF-8?q?=EC=95=84=EC=9D=B4=EC=BD=98=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sodalive/mypage/MyPageFragment.kt         |   2 +-
 app/src/main/res/drawable-xxhdpi/ic_can.png   | Bin 0 -> 1388 bytes
 .../main/res/drawable-xxhdpi/ic_coin_w.png    | Bin 1276 -> 1834 bytes
 ..._round_corner_16_7_transparent_fdca2f.xml} |   2 +-
 app/src/main/res/layout/fragment_my.xml       |  52 ++++++++++++------
 5 files changed, 37 insertions(+), 19 deletions(-)
 create mode 100644 app/src/main/res/drawable-xxhdpi/ic_can.png
 rename app/src/main/res/drawable/{bg_round_corner_16_7_fdca2f.xml => bg_round_corner_16_7_transparent_fdca2f.xml} (80%)

diff --git a/app/src/main/java/kr/co/vividnext/sodalive/mypage/MyPageFragment.kt b/app/src/main/java/kr/co/vividnext/sodalive/mypage/MyPageFragment.kt
index a2ecde9..70fcd64 100644
--- a/app/src/main/java/kr/co/vividnext/sodalive/mypage/MyPageFragment.kt
+++ b/app/src/main/java/kr/co/vividnext/sodalive/mypage/MyPageFragment.kt
@@ -136,7 +136,7 @@ class MyPageFragment : BaseFragment<FragmentMyBinding>(FragmentMyBinding::inflat
                 }
             }
 
-            binding.tvTotalCoin.text = "${(it.chargeCoin + it.rewardCoin).moneyFormat()} 캔"
+            binding.tvTotalCoin.text = (it.chargeCoin + it.rewardCoin).moneyFormat()
             binding.tvReservationSuda.text = "${it.sudaReservationCount}"
         }
     }
diff --git a/app/src/main/res/drawable-xxhdpi/ic_can.png b/app/src/main/res/drawable-xxhdpi/ic_can.png
new file mode 100644
index 0000000000000000000000000000000000000000..ebd2064fd4583654e70dcb4312b9b2b160d8d9a8
GIT binary patch
literal 1388
zcmV-y1(W)TP)<h;3K|Lk000e1NJLTq001Ze002M;1^@s6XjwH{00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH1p!G!K~#7F?OIE0
z8$}rYyne*-D|SNMlr*Y?szyZ>O)jMu)JT93C&H}~g63EW4n-W`MtVWw)Jh1ca3MJ$
zaY1d*fYcBP)Kn-{D}hibu|WwbA*oZx&$V}%-<#d;de`ynI_svAKWXgQdF*~W-^~C2
zJG&lm;=+eBDIYvv0iJPo7-#8v71H}xKb=X#MR<4`DddEuU1EA<8OaGZNeVoTeDGcd
zk@LuNzOs~Hq(&jjb5y2`s(auf2*^|PTb1RRD_3T+G-AGrd{L>ZOYRyt2`UJdkyZ1h
z9!>5zT!ha~W3flL%;w`IB3gs+u?+WNiy&K3(`>O!S9{PgXsh_I_01LbmqG`yu)Nx;
zN&2mqUKpi}eh#K^aF9|nwid~gfSzC)2L-a6R<j0Aa$!kMiNK1!%*$Fl8^pe1?VoiN
zOC`%Xv4qiY-W*M<#|DWj5~dnEgj|>ei9~bL=?h5H`eVc81p((9JA`c+B0ls6gY{$u
zk06}YA8Q0jUS@a=Zj0pgyR?j=(MYqZ$#d6MQfMS-C2!EhH6D#b;PY9_6AB5_YF?wz
zDS7qii^VL<MM=_R)+oF@i1Cou*f8dYtElxyuvFVJl`}Ob)%+7R)Lx<W<+Ty~e#2Zj
z(hJvde|zuxr^?kGNOTFdi!Q--(Uz|uS9q$Ag})(Sh&`vocMW?<0@h1Py2YLYvmzYB
zF~Ktl;OsNj{+h~&G^I2Bz#V4m<~N-YbtLf{L%?fE{$OI9jq>@C$0KY9wh0nBx}aSU
zIVU7-5hPigk;{oPu4Rh#w75~JA6t>68?*!NIY=jeF#$_r@BN%brXXW59Dv^|pdgl6
zsFKI4hXZ)`MA*<?otx<b_Ltz%kXarg_x3^-seve-J7hl9Pn!iq|0v*{V<AKNSl9)E
z;})^yx0w=-Cu0cvy_S8B4}|cbTB%E}$97fVzO*fg8?jvUA{_AU*>79&<I=rHhBBH4
z6GKtBPEhoC5opoR&z`(a4?9@)yKwC4X#O>mc0a*Qa5Y~u97p{gM~2rfxF!C(C}Y@Y
zF>orTxUjvT8fZOA>|VdffD7CsxSW$rW#ngDjUugnYNJo<g(`T#P4M=XZ1N7|i)nPm
zEH(+Kj{G$R6sB`Ml)wvaiDSJ1eEE9;ADlGmOe1n`Scz0J%=i|WeDQ$dEv$lx)k3Wv
z-6X?&*X1Ti=HgyXs2knWgJ$DWm#>92A#yW!i#U>qfETvR%xJt9pDkDL!&(`3LF7LA
zC5J@B-ov(SJ9um$f~)sMeEwVBWO|x`Zs_7-4u=y_+qTnDM13+D!R>4j-`#qI=VM+>
z9S!0H)0k`{fff^yU;M9vA0JehyYpe}P#@dM<9apNK0yM>4VM1RSMbTN?9EPb2YFE$
z(E!_XiTC>I;n$J=K8!dZ);2*ENk)Q_Tj)L)w~H>pcA+hjR|eVUb%(cr31RaNFl_;A
zczQ;VZ2{k8f0O#kB-?N4aq$+4#S+#mwt!j8bW_c1mzO2nFr9!uY;%O%&W>fdAPciv
zUd>1Xt~WN!^M`GY(Cmex;F0FFyqcMv@T8#|T7tyJy6h53lDAqlOT=DH+?jp7$=gmQ
z^L%565?{b#8~K9u)`D28&gqX01ewgUjU5UdCfFkgH@;rDt3?;uDpo$K*h-;8SlD>j
utm;oFZ~wa=RqPAg{HQ{9oMc)1ZsLETmWhX#hv*9c0000<MNUMnLSTZYvyXWI

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/ic_coin_w.png b/app/src/main/res/drawable-xxhdpi/ic_coin_w.png
index d08a13d65cdcbcd7145ea45fba7766e66492a775..bbfaa892e891abddf01b17dcd67872a6177c8685 100644
GIT binary patch
literal 1834
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
Y1sXfPY1sa0WdHyG07*qoM6N<$g2%gB^Z)<=

literal 1276
zcmV<Y1OxktP)<h;3K|Lk000e1NJLTq002+`002-30{{R3xz7Th00004XF*Lt006O%
z3;baP00001b5ch_0Itp)=>Px#oKQ?uMMrQ<|I$7F%P;@`O8?F{|Jg<U&_VmyUjETQ
z{nAGK*H-@3P5#R-|I0D_)>HJ*TK&y6``1<e%P;%ZQvJ#=>6iig+GLJP0IOsI^tBuL
z!6&nC2<DaopI{8^p$YrOEX;rb(uD%tjsloe0q&_2=&&XH(@ej00r9*k-J>72d>Z1q
zP5sU~zl<%YZ5QpxSIv+Y)2BewnH|H27yOylTL1t66m(KfQvfRN1wRso{BpAAT;x&3
z`JUR>)jQ}<EC2ul-bqA3R9M69SlM=}KoE360hh!i;0&@aB4ETN|Nn1S0t2(cX!3MV
z>P^m2ba(aUj7ER>Lxrib)aG+-sZ4)?YpE~PZ3}gwFMmR(y=_^jZ`yNgGhN*Zpz5>7
z>0Y+Ic$9LkZU>;wAD|mAwh~y3rL|DEa*$L<C*L|>PetjvZdshJXF8HHe1saulM4Wd
zA+&89!Wg)xBf<DG%!jAmv0{UPV<I>Kj7x&@;{p4Q<()0;*c#3dmS=ezyZF5p6`jdL
z1W%Z3z3HQMQn(-vOaYwGMn<NehSHON?T3#sfQ~7KV}D0d{WJ_?B`%sapRWKM%zhlM
zHQgP;<e9hj0T7r&2=@lUTF?)W!{=Cn@6MPZLV?pLV_w}se`^FjV&p14Lk<@JnsNvc
z;bhj6f=3Wj`g+#x+ZNwSD6QKt^4bK7U`Yiq*%=rtk4W)0isGC;k`8+WU1cU=Wr7|n
z!lvK?yxtPuV6f+zxMAic*TBT!VehafCN$x)Aw1y*dM!tm-){TX`%5Q_gPx5A8oL1d
zJYvZ2odVj>Es(01Y`#F}ri{<H$BjF_4Pexy@~wV!i&_({=8(=$nk!&GPUKPEe4}%^
zvGAR*$qDngG4P9!y$P$`9YaARHz@^`UEIA}JCjj`?b#LFfC==ND{={GNiI|&I$=;D
zqP|NLqB?OQ9YWh4=nxjSR#0zsvDfQ!ZXijx9wKbQA4g9SB9}|n!sscNkthWlLs`Nx
zH*HRg%D3PtLX_B7CJ%R%%GR!e#TNXOTY6`#QW{k*WFFRmxY%^1ybESLo+UfFS#{6c
z1Kr|ue)~$lINc^^_;L`@A*9=v(ri9^EQltW<XO^8KQvdcg7O6o_8!D~Rl!#{Y(iB^
zv_Fc@Ku<IRMjvV84L(zxZbo6#>Vh>OOEjcL3OY_?a+I+%>I>NH)Zr|ND>T!Hxg6yb
zT~^`^(h?8)k=90tScIbkPMH-T=8Z+(Dl(g(XxU^chp@QqGk>?wzaWSY4x5$yWoa~T
z&7ga#bAWCP;us!6ZW;5}xzTjht_E`ZVKT6Aj@E6c@=$`$8(N9)_1CR0!;D^=nZl)g
zI$L#e2D1M4{jKP-`>u89$h1{{PIHp6a$DT|@ilbdPxBnFiiA(;VdfcwHw7D_&=RMg
zj?)zSZLC&*hhQUi<W%Y}y~gwx->N|^@Tt0yyL3=ioW+{i-cwbTy<(cqbYlqVBiAfd
z6|RQp9=Zsstej8!=(bPXeoZy5m7nQzmua;+n+Z#&e*EYPajfa@9o=G~FMoE;`Th2E
mtSIZXqKtpx%JdKa1^xl$nJ{0&=ti~x0000<MNUMnLSTZMvul(9

diff --git a/app/src/main/res/drawable/bg_round_corner_16_7_fdca2f.xml b/app/src/main/res/drawable/bg_round_corner_16_7_transparent_fdca2f.xml
similarity index 80%
rename from app/src/main/res/drawable/bg_round_corner_16_7_fdca2f.xml
rename to app/src/main/res/drawable/bg_round_corner_16_7_transparent_fdca2f.xml
index a073482..cbfc350 100644
--- a/app/src/main/res/drawable/bg_round_corner_16_7_fdca2f.xml
+++ b/app/src/main/res/drawable/bg_round_corner_16_7_transparent_fdca2f.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/color_fdca2f" />
+    <solid android:color="@android:color/transparent" />
     <corners android:radius="16.7dp" />
     <stroke
         android:width="1dp"
diff --git a/app/src/main/res/layout/fragment_my.xml b/app/src/main/res/layout/fragment_my.xml
index 94c8821..346dd69 100644
--- a/app/src/main/res/layout/fragment_my.xml
+++ b/app/src/main/res/layout/fragment_my.xml
@@ -165,20 +165,39 @@
                 android:background="@drawable/bg_round_corner_16_7_222222"
                 android:padding="13.3dp">
 
-                <TextView
-                    android:id="@+id/tv_total_coin"
+                <LinearLayout
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
-                    android:drawablePadding="6.7dp"
-                    android:fontFamily="@font/gmarket_sans_bold"
-                    android:gravity="center"
-                    android:textColor="@color/color_eeeeee"
-                    android:textSize="18.3sp"
-                    app:drawableEndCompat="@drawable/ic_forward"
-                    app:drawableStartCompat="@drawable/ic_coin_w"
-                    tools:ignore="RelativeOverlap"
-                    tools:text="23,000 코인" />
+                    android:orientation="horizontal"
+                    tools:ignore="RelativeOverlap">
+
+                    <TextView
+                        android:id="@+id/tv_total_coin"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:fontFamily="@font/gmarket_sans_bold"
+                        android:gravity="center"
+                        android:textColor="@color/color_eeeeee"
+                        android:textSize="18.3sp"
+                        tools:text="23,000" />
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="5.3dp"
+                        android:layout_marginEnd="2.7dp"
+                        android:gravity="center"
+                        android:contentDescription="@null"
+                        android:src="@drawable/ic_can" />
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:contentDescription="@null"
+                        android:gravity="center"
+                        android:src="@drawable/ic_forward" />
+                </LinearLayout>
 
                 <TextView
                     android:id="@+id/tv_charge_coin"
@@ -186,15 +205,14 @@
                     android:layout_height="wrap_content"
                     android:layout_alignParentEnd="true"
                     android:layout_centerVertical="true"
-                    android:background="@drawable/bg_round_corner_16_7_fdca2f"
-                    android:drawablePadding="7dp"
+                    android:background="@drawable/bg_round_corner_16_7_transparent_fdca2f"
+                    android:drawablePadding="3.7dp"
                     android:fontFamily="@font/gmarket_sans_bold"
                     android:gravity="center_vertical"
-                    android:minHeight="33.3dp"
-                    android:paddingStart="9dp"
-                    android:paddingEnd="15dp"
+                    android:paddingVertical="7dp"
+                    android:paddingHorizontal="11.3dp"
                     android:text="충전"
-                    android:textColor="@color/black"
+                    android:textColor="@color/color_fdca2f"
                     android:textSize="12sp"
                     app:drawableStartCompat="@drawable/ic_coin_w" />
             </RelativeLayout>