From 66b8a41a23bbddc2cc7c1b11bafb872633796fc9 Mon Sep 17 00:00:00 2001 From: mike-dydx <149746839+mike-dydx@users.noreply.github.com> Date: Fri, 1 Dec 2023 13:37:06 -0500 Subject: [PATCH] TRCL-3281 : Add transfer entry point to profile page pt 2 - UI Tweaks (#32) * apply design feedback * update more colors to match design * enable profile buttons always * clean up undo podfile lock changes * fix compile issue --- .../Components/Buttons/PlatformButton.swift | 7 +--- .../Theme/ThemeViewModifiers.swift | 16 ++++----- .../Contents.json | 2 +- .../Download.pdf | Bin 3366 -> 0 bytes .../icon_transfer_deposit.pdf | Bin 0 -> 4781 bytes .../icon_transfer_dydx.imageset/Contents.json | 2 +- .../icon_transfer_dydx.imageset/Frame.svg | 3 -- .../icon_transfer_dydx.pdf | Bin 0 -> 1933 bytes .../Contents.json | 2 +- .../Frame 1410.pdf | Bin 2190 -> 0 bytes .../icon_transfer_withdrawal.pdf | Bin 0 -> 4779 bytes .../settings_signout.imageset/Contents.json | 2 +- .../settings_signout.imageset/Vector.pdf | Bin 2168 -> 0 bytes .../settings_signout.pdf | Bin 0 -> 9082 bytes .../dydxViews/Themes/ThemeLight.json | 2 +- .../Components/dydxProfileButtonsView.swift | 32 ++++++++++-------- .../Components/dydxProfileFeesView.swift | 2 +- .../Components/dydxProfileHeaderView.swift | 2 +- .../Components/dydxProfileHistoryView.swift | 3 +- .../Components/dydxProfileRewardsView.swift | 9 ++--- .../Components/dydxSettingsHelpRowView.swift | 2 +- .../_v4/Wallet/WalletConnectionView.swift | 2 +- .../dydxViews/_v4/Wallet/Wallets2View.swift | 1 + 23 files changed, 44 insertions(+), 45 deletions(-) delete mode 100644 dydx/dydxViews/dydxViews/Media.xcassets/icon_transfer_deposit.imageset/Download.pdf create mode 100644 dydx/dydxViews/dydxViews/Media.xcassets/icon_transfer_deposit.imageset/icon_transfer_deposit.pdf delete mode 100644 dydx/dydxViews/dydxViews/Media.xcassets/icon_transfer_dydx.imageset/Frame.svg create mode 100644 dydx/dydxViews/dydxViews/Media.xcassets/icon_transfer_dydx.imageset/icon_transfer_dydx.pdf delete mode 100644 dydx/dydxViews/dydxViews/Media.xcassets/icon_transfer_withdrawal.imageset/Frame 1410.pdf create mode 100644 dydx/dydxViews/dydxViews/Media.xcassets/icon_transfer_withdrawal.imageset/icon_transfer_withdrawal.pdf delete mode 100644 dydx/dydxViews/dydxViews/Media.xcassets/settings_signout.imageset/Vector.pdf create mode 100644 dydx/dydxViews/dydxViews/Media.xcassets/settings_signout.imageset/settings_signout.pdf diff --git a/PlatformUI/PlatformUI/Components/Buttons/PlatformButton.swift b/PlatformUI/PlatformUI/Components/Buttons/PlatformButton.swift index 461d5e59b..766c465b1 100644 --- a/PlatformUI/PlatformUI/Components/Buttons/PlatformButton.swift +++ b/PlatformUI/PlatformUI/Components/Buttons/PlatformButton.swift @@ -33,12 +33,7 @@ public class PlatformButtonViewModel: PlatformVie PlatformView(viewModel: self, parentStyle: parentStyle, styleKey: styleKey) { [weak self] style in guard let self = self else { return AnyView(PlatformView.nilView) } - let disabled: Bool - if case .disabled = self.state { - disabled = true - } else { - disabled = false - } + let disabled = .disabled == self.state return AnyView( Group { switch self.type { diff --git a/PlatformUI/PlatformUI/DesignSystem/Theme/ThemeViewModifiers.swift b/PlatformUI/PlatformUI/DesignSystem/Theme/ThemeViewModifiers.swift index d556e3748..c7889ad8a 100644 --- a/PlatformUI/PlatformUI/DesignSystem/Theme/ThemeViewModifiers.swift +++ b/PlatformUI/PlatformUI/DesignSystem/Theme/ThemeViewModifiers.swift @@ -185,16 +185,19 @@ private struct SheetViewModifier: ViewModifier { @EnvironmentObject var themeSettings: ThemeSettings func body(content: Content) -> some View { + let dragIndicator = Rectangle() + .themeColor(background: .layer1) + .frame(width: 36, height: 4) + .clipShape(Capsule()) + .padding(.top, topPadding) + if sheetStyle == .fullScreen { return AnyView( ZStack(alignment: .top) { content .cornerRadius(36, corners: [.topLeft, .topRight]) VStack { - Rectangle() - .themeColor(background: .layer1) - .frame(width: 36, height: 4) - .padding(.top, topPadding) + dragIndicator Spacer() } } @@ -208,10 +211,7 @@ private struct SheetViewModifier: ViewModifier { content .cornerRadius(36, corners: [.topLeft, .topRight]) VStack { - Rectangle() - .themeColor(background: .layer1) - .frame(width: 36, height: 4) - .padding(.top, topPadding) + dragIndicator } } } diff --git a/dydx/dydxViews/dydxViews/Media.xcassets/icon_transfer_deposit.imageset/Contents.json b/dydx/dydxViews/dydxViews/Media.xcassets/icon_transfer_deposit.imageset/Contents.json index 3efdd1c7c..db7b77571 100644 --- a/dydx/dydxViews/dydxViews/Media.xcassets/icon_transfer_deposit.imageset/Contents.json +++ b/dydx/dydxViews/dydxViews/Media.xcassets/icon_transfer_deposit.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "Download.pdf", + "filename" : "icon_transfer_deposit.pdf", "idiom" : "universal" } ], diff --git a/dydx/dydxViews/dydxViews/Media.xcassets/icon_transfer_deposit.imageset/Download.pdf b/dydx/dydxViews/dydxViews/Media.xcassets/icon_transfer_deposit.imageset/Download.pdf deleted file mode 100644 index 329f50315297f05ee002880c069542b2e4bb4e78..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3366 zcmd5;OK;pZ5We$Q@M0i2MBx=k+j-2 z0RjZ!!KOZPUf;|t=j7(%>Xl49W0DJA-+pGCzkbcrv$Oh{f8-(&-5NJC4A8jy1B76u ztFoz|_C?vCiqq2`T|eEnUmi=IUe)_ukNs9w_w55$U~|<&*ZcbEv9tZYyWM@qvrc<7 zvF7RfeO@(>`M#`*FSB#97!`bYcl)_4TDSrSO}j7i9ZN6Dzc)p>x<2FQ>*-g~u)ml{ zymroL{z@dyI~64E7MN6t_tpi&l}L0D${AklP&ybRJaFZM@D>P7f^pV*-V_x>O~Om1 zxlKYQl$U(RfO?U6XEFdymU-iO4}rKzf^#;g&IuIt02%KDXe>~lmd*(Spa|A#AQKVm zP!bW9p)10R;08e*1rHtBvIpi8XN}O7OPK`irPtt}UxM2SsD_){iTF{FbfPJdWGc%7 zn4-H#pZ4AhF##b&@LtI7q7Ip{8FDdTq_ZPqL{%^$1Z1OE2ziJBjfM#-j(LMl+97n8 zNU1SzyAiXAbt34D!=aGg3dmo7i+CiY0LGMXT1{>dv80I*vR91u2#fR`CKVHTrv-dr&9yl9=Ubkvx@QZpzL!Vg1eurL%#yj|B!^(;fo#_El!{+OKPFhG9+FT^ijtVNCKy349 zO$}#Ls6T_srh76m#(QXnQ5&6+Q9`h;dnIHOTd;l4~O7SI>)*8If z!J6P7_duGT>wzTxh|wcWLua(%aU{o!Uz^%EXULy@6x z8o*NE?7m?sP?gD9o2shYhJPH!(iqZBeqY9D(zoT^CjY(x z7t3OpT+i#OEi15y3=H564yY}M5v+qIJRuY#z>4~Ha|f<+j9|qFkI(BTkd?i=qyG&c z6HQXgRK9DK% zuzT3A>I17NJ72umeG%`4k}5yLf@}{Bt3PoRBoEELUT&(zMg7m+s=m5>Ar@1c8jNFRTer*@1iv%o(7o$nH0oo!?FOiW!b1qf|q2pLAfLjt8JydOf6d- zq}4vEBsRxr(k6N@u+t{U1p!T_-3hF-b--4YcG4+I){b{Nsf(We#4*=C7qyE=Ceb>SQTurf;M&q^$!OeMkx?T4{+iTd(2W=nXOs(K@vqC(f|U>}T|E zs)T?ik5T|BqZ1QBbtKY+>{L>RL?H?qmwk^*y$_N6KoP|Qf zC3)jC`x_m?2Tmu=VRJ5mHFi2}O<;G27!g2}kjW8Bh=e9eaKWjy?170}nDdNcq=`%s z{Rb{I(!^vGavL63hEo^m?vO4FDdR2YEouQx#7A)EW=1iwEHXDLr#wglH4*%g8!+Bk z6&zZZg{#@eFxf}4NRp|+t2u@_MW)(wgY-BE%26T;%(+9N5>)`*D5LSr2VS?zqNE5( zW6&+AB~C<+5DTO{Di#HuiO0l_6Pk10TcZR%WvXq-SqnA>F=sXhaN?ns`b2;Bc?i)! zJ?J5fIv^B#07*d3EK z>~W_Rz8W~s+K4zX?}^pSdqR+T&nVCNP3Ryc0r?w|6oI#sA=!wEo-uhf$B$`$thUwf`0{cu;s<`{7O=iwm6s@@{IK6V8Z$!w z<1ep61{<$(MJseu1c*Hov{M23rlhwiA^Txmw5e@Z1%f0>zU`G+l#4ZS_7iS&1($Gx=8 zM82nHXRVQmJy^WJh4vjM^m|KSbF5}I4`Cf0JLJ@ez`&{;dhGB~Qck15IeF@-F;;~6 z>)79hMqu9ps(O3V-O;h)Ii%t_qa8>HHw)g7Vf4zMn^SNV|DVn&9MYVeLys)0>AUhO z_sUbr@|LHR@&g}?ZX?R9tcMk%Sn7ggcavWW zjJnU)_n($OKDr-gCucCw&ELh6?;Uq`)|!pO`uady8+odm*)h_#9{Q;{cmbc?9;yXg zd$Gg!c_vDHU>hati|SZF{ujdY?RM83#Cx8=2b10|Z|e?tUEka-|LZKzCk_7=;I!!f z7jeGZHuV-7*#kZJmjC6@h}1zNKQYu=z+`{Dy8%_f7F>y*@%ionvU - - diff --git a/dydx/dydxViews/dydxViews/Media.xcassets/icon_transfer_dydx.imageset/icon_transfer_dydx.pdf b/dydx/dydxViews/dydxViews/Media.xcassets/icon_transfer_dydx.imageset/icon_transfer_dydx.pdf new file mode 100644 index 0000000000000000000000000000000000000000..38a0c0110f4edc1e1bda56c1d4cc2f718b0eeaf6 GIT binary patch literal 1933 zcmZWqO^*{t5WV-W=*voQV5X|O`b$Dcup1CcA{LVy%E5St#gW&OcuYj{>v`4F9(!R9 zR{KqTzIs!Ab$j#r8F$GTwq(aoe;I3^KesPlm|=gXe~r7u``?EB{qc+S09R@?9S_6$ z!Spx7zuV2Qdh^O&f4Ka&nan?iJF1VR)8W~2THd)Xa3S&5bv}d`oZUPa>QWZZ0?(Am z7ZlTFNfe5mHha7-A?G5NOXqy?Uab0LR|rQ1Q!E9=cCoNfnW2mbfI_5@eT76|W;bvZ zS5k--WD0>`=W&=*uy9NYISz@c6-n?iyRxIq*>diR6mk)E6nxS`GD<>LZG+$&kTs*E zgpQF_$zY1E`i2;}L|X}piAgQRm^Pr+Eclj^)cQEENa zcL7C$xa!)%VM;+_KvhfL(lN$GEp00hye98Mb!~ls*SY0$!wYml&4TSP;l`mdR4Lq5 z{;6^e=|rL+mHv4o5FVIFs-ZSID5s#jT=mi>4B>>5!59deWdMeKiIDT6792o_qw3d0 z1#^|2%CRXAX;Nms5GWAw1-esxHXQ>a_8amRKNC3s2@5E@Jn4t9vZT&9HI}) zzC)JmoDFbvq+>6gkXO+ZkQ8Ql0SsWo1%OPF3S0rD;)E3{(MeD!B9l*mG`wiB3g(m{ zNDYjyx7sC+jL!-&98%P13v|{?=@u{{G6G*l%bB8gkFu7GjgjW8tvZz{%0!D=@!W(8 zI{OTofVFOcX({z_-&v<3@FI zg3hN?q}4EuUk{sMvby9~E!_3EKMs3j)D3?EZ`TK47A;oj;vP_FxgYvpw|6MjY6mNO z%5yz_g)je9{{-YB5;o&SByDh75}q5sULV)H@&2*vx5Mz+kWFT8Uw>`HJ`EOdd$2R> z$>M%!4`%xqVxQ5qK8qDZixwY4A>|(-y_il`$HRKN8x95+X8-mEbUc~HhvBJxvb}pc klhUuo@o2T-N^t*S`~QII>&3Y~9BVtAn9bGIFYjJ|2gD4NfdBvi literal 0 HcmV?d00001 diff --git a/dydx/dydxViews/dydxViews/Media.xcassets/icon_transfer_withdrawal.imageset/Contents.json b/dydx/dydxViews/dydxViews/Media.xcassets/icon_transfer_withdrawal.imageset/Contents.json index 6439dc9a5..5ee20cc6c 100644 --- a/dydx/dydxViews/dydxViews/Media.xcassets/icon_transfer_withdrawal.imageset/Contents.json +++ b/dydx/dydxViews/dydxViews/Media.xcassets/icon_transfer_withdrawal.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "Frame 1410.pdf", + "filename" : "icon_transfer_withdrawal.pdf", "idiom" : "universal" } ], diff --git a/dydx/dydxViews/dydxViews/Media.xcassets/icon_transfer_withdrawal.imageset/Frame 1410.pdf b/dydx/dydxViews/dydxViews/Media.xcassets/icon_transfer_withdrawal.imageset/Frame 1410.pdf deleted file mode 100644 index 402d4251850504c37e4666dc55262f71e2f69998..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2190 zcmai0OK;Oa5WerPm`kPh(9OOdQdNnz6d^#Alv~9ixNaMi*bt|v@aviJW9&4M@F7}% zp800x+u5BQ-CSLtY8i#lprHQ#Ljate!TGr;t9yDCW{S@~meu3-2`qwhvTC-QaWX ziTgp2IVltt?R8cPG~1GVF6V%%jG&s>sSu1JNe5SEEYNiTwM2?w$!=iNLyluqhKfU} zP=;ZsJ4j`-OB%Ic%uAP|&K`oy*az+A^;RsRAN&fGOT`onZEf*`!fJ23HdeS=ebm90Vus z6Sb$U$8t}~-n*%OVFm~{7T3Ju}f`=JZ1rE`%kjggJh;-HMQXQFfDm?QuS+;g+(n!r8> z2C-+@u8%uH%z?*;?M4n>@wYK5L+Hvh9JT9j4%{!=1Yd*Lb?nci)XKf#A#5j3*9tT` z`nfO+5taM9jno-K}HoH?^MRaI{rxci1P2%p*4KR-*D-7Fr<9{5z=FBcc}3*3!8 z#>r_nq^YCS(Hp$>2c~)1)X$ruYydAYnD=y-b+s)kj7TGH0B;r>!~k#k7Mct~f_OmA zJ}mDsRiFyy9OtrrMqj;`e}l+`DeN#&fei;73%^`!7pwYl*Y#ynJ_rR-bX!8dfYZr( zK)8Rjf_4QJLl*O-hatSr^BxpXh+V6M#IK;NM#t@Dv0RlKLA&?<3gtL%>UDVn$IJVZ lPL$cauD3u1w*t>@mw!vlzWwL0*lgQ!bPh=z9lia0{SVP*#U=m% diff --git a/dydx/dydxViews/dydxViews/Media.xcassets/icon_transfer_withdrawal.imageset/icon_transfer_withdrawal.pdf b/dydx/dydxViews/dydxViews/Media.xcassets/icon_transfer_withdrawal.imageset/icon_transfer_withdrawal.pdf new file mode 100644 index 0000000000000000000000000000000000000000..de0073f434a1edcf8a521dcccbde7d0d1acdfe3b GIT binary patch literal 4779 zcmds5OK;pZ5WeeI@Dd<7gi8+JKwu!T6QgK@xONW#f*v-q;yB%hySpxu{`!7HNtAY_ zpy{^UXI8YW(Et;>~j{Lse;^#P;KtN{AOP#NxMa4~t?@w+||vVO_ZIlUTwdM4?;?vek!78)gRHK!lTJ~xcD&O`UF`H4$Fj~gPR}4( zRiCTan*xWf2O3*UUJSz6I|NbEAcDjoa=ni=^mUGt!@lg|pw0Il4pxhZk9J-URv97u z9()|Q9Hd}NlQUXqD}6LBnY=P7>Lj!QAY+Z=l?800MCQ`MSX4q&mMSAw%#lGfDeq0j zMFpJ$Zw{H@9lsr9CAwMX1ZT!Sg8;c;q$WcFaVKe%^%k}Wo>;4p0a}`5y+(c@!8G!N zcoiKdAmi84Di8z&k4~k!J5T*o|I6BcgTcJ2cLq%;;zA zud9TBC!YXbA*3k+9;zdeCS<3QIwZ1Dc zAT!pQsNn%#c~X!#Qr^J*smnk;gN{+pSYB67k_kCGaEgKkFgP8^CV*z`#`quzqU0t+2AA~Wu^ z!mR;))*`NkaZkKv+!KI|d&YRqZ*({G5g11&GN^wK(=Ir3)W|1YcHDYPKVEUAf?A7P zpa}VnND93l-903Wq(TWzT(0NvG3-y(rur2(FZUvTz(coy_uZ!d+*0jk{Y&%JK{KvMTyYB z38MZeNeY%wQZ=kjpfClXtM!Vj7q<=ac@1H&06nTzu!6A1i1H;DP?c0X8Hsu`d-&^1d3Cp(XhWN3F?g7&95Mw#5)WqO!}N@VgWyMyK9v%SWGhjCK5@N?N^ zibgV%6z&(0(R~iJ__3>STO>?H{=D+seGtmLtN%1Zf6tou>f;CPh|3&%xYzZUc`svR zGm-vI^l*8=H_k-#v8)o5S+ZAQIHJ#}Yit=mx6*9Y3#s6M)h9RqF4&<{<) z3vhO~uNI*8VvE~(CQ7WZjgs}nbSy#+(#y?ed)SK)Jbw=^T`ljLPVlz5yHONzTF&}4Jnte}#7r;~C`L!v^>fsL=cvd<#!R zxTEsRVHdvjCn5|i$Gh;ceY(ry+vs$c4yZDIih7H=>{Mj+pzE+(-mjWn#q|Dk0dk-2 wx9jGaczS>PtfhEyz1@OerZ2~9adZE7!(4#e{b9K~WOl3#v3m04^}9F!0D{olzyJUM literal 0 HcmV?d00001 diff --git a/dydx/dydxViews/dydxViews/Media.xcassets/settings_signout.imageset/Contents.json b/dydx/dydxViews/dydxViews/Media.xcassets/settings_signout.imageset/Contents.json index 413743948..320349f82 100644 --- a/dydx/dydxViews/dydxViews/Media.xcassets/settings_signout.imageset/Contents.json +++ b/dydx/dydxViews/dydxViews/Media.xcassets/settings_signout.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "Vector.pdf", + "filename" : "settings_signout.pdf", "idiom" : "universal" } ], diff --git a/dydx/dydxViews/dydxViews/Media.xcassets/settings_signout.imageset/Vector.pdf b/dydx/dydxViews/dydxViews/Media.xcassets/settings_signout.imageset/Vector.pdf deleted file mode 100644 index 5ade9dc50cc0e3f13f1c09f3f15defc079e4565e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2168 zcmZ`*+iu%N5PjdT*cSsyflxbpn^_GfrFgN8 z@`*a!xt%$)qpRDScdw{nW5_z&|M91>_VsJ~=8fr&cly)#HNN?&JKmo^*#K~>r-t*X z+dY`gP4~~f?Y7^)wb$?0zuLk4ZK!eev2J>KHNXAOw-`#Y?SpZRlt?5n4fR=GhW3ch zK}spkQfgA+5Q9~l913$%P$CBxVN_TWd4-BFdwhgLVkax8MW$I|anjcuWlTb4X2veDg62(L*hWWLB*~TM4!9 zD2O;#8-j!yCxjwYv4VugH{w)c8LdlZ7G$0pN8Tv|S_4JRQtQfz>Q^X2ZGdGMLkKl? zDH2ry;7WWPBZAbNApzx-BiAgXkfdr&5p~7UTD%7fwNK(nS=HXTq&5MulLJG*QVAj9 z4V_1hsG&6~h(tsd5)n}h8kkQ)OgTDNMi7ov&JZ2>6h|%?Er!P?bK)@SHKR*tLK8ex z;U{(?u?|Y%oFEm1K%EY)#y~`zuig?fp#vBkP=vX6}90Y zGh#T@8`KmhHF-pHYO0OUX@Zb55$J_CFj2tdJOzl#P=!iq9+%vZ^NJnJJXiBM#hmvZ zoGtD!qlr=A5>r)~pukmXpg}O^s|vtE!o;(B8q0J|blFn^GP8k?srZBoZXyj%36s5I zRuQQBQ3DhU(EQS;8YZN?G!tRQ+iLE4YqWg91+x~%d~Q+E0k<0X#bl2Rdl$#j^kNR9)OLf_eYU;0yY7$Y?udxG%qH-5cLHX?S%p?BPoa4gZhqX~Ayumt zZ0!{1y8jGYdY1nHWaSC0t~_ah!yIra{CaoZ9s2vnre99oN8>D;vDR8|PAMb{`10sj z)DPH%mnR_4M-Y?>$v=T`vpj(W_sLTTH|zwRPrLo0I~n{p*!*wwkpZ>0Ha960^Cw`tFx^{{hd5!U+HX diff --git a/dydx/dydxViews/dydxViews/Media.xcassets/settings_signout.imageset/settings_signout.pdf b/dydx/dydxViews/dydxViews/Media.xcassets/settings_signout.imageset/settings_signout.pdf new file mode 100644 index 0000000000000000000000000000000000000000..01b6a0bc0881e6221b2c108ac196038f065c8fbc GIT binary patch literal 9082 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 literal 0 HcmV?d00001 diff --git a/dydx/dydxViews/dydxViews/Themes/ThemeLight.json b/dydx/dydxViews/dydxViews/Themes/ThemeLight.json index 437b6d7b1..c40e0a0f9 100644 --- a/dydx/dydxViews/dydxViews/Themes/ThemeLight.json +++ b/dydx/dydxViews/dydxViews/Themes/ThemeLight.json @@ -9,7 +9,7 @@ "layer_1": "#EDF0F2", "layer_2": "#F9FAFB", "layer_3": "#EDF0F2", - "layer_4": "#E0E6EB", + "layer_4": "#FFFFFF", "layer_5": "#E0E6EB", "layer_6": "#D1D9E0", "layer_7": "#C2CCD6", diff --git a/dydx/dydxViews/dydxViews/_v4/Profile/Components/dydxProfileButtonsView.swift b/dydx/dydxViews/dydxViews/_v4/Profile/Components/dydxProfileButtonsView.swift index 58b0cd0f9..54ac3cd24 100644 --- a/dydx/dydxViews/dydxViews/_v4/Profile/Components/dydxProfileButtonsView.swift +++ b/dydx/dydxViews/dydxViews/_v4/Profile/Components/dydxProfileButtonsView.swift @@ -34,16 +34,19 @@ public class dydxProfileButtonsViewModel: PlatformViewModel { self.createButton(parentStyle: style, imageName: "icon_transfer_deposit", title: DataLocalizer.localize(path: "APP.GENERAL.DEPOSIT"), + templateColor: self.onboarded ? .textSecondary : .textTertiary, action: self.depositAction) self.createButton(parentStyle: style, imageName: "icon_transfer_withdrawal", title: DataLocalizer.localize(path: "APP.GENERAL.WITHDRAW"), + templateColor: self.onboarded ? .textSecondary : .textTertiary, action: self.withdrawAction) self.createButton(parentStyle: style, imageName: "icon_transfer_dydx", title: DataLocalizer.localize(path: "APP.GENERAL.TRANSFER"), + templateColor: self.onboarded ? .textSecondary : .textTertiary, action: self.transferAction) if self.onboarded { @@ -65,28 +68,29 @@ public class dydxProfileButtonsViewModel: PlatformViewModel { } } - private func createButton(parentStyle: ThemeStyle, imageName: String, title: String, styleKey: String? = nil, backgroundColor: ThemeColor.SemanticColor = .layer3, templateColor: ThemeColor.SemanticColor? = .textSecondary, action: (() -> Void)?) -> some View { + private func createButton(parentStyle: ThemeStyle, imageName: String, title: String, styleKey: String? = nil, backgroundColor: ThemeColor.SemanticColor = .layer3, templateColor: ThemeColor.SemanticColor?, action: (() -> Void)?) -> some View { let icon = PlatformIconViewModel(type: .asset(name: imageName, bundle: Bundle.dydxView), clip: .circle(background: backgroundColor, spacing: 24, borderColor: .layer6), size: CGSize(width: 48, height: 48), templateColor: templateColor) - return createButton(parentStyle: parentStyle, icon: icon, title: title, action: action) - } - - private func createButton(parentStyle: ThemeStyle, icon: PlatformViewModel, title: String, action: (() -> Void)?) -> some View { - VStack { - PlatformButtonViewModel(content: icon, - type: .iconType, - state: .primary, - action: action ?? {}) .createView(parentStyle: parentStyle) - Text(title) - .themeFont(fontSize: .small) - .themeColor(foreground: .textTertiary) - .lineLimit(1) + let title = Text(title) + .themeFont(fontSize: .small) + .themeColor(foreground: templateColor ?? .textSecondary) + .lineLimit(1) + + let buttonContent = VStack { + icon + title } .frame(maxWidth: .infinity) + .wrappedViewModel + + return PlatformButtonViewModel(content: buttonContent, + type: .iconType, + action: action ?? {}) + .createView(parentStyle: parentStyle) } } diff --git a/dydx/dydxViews/dydxViews/_v4/Profile/Components/dydxProfileFeesView.swift b/dydx/dydxViews/dydxViews/_v4/Profile/Components/dydxProfileFeesView.swift index 7d3b9329b..6c7fe9ad7 100644 --- a/dydx/dydxViews/dydxViews/_v4/Profile/Components/dydxProfileFeesView.swift +++ b/dydx/dydxViews/dydxViews/_v4/Profile/Components/dydxProfileFeesView.swift @@ -94,7 +94,7 @@ public class dydxProfileFeesViewModel: PlatformViewModel, Equatable { } .padding(16) } - .themeColor(background: .layer4) + .themeColor(background: .layer3) .cornerRadius(12, corners: .allCorners) .onTapGesture { [weak self] in self?.tapAction?() diff --git a/dydx/dydxViews/dydxViews/_v4/Profile/Components/dydxProfileHeaderView.swift b/dydx/dydxViews/dydxViews/_v4/Profile/Components/dydxProfileHeaderView.swift index 43a0d7c11..053c60c8d 100644 --- a/dydx/dydxViews/dydxViews/_v4/Profile/Components/dydxProfileHeaderView.swift +++ b/dydx/dydxViews/dydxViews/_v4/Profile/Components/dydxProfileHeaderView.swift @@ -106,7 +106,7 @@ public class dydxProfileHeaderViewModel: PlatformViewModel { } } .padding(.all, 20) - .themeColor(background: .layer4) + .themeColor(background: .layer3) .cornerRadius(12, corners: .allCorners) if let sourceAddress = self.sourceAddress { HStack(spacing: 0) { diff --git a/dydx/dydxViews/dydxViews/_v4/Profile/Components/dydxProfileHistoryView.swift b/dydx/dydxViews/dydxViews/_v4/Profile/Components/dydxProfileHistoryView.swift index 0f90eab36..40da4a83f 100644 --- a/dydx/dydxViews/dydxViews/_v4/Profile/Components/dydxProfileHistoryView.swift +++ b/dydx/dydxViews/dydxViews/_v4/Profile/Components/dydxProfileHistoryView.swift @@ -60,6 +60,7 @@ public class dydxProfileHistoryViewModel: PlatformViewModel { VStack(spacing: 0) { HStack { Text(DataLocalizer.localize(path: "APP.GENERAL.HISTORY")) + .themeColor(foreground: .textSecondary) .themeFont(fontSize: .small) Spacer() PlatformIconViewModel(type: .system(name: "chevron.right"), @@ -145,7 +146,7 @@ public class dydxProfileHistoryViewModel: PlatformViewModel { } .frame(maxWidth: .infinity) .frame(minHeight: 210) - .themeColor(background: .layer4) + .themeColor(background: .layer3) .cornerRadius(12, corners: .allCorners) .onTapGesture { [weak self] in self?.tapAction?() diff --git a/dydx/dydxViews/dydxViews/_v4/Profile/Components/dydxProfileRewardsView.swift b/dydx/dydxViews/dydxViews/_v4/Profile/Components/dydxProfileRewardsView.swift index 38772601d..ee45ac86e 100644 --- a/dydx/dydxViews/dydxViews/_v4/Profile/Components/dydxProfileRewardsView.swift +++ b/dydx/dydxViews/dydxViews/_v4/Profile/Components/dydxProfileRewardsView.swift @@ -51,7 +51,7 @@ public class dydxProfileRewardsViewModel: PlatformViewModel { } .padding(.horizontal, 16) .padding(.vertical, 16) - .themeColor(background: .layer4) + .themeColor(background: .layer3) .cornerRadius(14, corners: .allCorners) ) } @@ -66,7 +66,7 @@ public class dydxProfileRewardsViewModel: PlatformViewModel { } Text(nativeTokenName ?? "") - .themeColor(foreground: .textPrimary) + .themeColor(foreground: .textSecondary) .themeFont(fontSize: .medium) Spacer() @@ -94,17 +94,18 @@ public class dydxProfileRewardsViewModel: PlatformViewModel { private func createAmountPanel(style: ThemeStyle, title: String, amount: String) -> some View { VStack(spacing: 16) { Text(title) + .themeColor(foreground: .textSecondary) .themeFont(fontSize: .small) .leftAligned() Text(amount) - .themeColor(foreground: .textPrimary) + .themeColor(foreground: .textTertiary) .themeFont(fontType: .number, fontSize: .largest) .leftAligned() } .padding(16) - .themeColor(background: .layer6) + .themeColor(background: .layer4) .cornerRadius(10, corners: .allCorners) .frame(maxWidth: .infinity) } diff --git a/dydx/dydxViews/dydxViews/_v4/Profile/Components/dydxSettingsHelpRowView.swift b/dydx/dydxViews/dydxViews/_v4/Profile/Components/dydxSettingsHelpRowView.swift index cfe537298..437b40c8e 100644 --- a/dydx/dydxViews/dydxViews/_v4/Profile/Components/dydxSettingsHelpRowView.swift +++ b/dydx/dydxViews/dydxViews/_v4/Profile/Components/dydxSettingsHelpRowView.swift @@ -56,7 +56,7 @@ public class dydxSettingsHelpRowViewModel: PlatformViewModel { } .padding(.horizontal, 16) .padding(.vertical, 22) - .themeColor(background: .layer4) + .themeColor(background: .layer3) .cornerRadius(12, corners: .allCorners) .frame(maxWidth: .infinity) .onTapGesture { diff --git a/dydx/dydxViews/dydxViews/_v4/Wallet/WalletConnectionView.swift b/dydx/dydxViews/dydxViews/_v4/Wallet/WalletConnectionView.swift index 48ce66863..68857a839 100644 --- a/dydx/dydxViews/dydxViews/_v4/Wallet/WalletConnectionView.swift +++ b/dydx/dydxViews/dydxViews/_v4/Wallet/WalletConnectionView.swift @@ -74,7 +74,7 @@ public class WalletConnectionViewModel: PlatformViewModel { .padding(.vertical, buttonContentVerticalPadding) .themeColor(background: .layer3) }) - .borderAndClip(style: .capsule, borderColor: .layer6, lineWidth: buttonBorderWidth) + .borderAndClip(style: .cornerRadius(8), borderColor: .layer6, lineWidth: buttonBorderWidth) let exportPhraseButton = Button(action: { self?.exportSecretPhraseTapped?() diff --git a/dydx/dydxViews/dydxViews/_v4/Wallet/Wallets2View.swift b/dydx/dydxViews/dydxViews/_v4/Wallet/Wallets2View.swift index 6a6353d72..0636b3fbd 100644 --- a/dydx/dydxViews/dydxViews/_v4/Wallet/Wallets2View.swift +++ b/dydx/dydxViews/dydxViews/_v4/Wallet/Wallets2View.swift @@ -32,6 +32,7 @@ public class Wallets2ViewModel: PlatformViewModel { Text(DataLocalizer.localize(path: "APP.GENERAL.MANAGE_WALLET", params: nil)) .themeFont(fontType: .bold, fontSize: .largest) .padding(.top, 40) + .padding(.leading, 16) VStack { ForEach(self.walletConnections, id: \.id) { walletConnection in