From 8857dd3e98f26e0ca5e322983d07e8931532bb8f Mon Sep 17 00:00:00 2001 From: Yu Sung Date: Wed, 3 Jan 2024 13:05:02 +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-=20=EA=B8=80=EC=9E=90=EC=83=89,=20=EB=B0=B0=EA=B2=BD?= =?UTF-8?q?=EC=83=89=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ic_coin_w.imageset/ic_coin_w.png | Bin 1834 -> 1811 bytes .../Sources/MyPage/Auth/AuthButtonView.swift | 2 +- SodaLive/Sources/MyPage/CanCardView.swift | 4 ++-- SodaLive/Sources/MyPage/MyPageView.swift | 6 +----- .../MyPage/ReservationStatusView.swift | 6 +++--- .../ServiceCenterButtonView.swift | 2 +- 6 files changed, 8 insertions(+), 12 deletions(-) diff --git a/SodaLive/Resources/Assets.xcassets/ic_coin_w.imageset/ic_coin_w.png b/SodaLive/Resources/Assets.xcassets/ic_coin_w.imageset/ic_coin_w.png index bbfaa892e891abddf01b17dcd67872a6177c8685..0a89331b3d4321083c90b531d4d3ee2f3626f9c2 100644 GIT binary patch delta 1745 zcmV;?1}^!k4wDX$R)45TL_t(|0qvYkOk7nI$IqJ~X=-9ajILloO(|3AM}ub`6en(bO_? zd(O-}GQ7`w@4Iila(@XK=JDe{53x^ZmdFsP*)KvqQxQ%h9d^_)9)Zgy2#)`(SUgrH4Sy5E+V3M z@iu@l{51|`=cyo%7c>7HV7AtR)>OoWD=dK_N#cn*PL!O%U~+K6n1vcp6A{UInB!9T zW?fKQa(e(HVSne(P(?)Xx-e{0P!8L=ffqT0VLpXo<{$(@6S0!_=0IJ}3ra46uKX|r zS4JQN7O%2PDBxXa907^0BEWt6-#{_Sop>|JQVbvgjSO}=LlednC_<@-O(CF(LLrrf z^Fop(n?^vwfJs%MtwconXVB6YpxHnnv33poe+Lfdg@5nZun{fw!c7Z0sV7LU9Y{o~ z1F?v{TZbZAHB^-MU>%tU2?B+46q9oc2uP3_r1PV+6D#B36totnh9o90g(8ewcDzKFwB5Jb+2t?5D&;cF8Xu~gEurVCAk-6$*~)`Xuyi-SuJ!y@Mk ziC9?^5r2AvW(3!Jgp492VzekH;L~SMAibJ`%=)jev%AgRZe!~nEM=xk?L;u!(W4~o zA|c%dA{gQ`)Fj&XH$H`(CtIcGuN>)wuRgg6hY!8%*>3I89r*Fq7yHj2ZfD@!>2JV~ zrOb6$&Q9+?A9?2@#ABa>D3y>-^PDT>M8kj+Ab&_^{g-_KiJjdobmdRJ?dE>JeBgN& z-AF=uK_6JPfW&h4I>-~6p|z! zLC$t^b@gzvnjmFOHIX9x$8{cX5{-b8jX)IUR<1@17_5K-$Sqzyw_8a1O=(%(8wA==&wH-eR2bu%U-QE)$Ca9fMoB z!`t!jUM=sT~htRbEQ@D0W*NbSX0NU}{;YtJ-U zK@$%zp)-3+9nKN1b~J*ag{U_=Ppa&Zi8O}tDUk+pB3@w^j0hy51;Oh|433H2L?pi} zOraYa26537UIHIBbeaQwI)okL==uik>vJuL9Bpl|v)gVK+AkZUHw delta 1768 zcmV$S49-+77z~!WQ6FA#-(jSPj>0C z6$zYrONyw(iI5yP=FvYOAzUlvfjIO=g4#01>wH#x$vO_?fkBpY zmTUYyA=KssY|f!_WT0Gz4xz0gqG;8s5R9{73rK;3_+A0==1UInZ6I_dbG}@HHqjOl z_wVM57UN^WRYmb*7R*o)|5g|w%Sj8GsEF0gS4Jt&F;&NDU{lJc$+?|nNPt8{MCVb? z7sa4#`FcLbExst6SA_PmL>)3iE|hJEf!IX+&wZbQxttf3*jz~= z2Ke36Q$oPcp>qU8a+c@^@V$Xyj62cU?8n?U3LOk3qUfC8nE^u>6|oxxbTKKUv2Ye) zG6!8EAi_AAHWk`NoQQ7*-xPEsjE`Hd?R*Fkh%6#D(0>HzB6KmLYM+TxwIhj$eIT=H zRX7LTjZHJ;3^`M-fCiCrqC?p>h`s1S7acb$i`c6!bkT96h7;)!^g0$BRvE5T zopDcu?SJz>p!ca*1KTHL2P-+z*>{vaA(zUZ4$R;B4VG^|0Q;9c>3OBCzhLI(ueEt9 zxbyIe~?_v{ha`s5U3AF~4It(JD-tq<&jpVzkjhJ~r; zA&i-u_u+;Ru+Dv$op=t$u093IP*xQGm!yV*0)K>(eo&;@efT}PGK`72dxwv6=YbG1 z*jae&{{^gbLx`$_MMyz*th9)=jdiZROXuadk8b@QI0wVfE9{qV2d85%k+a8w9q)(A zj-<4RwM}*nh6=}9Uc($2n<6_zELsv}9{u~&3$jaJo%WGl91CP1d zG;jO6hn^qQq2r3*zdiF4#6c_~%6{UQ`+pjRmhB^(T{j<6s9d(ce+VitMx;_$EF$J# zene_qbB^;0<^EHx$7)OkK{-_BSV0g1?GtgRcpRp#KONdoBW}Cn*VbTz?Nyju_kC8{ z1sMuwkHNxZc(dLJA>5W3Cw<0(7gnmAtzcDbu8inBEH=%rp{u;w8vMi2)gxC>zBhfPecUD5AZJ!#Np;9)mhWDU1*1fhK)}j!EM%G9LBDNn>|Z zRX0vA5kf|wi@*;*GgzL6h#0*st($~2B_LvSqpELkXOsa~I%R4HCVvG)jPLek26o=> zG!Y&VTpH}b<`%Movy%t2>hGtrXi+@}&oEc?y~R&8t@#Ak@iB%cA z?JN!fkwhM(QC-iElKQO;IYO(LE-vw0l6|C0LSiN*o=bZkF0`I663Rvmw?h@t z87$-8NK)dtv_(W0ykUgd*~7=ZFj0hR*MqBE16kX`6~e8daAKpq9Ocw43T+k9i@h)N zd72U7jt^X;O%GgS)E1?%Vlg3DOwYJUNl8gbNl8gbNl8iRE&c@>JHBby{%K_Z0000< KMNUMnLSTYF;8R8b diff --git a/SodaLive/Sources/MyPage/Auth/AuthButtonView.swift b/SodaLive/Sources/MyPage/Auth/AuthButtonView.swift index 8ad1b66..d5a8a22 100644 --- a/SodaLive/Sources/MyPage/Auth/AuthButtonView.swift +++ b/SodaLive/Sources/MyPage/Auth/AuthButtonView.swift @@ -15,7 +15,7 @@ struct AuthButtonView: View { .padding(.horizontal, 13.3) .padding(.vertical, 20) .frame(width: screenSize().width - 26.7, alignment: .leading) - .background(Color(hex: "664aab")) + .background(Color(hex: "004b6c")) .cornerRadius(6.7) } } diff --git a/SodaLive/Sources/MyPage/CanCardView.swift b/SodaLive/Sources/MyPage/CanCardView.swift index e97511e..931da83 100644 --- a/SodaLive/Sources/MyPage/CanCardView.swift +++ b/SodaLive/Sources/MyPage/CanCardView.swift @@ -39,14 +39,14 @@ struct CanCardView: View { Text("충전") .font(.custom(Font.bold.rawValue, size: 12)) - .foregroundColor(Color(hex: "fdca2f")) + .foregroundColor(Color(hex: "b38fff")) } .padding(.horizontal, 11.3) .padding(.vertical, 7) .overlay( RoundedRectangle(cornerRadius: CGFloat(16.7)) .stroke(lineWidth: 1) - .foregroundColor(Color(hex: "fdca2f")) + .foregroundColor(Color(hex: "b38fff")) ) .cornerRadius(16.7) } diff --git a/SodaLive/Sources/MyPage/MyPageView.swift b/SodaLive/Sources/MyPage/MyPageView.swift index 50a32a0..1302385 100644 --- a/SodaLive/Sources/MyPage/MyPageView.swift +++ b/SodaLive/Sources/MyPage/MyPageView.swift @@ -73,12 +73,8 @@ struct MyPageView: View { .frame(width: screenSize().width - 26.7, height: 46.7) .font(.custom(Font.bold.rawValue, size: 15.3)) .foregroundColor(Color(hex: "eeeeee")) - .background(Color(hex: "352953")) + .background(Color(hex: "3bb9f1")) .cornerRadius(6.7) - .overlay( - RoundedRectangle(cornerRadius: 6.7) - .stroke(Color(hex: "9970ff"), lineWidth: 1.3) - ) .padding(.top, 26.7) .onTapGesture { AppState.shared.setAppStep(step: .creatorDetail(userId: UserDefaults.int(forKey: .userId))) diff --git a/SodaLive/Sources/MyPage/ReservationStatusView.swift b/SodaLive/Sources/MyPage/ReservationStatusView.swift index 43e44d9..3e3ef16 100644 --- a/SodaLive/Sources/MyPage/ReservationStatusView.swift +++ b/SodaLive/Sources/MyPage/ReservationStatusView.swift @@ -30,14 +30,14 @@ struct ReservationStatusView: View { Text("\(data.liveReservationCount)") .font(.custom(Font.medium.rawValue, size: 14.7)) - .foregroundColor(Color(hex: "9970ff")) + .foregroundColor(Color(hex: "3bb9f1")) } .frame(width: width, height: 46.7) - .background(Color(hex: "352953")) + .background(Color(hex: "13181b")) .cornerRadius(6.7) .overlay( RoundedRectangle(cornerRadius: 6.7) - .stroke(Color(hex: "9970ff"), lineWidth: 1.3) + .stroke(Color(hex: "3bb9f1"), lineWidth: 1.3) ) .onTapGesture { AppState.shared.setAppStep(step: .liveReservation) diff --git a/SodaLive/Sources/MyPage/ServiceCenter/ServiceCenterButtonView.swift b/SodaLive/Sources/MyPage/ServiceCenter/ServiceCenterButtonView.swift index ec3befc..ccd0c67 100644 --- a/SodaLive/Sources/MyPage/ServiceCenter/ServiceCenterButtonView.swift +++ b/SodaLive/Sources/MyPage/ServiceCenter/ServiceCenterButtonView.swift @@ -26,7 +26,7 @@ struct ServiceCenterButtonView: View { } .padding(.horizontal, 13.3) .frame(width: screenSize().width - 26.7, height: 66.7) - .background(Color(hex: "664aab")) + .background(Color(hex: "13181b")) .cornerRadius(6.7) .onTapGesture { AppState.shared.setAppStep(step: .serviceCenter)