From 468c05ef7d16b4333964f2bb09f9c0e0f74113a1 Mon Sep 17 00:00:00 2001 From: Ky Date: Wed, 4 Oct 2023 10:55:50 +0700 Subject: [PATCH 1/5] add new icons + resources --- ios/Podfile.lock | 12 ++---------- resources/images/icons/appearance@2x.png | Bin 390 -> 688 bytes resources/images/icons/appearance@3x.png | Bin 561 -> 972 bytes resources/images/icons/communities@2x.png | Bin 841 -> 847 bytes resources/images/icons/communities@3x.png | Bin 1181 -> 1241 bytes resources/images/icons/dapps@2x.png | Bin 0 -> 805 bytes resources/images/icons/dapps@3x.png | Bin 0 -> 1203 bytes resources/images/icons/edit_profile@2x.png | Bin 0 -> 690 bytes resources/images/icons/edit_profile@3x.png | Bin 0 -> 977 bytes resources/images/icons/external@2x.png | Bin 0 -> 298 bytes resources/images/icons/external@3x.png | Bin 0 -> 346 bytes resources/images/icons/globe@2x.png | Bin 0 -> 1031 bytes resources/images/icons/globe@3x.png | Bin 0 -> 1590 bytes resources/images/icons/key_profile@2x.png | Bin 0 -> 814 bytes resources/images/icons/key_profile@3x.png | Bin 0 -> 1171 bytes resources/images/icons/keycard_profile@2x.png | Bin 0 -> 812 bytes resources/images/icons/keycard_profile@3x.png | Bin 0 -> 1197 bytes resources/images/icons/log_out@2x.png | Bin 484 -> 832 bytes resources/images/icons/log_out@3x.png | Bin 692 -> 1202 bytes resources/images/icons/message_profile@2x.png | Bin 0 -> 801 bytes resources/images/icons/message_profile@3x.png | Bin 0 -> 1098 bytes resources/images/icons/mobile_profile@2x.png | Bin 0 -> 615 bytes resources/images/icons/mobile_profile@3x.png | Bin 0 -> 837 bytes resources/images/icons/multi_profile@2x.png | Bin 0 -> 798 bytes resources/images/icons/multi_profile@3x.png | Bin 0 -> 1082 bytes resources/images/icons/notification@2x.png | Bin 450 -> 689 bytes resources/images/icons/notification@3x.png | Bin 626 -> 953 bytes resources/images/icons/share@2x.ios.png | Bin 442 -> 580 bytes resources/images/icons/share@3x.ios.png | Bin 647 -> 804 bytes resources/images/icons/syncing@2x.png | Bin 0 -> 704 bytes resources/images/icons/syncing@3x.png | Bin 0 -> 1084 bytes resources/images/icons/wallet_profile@2x.png | Bin 0 -> 896 bytes resources/images/icons/wallet_profile@3x.png | Bin 0 -> 1335 bytes src/quo2/foundations/colors.cljs | 5 +++++ translations/en.json | 3 +++ 35 files changed, 10 insertions(+), 10 deletions(-) mode change 100755 => 100644 resources/images/icons/appearance@2x.png mode change 100755 => 100644 resources/images/icons/appearance@3x.png create mode 100644 resources/images/icons/dapps@2x.png create mode 100644 resources/images/icons/dapps@3x.png create mode 100644 resources/images/icons/edit_profile@2x.png create mode 100644 resources/images/icons/edit_profile@3x.png create mode 100644 resources/images/icons/external@2x.png create mode 100644 resources/images/icons/external@3x.png create mode 100644 resources/images/icons/globe@2x.png create mode 100644 resources/images/icons/globe@3x.png create mode 100644 resources/images/icons/key_profile@2x.png create mode 100644 resources/images/icons/key_profile@3x.png create mode 100644 resources/images/icons/keycard_profile@2x.png create mode 100644 resources/images/icons/keycard_profile@3x.png mode change 100755 => 100644 resources/images/icons/log_out@2x.png mode change 100755 => 100644 resources/images/icons/log_out@3x.png create mode 100644 resources/images/icons/message_profile@2x.png create mode 100644 resources/images/icons/message_profile@3x.png create mode 100644 resources/images/icons/mobile_profile@2x.png create mode 100644 resources/images/icons/mobile_profile@3x.png create mode 100644 resources/images/icons/multi_profile@2x.png create mode 100644 resources/images/icons/multi_profile@3x.png mode change 100755 => 100644 resources/images/icons/notification@2x.png mode change 100755 => 100644 resources/images/icons/notification@3x.png mode change 100755 => 100644 resources/images/icons/share@2x.ios.png mode change 100755 => 100644 resources/images/icons/share@3x.ios.png create mode 100644 resources/images/icons/syncing@2x.png create mode 100644 resources/images/icons/syncing@3x.png create mode 100644 resources/images/icons/wallet_profile@2x.png create mode 100644 resources/images/icons/wallet_profile@3x.png diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 7dbce711630..d80e56cf568 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -707,7 +707,7 @@ SPEC CHECKSUMS: FBLazyVector: a8af91c2b5a0029d12ff6b32e428863d63c48991 FBReactNativeSpec: 1b2309b096448a1dc9d0c43999216f8fda809ae8 fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9 - glog: d93527a855523adb8c113837db4be68fb00e230d + glog: 166d178815c300e8126de9a7900101814eb16253 HMSegmentedControl: 34c1f54d822d8308e7b24f5d901ec674dfa31352 Keycard: ac6df4d91525c3c82635ac24d4ddd9a80aca5fc8 libwebp: f62cb61d0a484ba548448a4bd52aabf150ff6eef @@ -772,15 +772,7 @@ SPEC CHECKSUMS: RNLanguages: 962e562af0d34ab1958d89bcfdb64fafc37c513e RNPermissions: ad71dd4f767ec254f2cd57592fbee02afee75467 RNReactNativeHapticFeedback: 2566b468cc8d0e7bb2f84b23adc0f4614594d071 -<<<<<<< HEAD -<<<<<<< HEAD - RNReanimated: 43adb0307a62c1ce9694f36f124ca3b51a15272a -======= - RNReanimated: 06a228c5a245ef7b5b03f0efc29d76ce4db9031c ->>>>>>> c50db2fd2 (lint) -======= - RNReanimated: d0db0ee059c33381bca787a2193c27e52750ccaf ->>>>>>> a52fda25e (lint) + RNReanimated: aaa16b8dc7b9552ead99d5c78a35a3066b2838a4 RNShare: d82e10f6b7677f4b0048c23709bd04098d5aee6c RNStaticSafeAreaInsets: 055ddbf5e476321720457cdaeec0ff2ba40ec1b8 RNSVG: 80584470ff1ffc7994923ea135a3e5ad825546b9 diff --git a/resources/images/icons/appearance@2x.png b/resources/images/icons/appearance@2x.png old mode 100755 new mode 100644 index 071d38497cd15ad3d9f29cd4748ed79875904f47..5d6c8bcc09a225acdcbe00ab6c71951ea2aee285 GIT binary patch literal 688 zcmV;h0#E&kP)`~8@ufQ+dn+|ZSyBiIyCf?Q8?mOE-0Vv}V-O&|tP^m&^kK`w{wc}O=F z!FQG&OP^)g21(dh!lu~%2uqZEM-4-Yas!Izk#V7FUA{ z)a_*m(lKQ&8d=?K_5qTwSh`D<3@gDYe#;bc4v2Dv<%|rt)r-0@iH%qIPxrZs?2t<& z_6NEngna%XNXLTq;ZmaeTvChhp!Y~Ee4BTH8&tT^qy^^&))=f?tMtj zaJ>jgNwr*-HQ6w7B()_O zU?ParxaaA?afqavf}Bon>7NImbOvgM1&NB(k{%YMPIZsF?64q_^5#0JDS0l((!2w? zLhbF>4YX$y3=FKU_$Ms>rIEvw*rVsjb_dp)k^dnu&c{Z6InWy!M*b){_4d`uo1N8W z>=sLNZRfNAY-IHFwm6|Cz`JoYa@LPWh-7p&yp1WG(;8BMNJcZ#eLQN4t0&mu-{Tu8 W7ElAf(l3!=S zmFbNGSDz_jOJxNRX;$ww_54cOAS- zP&;DSOwom(qPoS_O0h4qR#T>znT8Z)I-cQSG(wyi&Av&g$P~+BXY?zog`YGMw7@?R zSr1NsteNbYPhk|a2P>Vz{@$*l4&+cHLQ)F10l(gO{Ze!iW09zJB$+d8WiMMjkkb(F k`2qR=Phj(J>=`ZM2RKOu=92Si5W;_p4b z>!o*=K3kS0`2Z>^D&8_0D2(-bJ;KX?Z`-D69-$!KLwO9bUGm>g*oqQ<2PcL~_}Ebi z#{fO;85|g?I*19Qpj*6r$Lj|;5KuO4Yxk^+2%>$M1sEYMwlVIbFHjInc7n|e_!M=R z#=ajt!)!uB>!(-2C1=`0mN1f-cQj!f#T8!0*z6fCMmj*&SlKGJA8}~8L-1bATT`Yu zv_t_dDlqma5Cogt6}EHOScPqZ&)Al96)2xPz{$yjHR?@BI6gx$^9}ruop)gl8z=OV zA}HFSOC9Ou7&G;U+m8RJw)0{>2K}&#^f<5a*`cAU-^g%OuAVq!KMif~BKYIt= zy2&C+&IuR#hD_ya=FwuhH*+=sz6d;Dx@&9FNI(=1QA87MbCz5xYf6Xw|+ zSwFQBGY*0Kum|l@BQ4dK;S1+JI&+D@FX#RWGND2EqjSFmJuIC2bI3#|mgc(gF!TbN z+8Dx0tW@{RP25h-%b4=OeFpzO>FHwb*1dhng9!vuu#aqsytWxs-x}`IwPS53SH$zp zFpcOF#N)5^_dW^%gB}0x)3tSf=n!U`mmGiCW_(7~53O~~Tb`RcZ^7eJdZA&`t`eU> z5AOQR-T^cSyIV(U4(x*)T|Gl4vI%n*W3QtDXFXZqK5U;b*H|iAUi!hgzeR;FAQ8NF zJMlRvK!q@lJk78jKa->Rno_>yfttX!vzlo+!jmfilq~U(NiIDl9(tBM`)7DdB_4yL zF5;b3nKrTzZ@ld&vRiU~59|cR@?wxg*kiW6=Eu*I_odu4Es%5mfY(2VNTPq5Pv( zP~ruB=Yj2K>Zw1~ps>xjO%nT{1m#D{M=dD_;!{#~ucNwK2P*D;NzoxGc{n85Tpj9{ uc*l-P_}FoXFXCx0H`T`$Dk>@}1o#I9ZLfRz-fQvz0000lyidp%@ISvk{@(`1bJsPWaWgP5)_S@)hE&A8z5Y7ykO2>C!W%R3 zs`i6r_x^jTPYo5z4RTk^5PJ2qbCQ2A_c6=bj6Q?ug;EPN9~v+eFm^CB++&m#2;_2! zE7o&Zy8j>7jyKkFH#~GNtdse>rKRD>p29Dit}1Fixx(~f(z_QzZ$krRVrL}<==*i0 ztGCLf9u8U0!On)vB|0xz(yI?*mRG@_8`A#*nt25 diff --git a/resources/images/icons/communities@2x.png b/resources/images/icons/communities@2x.png index d4d9582d6208e05dbad906c1792de79c5815351b..cc60f26d06f75eb3afb1eeed388e27e1e434058b 100644 GIT binary patch delta 773 zcmV+g1N!{Q2G0hNR)6G4L_t(|0qvL}bQ(brhKIg7Jm^$|4!Y<>7mtrGI@C5EPc>-_f5c!S?JM_AQ-M zgG14K_CB`UtJo+YPXMql4h&FB_7}i0z~0@n7eH8ty?H>M1P^{-@0;#5`ws?MQw^&P z$Z%Nwh|V#V4JP5xem6j#U`*%j!B))~Y>~Jg3g6Nxi$76$;#32am4Bu4mLl-Kh0271 z8s-4i1{AnQI)5nuLjueK!5@lC7_P(iYbN7)V`>V}!C_11R9paJ^4>umGug+cC`^q2 zO3bC;I6wmr5*GK~)BmPpm3D;lRKFe#+w;2Zeie2QJFwQhz{E$Hv{O8PiNvxWXHWS%3w@ z0-x!W$(mHv0O@qL9svT|_Gl)aI`~jF7fzX4SuE;loIJU)kr|uWZ4J~)sQXmqTrN{k z)myt&+oV}VluZ_LV>jmSUz7_d(yKx%H*7Q7mz!j*G|%=gvIwDVHlRE}Z(N#(L%pH= zT)MbJzkkNuB2vgh$KNr*C}1hTfwVtezp95VTbaqB#9Km9QCYx4-L|I+D$`a0e&jT&h=~g*hcz&LfJ|X{S-)90Z?Lw zJfQo)i7C5r{hCl7Jlo1nlAe6G!Yp{loT0Ygo~`zE>X|B9@LwN13682hHDlP`F;%o! z4C2M$;(!hq5@td*EcwqPRx<0`HDbFeS$nms{cH9cR8m*vGOLF#00000NkvXXu0mjf D(tvy1 delta 767 zcmVLK8Zw;eQ_-CFlZjOZ(v{#SOc@i%hy_ z*X;yBJ=m(?K9vpi!4BgyAz_0^9oI-luL*2a#BPUp+e!68gGhFsFr799zlLh0AHqF| zMm~(hqY9j=#KgJv`Hb?m;~iMt%^RfqUMhMjupx4#r)m}W&~A}jGoxR^Kn?$8=25U| z0-JA$AAewp_znE%en$V`74y+LC4aZjg2O%2?*+X=-o9O7y!*sN^MPC;r6u(M2I&$} z$ZOQzqM{V@Bb0k*<){Li7Gv-d`2m^S0pr(&mtejYg8$S4(FwhR9{~wGtw$8Joi+TF zc901;yeIT+L|?PtTNHdCS_c!nMJ90Q1U*mxOL#)xTKS0rtWgH3ZBz+8Cn&YBNt6=2 zIQ~0=b3gb@VUbTF*s|XnEPtoqQ1E+Xi$b^$n6L2nQCexPrECIS*ob3#X>XnVK~f`c xe_SFO3!yRZ15eT3T8dSKsK$BFV&UHke*qDErApL@5MuxU002ovPDHLkV1m1zZt?&C diff --git a/resources/images/icons/communities@3x.png b/resources/images/icons/communities@3x.png index 7187477a167f4f7f6005219ef8052c8a45887aa1..5568694af426f0eb9a4cc28b0d3a5c989d30fc3c 100644 GIT binary patch delta 1171 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 literal 0 HcmV?d00001 diff --git a/resources/images/icons/dapps@3x.png b/resources/images/icons/dapps@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..56a83257cc65e34c724e25acf3f6240aec39fe82 GIT binary patch literal 1203 zcmV;k1WfyhP)G3V>gmvgF+894mI$C=CLeEpOLQh0U_>?HVR zk_kBKKr{^kU4ZSh48vnl)(BsU&uFjLiThlk71-pq1@>Nv976vOup!0s$g<{^ zn{vQ%M%5eGn9oA3(9*}3)J-{HSv|Bh=d23(tap|rBb@AalEV_lFE)%Qcf-?Hs+2LG zCGyLs<9Wk2H&N2s@I&kJD3<}#AmxfziV1;e#)byuiPui3`@Pp7>m#T|9 zY_M&~r_CGi=H0`vy^>qV8w578twG<{>`mA155s6`+Ga}48kMpEU#_S^o<|;BPT3^v z!45_SxlTU(k%!0$K%*l`&9C=ys0DN7tI0kNwFsxQV@vDcSf67{+DX3sA6ts0oU)09 zULM&Os{Jm!&Z2^6V7H)jxa}s47`^3r^bl1Kd kq_ujR?UgpVt#Ut28^GNTmr_NO zuxQBR!`*f(Qa3EWlp>E#4%HsH?42iMtbHF42ee!&LVJE03UJh@QKLSz{s7;QG+Gg% RCg%VE002ovPDHLkV1i(>M$Z5M literal 0 HcmV?d00001 diff --git a/resources/images/icons/edit_profile@2x.png b/resources/images/icons/edit_profile@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..12a18a3e1eceb156028eecbdecc8d3df6d584b70 GIT binary patch literal 690 zcmV;j0!{siP)mc(yw?G@n+72zl`l)WO);$OkGmTuK$T9F-qRsKR zk*No?m2JOP2})>Z+SJx$2a+6eMRF*fHKJ_~uB&4lJ~9~!Nfp{hszGZ6CA2EHbV004 zf)JIf_v4XL5|j|B&~D+K3_UlMe-qf`XalkTqjK9TCtAgF7>AY*XHR6BYE@2-wLdB7 z64HMvPepL45nytq!G_nTbWMR@val~K+sB1i4jyZVl_on0A%|RF-!+koB524X>tR^u z@b_iN>U|*x#CVWHt3sAF8CO)E+wx9F5J6kDsIjlA-1$c1O|Vie%BIkY{X&L6HyQFk zhzHl&VQ&uhL7`RfB3Q{Im(c1e-@yKpJmE~xH;)V|&nW;-1OxNPOXYQN^`IWwSBKDg zshna6$`_f+qitQa(Cl@UJ5`G)f^@m{D!e<`E0sG}3maSrs`A9;YHu?Ptrj-4d0`E% z7B=|42M0CtQPsi*7lOJd?yHMJj=#)W4Xwg$lL23oK!OvV)jY!UUY_|@{6yE+38M(9 z7S{7!j4HQg6ZjusavN$HjUE*6_pON_|1$7JmpXf*1aST)5tVYjF%cHRAr+|(9Xfd6 Y8>6QHVf(YV-v9sr07*qoM6N<$f>QZ2cK`qY literal 0 HcmV?d00001 diff --git a/resources/images/icons/edit_profile@3x.png b/resources/images/icons/edit_profile@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..d54e33f0386bf97a0d526e6c29b27ec137118b11 GIT binary patch literal 977 zcmV;?11|iDP)-lM-4*9bTfFcLhc9@=;VEA5hO_rKa_`-5r!>x!oME{~d1{ZAR>La&H(Y>d$xKFCT0@41#!vB#cV-P&& z%Z=zdu#lzs43YoB?JL!VQv;jNq%0 zP`BY_%=zABTeMA<$SHwEZBGtl6Wo%@C@Bz(TC7*+YdWvMGxZ$2kd?Z3OO9j_+%m{F zUyQQD7nlt_aJ-}i%!yc(YFT1dZzr-C51X56xEB#ceQt7AC|fd18jXsLC!Li&_O9_ga$`!$a$LywT z^oj67{XH5tWg|$iIo6ztu2H!u8=(=tR)0T{Cn?>OjZndI57>FfP?5|{*$5RZ_k<7R zNoqG`!&|VKcaj(KAcvc>F~rG3ayMloM6g~#osTMWxhWgof=$WL$CaJrbW=7$Q~D_W z-Fa$fHU_e}DI4!843wd2rM|$SS5u_SVHkd&p-%&|r*cK8V7)TqKpMZSK?JWvn>Kv6 z`dvmcH)SK}sKvOXkO-k>KjfablAs79IxHG#J$3vFqPfXge%c64Y4DTmf*}(BdwS-! zA1Z}4y-p8JU6m^@<|l-`44JltLZMJ76voMa3{rx@V21gp00000NkvXXu0mjffXKj) literal 0 HcmV?d00001 diff --git a/resources/images/icons/external@2x.png b/resources/images/icons/external@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..25dd8e4d043f87d7c796b236bd55fd57b3289241 GIT binary patch literal 298 zcmeAS@N?(olHy`uVBq!ia0vp^8X(NU1|)m_?Z^dEoCO|{#S9E$svykh8Km+7D9BhG z7o{`;(Vs z{-P?%>`ls3C3TBGKkKiQPE{yhaPHFi)t7#{+=K3BQlMTEArXC0@6yVE|WM6pTTHyn}H-hZz4#X8E@V${_Uv}N+y~PaK9WF8v q>m=UqUssq`)iu3n63`9O9~mvfLyPPWJ&*-@g~8L+&t;ucLK6T*B6Dp3 literal 0 HcmV?d00001 diff --git a/resources/images/icons/external@3x.png b/resources/images/icons/external@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..c1532f0cc4e14e44f2944e4112ec7b4b7cc6e9ef GIT binary patch literal 346 zcmeAS@N?(olHy`uVBq!ia0vp^HXzKw1|+Ti+$;i8oCO|{#S9FJ79h;%I?XTvD9BhG zlOojpu7dt!dhJ}^M9a#J# z^SeM;nB1Xbe!olEwrwa(^i-SqpkCn6A+z}@vpRq}fnY(gr;N|#l8Ht0G?%Ux*(55@ z&Y7iLf9!RO{HA+;*W>2wWO;q2H~Zi9nervp-mGWWe+hr1AZo(*uUI%`=rM3-D#oOlX193fF{an^LB{Ts5UF3&6 literal 0 HcmV?d00001 diff --git a/resources/images/icons/globe@2x.png b/resources/images/icons/globe@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..1d0f4a64b80b3b4db4d3a89b2671acf92b2a10df GIT binary patch literal 1031 zcmV+i1o-=jP)HNXA^eoA;Y@!c(=TxHu(R#gZa8nn~YPH%69f0-*$bg#MTryuUpGSr*nCHw>20WuZ zs4_qXcFoOA0#uAL<~{=*Rhd*8AOkz)=AOA}{$4Rpn3uG5ZA<>|Nek=AcM-AwU)ctEgoFrj%ey;?@z% zx)oViXq$i6xv!s^dqin)*R%r%*K|B^P(<4eQ$z@d-{yBqbVTVm0S>Nc8*s1UMu6Q4 ztNT~N9(|=`EIE(GWGw;kNd!Py#{q{0bOT_p?m*)*7~htKfZ*1VnU7e0@NgVO zz+F>*rKip?jU`psMm$BpwG6m{jLT#ms2Ov0EC%n)H}c&h3+M$xE~FjDfC;!O+QspL z$7u>8iDymVH>Chdx=`z3vbuJY2L{FS=YE~HkU0tfW4$9%WnP3G z9>6nc=Z?Y|?NSI@&;1>#Y^s1B>+xoS3W_|Bmxkw>rjyS6Cg2fBy2BT;OMb=ahSJMi!J3umb{{?8c`>S3@Hv(|; zVjjpD+b9@&@0Cl5@lPVVpORfG5QOw#>$%eR*%UZ#Y(3da-4Y8g?uWQ`8d>(*Ng^wG z?JV`O;0Uhtj3KT^!K)#Fh4#wKuln?1U86wtfykC;SO~@=;a^eyT*v17SvFMmeLT|g zzY1X?!~gbp6w;f0ev6T$3b=LivT&#e%ny3^^auRY(4);?o%8?z002ovPDHLkV1h_( B&#wRg literal 0 HcmV?d00001 diff --git a/resources/images/icons/globe@3x.png b/resources/images/icons/globe@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..805805cc037daf1ac93fb5e18f6b8f39dea15ec6 GIT binary patch literal 1590 zcmV-62Fdw}P)s6*}4aoRxb)agxa*QU19;u>nQ@4PozFDtF?V`iA~ zo6#8Vbfw^Ojmy-Fl>U-|2K7!wX<*gqdKU+99v^@?rQHwAOcFBTifaJK2CU|0Cx)T}$1TmR?)onoc zU=5=>k-aiuCOZtzO&A)zAt4r_1<-q7!Xs#u$CFVW+V9f6tE!~;s&r0}g+{O1A}ayn z)V|Q4Q*{e63|XdZR3aSKW-Q5Kc1Jlrh2TaFlU4b1#pZ222U#vc1!S8v2Po~cu2wmU ze+o6f%S;v%71QJiWXla?S%gIZkr<`O(leNSe6C_d;q$*kdfd{5r2oRV5!uhhH3Twb zXY=47SHnZ~e@-G0BU=#75iYDJS(7ck#XK1UHQuH7LYFYTxF4S9!MDycmd{loTDs7g zy8ONT+`)vYPfv{V0ok7Xu3N|nTAz$-NC1XB85XqpUvm`CC3_ZmhjyVGJ+2qE_nd(( z?UumIUQnNF^rLpb&p^9!B39n4t1+#3F}B{p6Choy%+#XrO!`#)4|CEJ00A#p*jw(i zA#BJ*BqGn82#kAuC37^s>^Xx=Kb&#`FbZpbw1C01cJ4wxFmZZ9lM}`nnUv=!W!5Q^ z)`^obJIv*XpAT7cr4S(r}BPVj}Y;O|j|8j)c9HkKNbszTguj=wRm0$BS zGTVc8V}(mMWFSUZ&tT3n%3txf6)BX{8cprQ$4FSq)J$29XTfnN+Pzhm42MU2J$bBf8H>_fb zQmR_I69b~S-glNn^^C$Qtb}ErSr@0Qsw@MGQjla@sQ%HVrxal=EMA@}78Zt3wLz0I z6nXkF|Hj^_CubJvmyFVy+-XQdYrhv7LL@F&+CdyBzvJHeceEsZlNbzs4AU!v1nSI# znC}^Wf5Pj~$(6|}U{@&IL1DSjvdJbMvpMI zH>9ba@_KU&_^w(3sqH=E0+FI6xhRn&%u!h<2cHxD7o0DnWvx&)#IyBs?*TWpvWfW~5 zJ%s6b+bwlaWP4S%TvKTMG%XWv?Qm(R;1W65=J8=!ykq&r(>#J4%pSGuq)n0%FMU89 oq;=&4e}32&!5wzkVTV_Zf18Gxe>3v07*qoM6N<$g4pNst^fc4 literal 0 HcmV?d00001 diff --git a/resources/images/icons/key_profile@2x.png b/resources/images/icons/key_profile@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..5b75a93954425046977fde21a19f3295b3f1ab88 GIT binary patch literal 814 zcmV+}1JV46P)eo}K~#7F?U*rC z;y@6FC-<)7+T&`d&l+p!t+m#xz5Z&?_OLzrSYr*f)>=nf=&{B5VFoArHk)+`KA(^O zy?slP&F0JO%w!g#y*{{>%jFL=N>oM-i(wA9>q&FL3T{u_CRvu<$IRClAcJ+eJLPr| zdCQzz&Y+Xfphf^0?uffHb85lumfNF%;J730CzUNbX2=ok3XtJWxH~amV|nNzaL<6d zV*`pMA5znR4jlaJk{>jSytl>OIk!U!Kz^Y_@dMfp+@DxD2o~n{7hrN~AeLZDRxPXPzmsp**mXw^Rd9i2bNd@dm{}32+WZ>YRzqtQR>qy7> zzBB$#=eEn73fPgph!}IPUk&aHb5F+^|0q4++LQ_?OXp7N(_H$EMWk;#*HzY!zv+*p zATeqMu1#s}@E9{>IQXjlKHpJ_1)Z4EO;xPH(OBB!b~RY)Qrt} zES9n_koY~Vh`%KaXd_bqsttE!5q7BB%WR!AjC*yGTk ztOl-2uXS1p&TKCS<~n>x6LVGifyEH1!F@|DU`Gk z;06W`zUJMCOL?`GVxsug<8#Myh}7_pcBq&<_^dxX0dYe+R*VI|o9&?8Y}fv6(S%|E s?G8?r`?CHnlu|6b8{A%d?e!V-0#ZaWHMr8edjJ3c07*qoM6N<$g2VcQ1^@s6 literal 0 HcmV?d00001 diff --git a/resources/images/icons/key_profile@3x.png b/resources/images/icons/key_profile@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..7289952ebbf5571d5b9b5a7ca6c2977a1bd2471b GIT binary patch literal 1171 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 QH~@+(Pgg&ebxsLQ0JNmHL;wH) diff --git a/resources/images/icons/log_out@3x.png b/resources/images/icons/log_out@3x.png old mode 100755 new mode 100644 index f09ee825e82772b5bc3a781030346df6c17a17ae..d5da80e683e6d94e0031b4b85c67010eaadd6e4f GIT binary patch literal 1202 zcmV;j1Wo&iP)3kK~#7F?V4?J z(?}48yEQidsPYX~dx8xoSO;RWY(Z8z0rm+toFMiI7EX|G0=!A8c8N_aPLLcyoB&aQ zD!>{wJxYj2u0+zvu_aaM`4M|YmZR76(LL`BKut|eO-)TrSwUD4|Fs=ky*3(P>-Ajr zHvb=aP#_Ih5+$x-Nr%w-4Nz_%p-liS02y5;ihurlfJ1&6K!M~Iee&>GkNe4U7T3Pi z6|zDEg7RZ5dc5VdiR3=NwV|RIi9UI>{WlAKneY*hCy8?c%O|7{R!BYx@PA%JB2Naw zgM!ICktxC4e_!744X#D->Ou;4#~t}l0Wyi6{^8icOrBj%P}g_5+-m(NZm~0Q9x`?B z*-Y+%E*Ri-cXHH&iejaGK(#Wz^yW3_eUV}p3SjCuEw}?xMSuG)omd6Yu!ylc-g>$> zyO3vBjj$A{qAd&l(u#if^ymQAj1o+Q1Ac4Ig5b@vEuJcxvyJxrExd;{Gi^I9B5OXJ z2sgOJ|A8e)6n)ZhHuN$lTrRAcO*NFHwaIgdKBRi%t!KG~CyKU0Y3pSH;v5Q~>yFNO zE_tEXaZbNGez?5{IY<;O5f@v!u;fF{C7k6AA@)2pm^|8k4u&L(MvBE|=#EE)wDeCN zPmTvH^_5;1a+Y|~`E$eMdlE%cJRvCs-FL^k{9LcKsuqM|Y7)wlTN>#Xt>{5XxECcy zsQ0=SXN{SKr-!T(qGog{tsRveYSo!zcqK(E)IvuthO&$?Jo|bY(P-wLJ1eUsvZT~= z>8-0`xZjx^y}0eJ?4pT`M3aR!n+9ztfU6kpcTNw7H(jr6_f8{B@Cr=2w^8`QkUaiL zU05~jzVaVCRz)~`e0n&z?G}^nZ6x|?HFf|iM1?37s`NT;-cdI}u%fcvTN7+wS0bK& zmZG0_Z(15!N~2H3Vil7iW3}W+E5aL3-;YfUkqUsv$L9%$t?}> zmcA>GY8fII1t4x=adu|n$|f&37M7A<{bCm&nr(EAB2yG!2k zx_MEs3QbRPcy=kXcibrnu$XZ@W!s9k1`qVQv{;-(qUh!pq9apIGXwdb{l4zWOl{z^Ei^X`GRER0Qj-$`(rw??x6iT%Yev~bm;PAxSe!)a z2A=YrXF`6|s=VfX@nCaQjUCFHNNs7=#TPs&ds(x+Xfkcps&gemglF8@_3`XBo1$Oz zp_x2n-;}>}LiTUCbih5~-+T9kTa_+vbfoI-*3$tJ-oC4V#5)n_b0){}9Y5*EFDL}x zLgAO;NR{z9GEN2CyrH(gxNy%3Atx1+{4w?}FkVl0CdY2~-Qlks%lay2LIuffA}D91 zJ2`wHrHFojXolxR1_4Vyu2*_YQgAYZjUbl61wq5B;^CZ{nwpxLnws_S12*E-)CI94 Qod5s;07*qoM6N<$f&g3~O#lD@ literal 692 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY3?!3`olAjKcz{ocE0CrI;F~@<7ig|*NswPK zgF*j)hlKU{_3;7?=l3hzpFg4C{el4h4foFdd$+H0ZT=w!2FCZEE{-7;jBlr(2}W=BDbW3`tpCb%|G<~+Bv`Kix+0(c{tfUn&MGp1z9ru$MJESE=aQ zxM=kmSD_cD%3}&-ysWhUH|=~^>-}E5GHB-cPu8ar?>+G}&rbe6|J3SjChY>#esWlq z)Xu&=y>MbIV{&x8USW@8Wx$%-2W-?n>B$5)zAuzJ=kRm(m-z1*HDU#k=6uDVwCCyS K=d#Wzp$PziDHLk} diff --git a/resources/images/icons/message_profile@2x.png b/resources/images/icons/message_profile@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..e61cbbe73b97dd046a69ba41014dafe9a4d7fabf GIT binary patch literal 801 zcmV++1K#|JP)7ltaNj_XiE?bN2HhC0-7dTOUm(k7`%O=?`@8rM*VI@Dyp*)=+OrPJMMJRT2! zX6Lv&SUs&)D+!{rUb$M-K!?NOf-hY$OS@L9^_Lo`5+DNsWXN{O){B7o+OXZT{izC^ z1Snu5u~ev#)@(~hCKf;2 zu^$8gBQ}6f|9cjoMsHnGt8S>8MuF!GI@MP!00lrR2YYh8r)Llc0Yki!+rIz45JAa5 zt$ACDYexB`ZS_zu1)81!vfetMqbo$6VjaKkDy$$SaMlct~>vI+h`ae*7X-rOwFUZ`Y2bNUzYyMP?-UsE^|}a zxMr7hUVW!;w?2)_(fTng?u(W zH2E8fjbA1_UjV`c)X~@rTyR62d@hz<_LT?fYZjW_k|J6iAVls<*>1f02q3D6f3n?be)oaUKE z7?GOSIo~t_G}LFfPgKm)CgA literal 0 HcmV?d00001 diff --git a/resources/images/icons/message_profile@3x.png b/resources/images/icons/message_profile@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..cc369a28c82e209ae18ddb747337c9a7555c7fed GIT binary patch literal 1098 zcmV-Q1hxB#P)P~mEXYS2t zjyp?8Py5koC87ZX1`OCEjHn~Ly}gb3al~bu){<7E(P&K_Asb;KIOB3E<%pW&7nc>6 z7cQ?n0Y51dS`%iX6Mmd?IiqxGTJgl?k%=#T6OlMA8Q>rkNiHIUfn6|U&+Rm~R*$Ui0)L4(< zl1WE{om#>o-81JCJnAC|{TvXJsPv`nQCekD7m)GuCC zpU_NiAXI0=@14I_J7&8Y+SE=%6}=L6Ht!Wuqzkm(#-#x2tJOMGH>A=h>fN&2aR(5! zy$6vm zkkisjP?Cfj1|Cl>BRSI;y@bWhgLJhtol+W_1RkkNpN1y9@>M!84&X%A=3U0I^Y^+* zXbHmZ<^daQYdqZ~@MygBi7;HPT7~M?5k^)J*~v<>Aa5dEAn?#}|4XQ1P^CpBTqiQI zrcnyuqk2y#EYLd+QyQgDIQi=e%eswDEn#j5yGl-@^o%d+{i&|9CDQVxQLbnQASUK+ zbfQ_ADB(aF<-9a$?jJ<;7^2S76idr7rA~{2^i2ty7Q6kdK0jEJ6gke8VCRdz5_}?A zkaZ^-s%+A@CZ~r!(wk0cYwuZ4>{Z{sV;1x~xAxh``EYecTwyII2PyqQg+I~%F?teN zpv?^c3<9%#me_P@jl?8mJeQ(l`DC&{t~(wn#7%^2&V&KP28$*K?_J#D`9Ry9OGw>o z35&UasBeo2sou7^+;T{n;Kbe=Z!Hs01qJY+$93%^mt^q2A=TE`DY6mPkb!L^!DN2d z)eU&x3fKtT=kolW5w;+rzVPJVMj7sAxhO(7;^;cPBvXPg?E04c>f6}+T2X?qk0{jk zdv5jhp{Na0&v7_Vig31NCKV+J_j;L4qff%Eqoln7FGI6ENaPO~Fklbx2QQs?cdL>G QRR91007*qoM6N<$f;!>&i2wiq literal 0 HcmV?d00001 diff --git a/resources/images/icons/mobile_profile@2x.png b/resources/images/icons/mobile_profile@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..cc75f7d27fedbf0fede8253e54ecf3d3f73bf1a6 GIT binary patch literal 615 zcmV-t0+{`YP)HRT1!Kx4FPv_S#LB?4Tby`e1;_{-SO z4v26gEFL|eszf9Ef{+VKV-q04rC7{zKauk_+m@|LDccZj#J^GdDMGFw65uNqJ$C$T zjlRTBeijz!XR7tNFgoq=7UaZvqq$HqsvpKE-g@=hhHU;%lHaw2YucnN`%Q3%x|*E7clW07a!+ zNzIpL?~68n*O$gQ#k~KCGKi-@g0Bu~A=P-ibuF6KO!T;ED{zwDNf0AMX?!WQc4bKT!IAz2HH2bnlu|%kz z-8>||)LWee@RLjRc~g+Y$tum-~c`A9Fv z`ibQ(>wu%a6MoDr*9B{4fu@A6ml8QSrsy-!uLAT!^x5*k-CL4KzR9BpIAj^>$}4^1 zn|`CwAkbT=mwx*|oBQMoV4?MdMoyy48TCnqtc?T$t@nnq>Fx(x%)qv(qGm z+`adm+zXIMBoYmx1reFg=lkw(uj0SVC|a%72Sg&6U=-KJpA(D@#sS7Y`0)o7Z)3dIuqJ0EEz@k{n$P)!-W(EOph1$b76KRbxjXoII0t1+l6OjR` zH7fN%D6s@SYl<<%LlVbpw1;`g7#FZSFQr)e zFrO-D8TbY@;rcQk6ss;-|F8(=iImlD4EQ|W1tpdy%>`GPf=u&e0aVCYQ?6yu;)#5f z-CQyV`JxuAYSM1y!-+l}<*=|cWv`%>ur53ri&pTiIG;lO$TW9AfmU$L_gyQynwwLT z-gJ^+CF?L~sYo@v=_J9Mj<4W#T!<9XM8RHZHnB{nao4 zGELP|Gd1ZV+;?G4UHihEg;83&&10!y-j7wER{|loXjNDQ^M1UFKFkYQ{ngYW_?;cE zqDe1o^?(wKU|y^vND zC*I_@(7+5X87Aj}b>Z^SSsJsntFE^gA^{~i|7XuP|i(<{rgAnFY5`7N8PTE)m zbNPj|4`-t&O;gK!k{YPV(mYGuVi?NdSBF77>z7sdc^j+4=$1$%5{=*+C3VTKOD!ds P00000NkvXXu0mjfWF~?B literal 0 HcmV?d00001 diff --git a/resources/images/icons/multi_profile@2x.png b/resources/images/icons/multi_profile@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..20c79a97c7d18fb8efdd8e86105b78d3c101ed8c GIT binary patch literal 798 zcmV+(1L6FMP)@fG%!oo1-x^7fqeWx>fy}DG7zI% z;;{E#EAP3785|Jj1se4ihbmx5D#)=OQ}R+GoMK>7QA{cp7EMZscSui29UQ`!5<-Pk z^7u{qQC8`54wi6ifQx|xxL_S*VA4R|kQZR`Z?+sn`j52B-N4DP3aQcOM~kFlb`%lg zY8tDqTe9O_&Axk9S>^*%B0 zqVNqAS00D%H<(;g0X_|6G50Utw9LwoXegbw_$B{p!GirF;^vZCDfZyA*}KF4$Sfs*-4(YyrFG* zEZH#y!e+Ih3rvLx| literal 0 HcmV?d00001 diff --git a/resources/images/icons/multi_profile@3x.png b/resources/images/icons/multi_profile@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..87e488d80c01d864b359f2e344cbb5b80b3443d8 GIT binary patch literal 1082 zcmV-A1jYM_P)*P9Tu<>ih_hs*vkm0M z-+T8kMw0KO(@8o5FfcGM@P-&c4cDy+$x|$S{Y2n-9YJj=g`i;eOTj*N~jYqK}lPK zJ6V2GX|r4nQCflPZuWZ3_lrQ;)F^!h+v!qGo#WsHs6#&U99l3$=@`f;YsiG;3mhRz zll&!l?7A~**i#TmhNnYDGKH?8Mh%{pp^_XUdo(3myA_N9x4jQ;I)jT;QtmnqjbE6t%b{m%|w7@FC z(_q2wXyuNd(`q@hqbhWrK`N|_ivcB6_m>z2^mxw{lyGOdEFcxCv~n6)ffA~Fh4Ea0 z5}|JnsR%{xK>^mMg*&3Fz;Eg9SUzj%Hj-Ldy2u<9U_FA~qBCEy3^+?sMiq3hK97yB zTk~Rf1lGnEEUYNv|`|Xso#!exfC>=uvk2Q@6zKQSG4Q1!z`)5c; z>S%n0`pkH^oz{4=;Zb*gH_#J@O7X8zb=(-ep}z_^)=XGo`rDb(i( z%Tr6!8Y_QOErV*XJm|YjAQ4{LW2bW2JCgaxF6y9!4q05I*qzmMpI07fP(nq1nx&Mo{%P@o;~9}+vN?KpKI&8OWhh$!TP3QzNfq|WqOAR zxiC~F1h9*QBi6TungaxSe;J6Lz^G2gc%I>Yd*7Sq&j<2r1E6g6-`mv^w6g_y8Z>t`XV ze!}`Zssfb{%Y%V(-J3w^ zdIq*@Y9Cb7!S2P^{CTfAaJ;)ewG0dl47@4+1J0O9I|vHok^lez07*qoM6N<$g4Y1~ AsQ>@~ literal 0 HcmV?d00001 diff --git a/resources/images/icons/notification@2x.png b/resources/images/icons/notification@2x.png old mode 100755 new mode 100644 index 3f2eeb1b69446ab37ed7fb3b5cd5648e45a85832..7a67164da359e4eb8e7a4d70deed217bd1b65907 GIT binary patch literal 689 zcmV;i0#5yjP)?(wTJjvc_E2=at7!3-yRRO->VjJtQ1m^=X+a_8A%33Baf&o?TeCWuy`xRSV= zTC9L$X+@8@+vRW7OAvN0BD{hfbCyJ|r&Y2L?66#-MLxg?)G1Ji)i1Pq7J~B8cZi2r zv7=S65WHk*ww{9}%eGd*La^yg5(Cj~Y8Q%%Am=}Sk{GxN{amAK16>xvlc~Wuy;D z0rwcoeZ121ViI(HVu4-v#yjzFB*7j=nGSP zK{o=i!-T7$KHKQ?c}O#cs3+G&dEN+x!;LY9B>(850<7<7AZd(2IFLW*z-9+s?9#YM zQWqk7983&U>+)c!?cbjIRw@o1Q)#*VV@r8s^HHbUGSGp1x}^yO2?H$^5Dn^HtA?65 sk=6azseD5mWs1P%Vu8!p*#Ca}1Zp2>Rv_jBT>t<807*qoM6N<$g7c!k-~a#s diff --git a/resources/images/icons/notification@3x.png b/resources/images/icons/notification@3x.png old mode 100755 new mode 100644 index 1b456e0bd16df33eae4b8e5af8bd165b3c358d6f..5e203a617c14cc0491cb84504bb8d2b76d5dbfc4 GIT binary patch literal 953 zcmV;q14jIbP)s9k5c4?IP?MHnxPqBVxq$WkNpv(%bg$9Gtb zI^Cd=m%U$sA9SHwY@ok zv-(~oHo?bUsh^L*0kdFkaAb6EJ@O6fc)-nr_-V-JGT{+nedj$NBRA^%2QcCxcpyH{ zI5IA9UD7S)JT?jD9+kB79r$xEJ|E&a`(VHt;eq;o5B}&nO?hk;tWO>>+R=5E4n(q8 z1s{md6U(D$9bBi($J@ws*cw!|t}b|s%64jEx;xDKI`YQfymmqbQb z*Zl@6u|!x~YX))Xx(}cd&(Tt3gf%;faGRE%Z8>)_7QwpV_zQ7Nx175ei(uWwi_Br| zp6bqrMX>BvhIBd-na)S`sHsYDW(@oc@#sNBRiC;x!jWU(b?8AvRg`N5hmC>P!RL@^ zQ#CejEI4E5M`#b}q$*q2M0gi=PMB?7Be-=tCp>K3NbrvBoG{tCX@qxa=Y+}DO$G1F z&Izlni{Bn*>^$|D7_Wp(ZOwno>BEd~8J%IhC*w#gYGj`rL zid*ZV7vemBRU-HlR$I*<(0pQm&Lvk7P^t7+*`LtWFHbt$4`-J4dXilAjUzmv_E)31?Jyd51K b9WR=Hqe~V7C-~t;00000NkvXXu0mjf8AiL} literal 626 zcmV-&0*(ENP)|}? zz!_(paqN)Lf`Jhxm|%nfT9EsJx&8uqY!>S6!IWU1f^ndVE#bWV3ubO=yQK;{HgE$C z8hS8$K$1b1HzahZgU_t-j91KK?}|w6H~y_@ghiWgCmJ#I{^3j zmQbh_dD=bQIcQcmDEC-E7rCOt1G&RDe9%*+ zh`Ipd={xhaODxA!L@+kKdzF!ntNj68Rsm%X5wTkx=eg^;y_&xlsXdRdc{G73l~4t4 zXNQ}6_;Uw6k!%RE)W{y;PXw6*x#Zhj4TlH;66D@9bH+~b1LQs{G;DiOuK)l5 M07*qoM6N<$g3$&Vr2qf` diff --git a/resources/images/icons/share@2x.ios.png b/resources/images/icons/share@2x.ios.png old mode 100755 new mode 100644 index aeb279a80fb2727ea8cedb31d95e3dee7794535b..d01e97520d8ebd1367aff813606dff445c79e849 GIT binary patch literal 580 zcmV-K0=xZ*P)X^<(}#IzUB5#qPMi?YGncMrvR}iN#U`65{;iv^n{BAAN!W7C|ki+nkc6 z1=r;?T#}^(v*a`!k`4;;b6DkY)3u5zvv3LtuFDC;mjYO6BT)CiAZabQN$$me2-f4& zJq}4LK~p(SNn=4$7Jor&&tMUXsg3IDHmE=*w*cD ziw5^BZI07-*$JlT&Cg*S^;Zr_mE!=lH`?*JsvRSK&WqnVOFQ0^s#T37SWM^?&LL?V z8Bd+0or|gfdXd#=s*sran%46#9Qb$5yyv&B;t0`&>OCb%FLLSJPP*N!go?!>wCpOO z%5Czz5m(+Li8(iPS$4swc|D|_^G$+{1vNB>Xg=1gB?XnO8C8b71yND4k9+~=_wDIz Sal7aM0000&bRt5$}F;5rAkczmwS8jG4Q4nZN)SbQ}a#!`U z`v2*&9A~E7=zR3_%T5lKKMT10lk6-uo@wMc{p6?S#6+)@8A6iFT-r1zHs$wS)QLj_4?+4c8omZ2tVU{lTuX@&I?!`@7Bj4@5W={$|NE z^ldnFeT5WX&fg$6g=@yD6@3j3KbQ~f@OEH#(U28zaI=4`zNG49MpfqYZ4cZMR-b;@ zxS0Fa?$Rh;-{{^u+Vhv`&Y#w-Q2yXT)%EJbVe{TQENbqqKQ!xwi+y14o_CGA=Y^F` g&u}idHv9Z3{$h1$r}go_1wb+2>FVdQ&MBb@06T-BjQ{`u diff --git a/resources/images/icons/share@3x.ios.png b/resources/images/icons/share@3x.ios.png old mode 100755 new mode 100644 index 122680892d3c64af1831b43637cee5d44b0d7288..75e69f7811f414255ceb3c786e07e1416873f124 GIT binary patch literal 804 zcmV+<1Ka$GP)nR@Bc;T+&g}aUy?mAw$>kMQ!bUj0=()M_KNOzqk!q!&!Od{QfbL1TZWol!1) zEXthC{F0nr$$q~tyJ5Oq{63n_?$Iv7LiO}$`Uuy{Z{J}Uj;4px#~+&c0r|ac> z0ZAIqhv^LepqELxks#aBj(ZgL8*Ecu=~^BM_{Wjj4*L|w#VafJ`#E`Y9}Q?c4pWZ! zDXk~Xi#zA=roQo!4}rp*PYQIf*|*-i`Cq;^A~BDKG#-bGs||3(?J7sR#Jtii-f?su zQv=Vcp=OX3_gR(MnwERo7t#3>3YBobk~pFeAKf+{jM1DG&)Y?zhaL@wyI<6gQywX7 iKBnmLcsw4DVg3L^N|J@U$>l8o0000}QRS-8r7=^y2-KmJ4@| zHg37w81l~H)*FXgK=Pe~R=L7d>rL5oGq3P5 z5@#1s+053&tl`x#qcELaVBYRYr+F@1^X3!yB)?F734iaVwx*sf$D7j(7V{WRYr0Zd zIeoQrtEI@5bFW{CJ^fwKxmZD5@1^b23~TMRYhE6fd-{Hv$-^_LC$+A-hn9PPN_U@? zBmZ#ewaL?y&c0o2b>z!R<3lH%CtPA>Rp)mMI@$JN3OA?Z(p2l49GPYg+~p$w9_4}m#usLv~Hgf8u`q(ZN|y_QWJcq2I~3DFj{Q3<#dl%D3>O{RBlX3OBm{Tll8%;sU$mo)YHl<&QJX__?s za)0>&IO2~Zf(qF0_bn{WxVnj=Xa|AeMG%RNu;`=oGEMI&FG%zi0>OzO5^G~|52@B{ z*rMDa(G66Dn4p2&5@mt1<~p@sK&sUsBwYwTY2>E(UOp-!h(8@- zF)1TwA*sXJM;pR^BQBR^B!-~_E}ZY)g^A<(on6fA9v5Nj+PYHa|A8vRC8Kv1-_ z`GWn96wu{YloNBwy^Vzt{&B7Zbr@Y`7Mmk*YX2=i89|!y@*d2@wzPDRrEXG`|m893PlhcAq m4Jvi~K2Qn@c!)aUf8rDPx(Y3T$Ibcx0000p2zx literal 0 HcmV?d00001 diff --git a/resources/images/icons/syncing@3x.png b/resources/images/icons/syncing@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..ab466583125f97434ca3b581faedfee6a59d9bb4 GIT binary patch literal 1084 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 literal 0 HcmV?d00001 diff --git a/src/quo2/foundations/colors.cljs b/src/quo2/foundations/colors.cljs index c7ed53e5c53..db3a545208c 100644 --- a/src/quo2/foundations/colors.cljs +++ b/src/quo2/foundations/colors.cljs @@ -121,6 +121,11 @@ (def white-opa-90 (alpha white 0.9)) (def white-opa-95 (alpha white 0.95)) +(def magenta "#EC266C") +;; with transparency +(def magenta-opa-40 (alpha magenta 0.4)) + + ;;;;Blur (def white-70-blur (alpha white 0.7)) (def white-70-blur-opaque (alpha-opaque white 0.7)) diff --git a/translations/en.json b/translations/en.json index f2c434216cf..024e8d0927c 100644 --- a/translations/en.json +++ b/translations/en.json @@ -852,6 +852,7 @@ "keycard-is-blocked-details": "You can no longer use this card to access or sign for this account. There have been too many failed passcode and PUK attempts.", "keycard-is-blocked-instructions": "To access your account you will need to factory reset your card. Tap the button below to start the procedure, you will need your mnemonic.", "language": "Language", + "language-and-currency": "Language and currency", "learn-more": "Learn more", "learn-more-about-keycard": "Learn more about Keycard", "leave": "Leave", @@ -1304,6 +1305,7 @@ "status": "Status", "status-confirmed": "Confirmed", "status-hardwallet": "Status hardwallet", + "status-help": "Status Help", "status-keycard": "Status Keycard", "status-pending": "Pending", "status-tx-not-found": "TX not found", @@ -1702,6 +1704,7 @@ "transfers-fetching-failure": "Transfers history could not be updated. Check your connection and pull down to try again", "move-and-reset": "Move and Reset", "move-keystore-file-to-keycard": "Move keystore file to keycard?", + "data-usage": "Data usage", "database-reset-title": "Database reset", "database-reset-content": "Chats, contacts and settings have been deleted. You can use your account with your Keycard", "database-reset-warning": "Database will be reset. Chats, contacts and settings will be deleted", From 3b5397d9fa36f14d9bdd21d10f425b7d9e4e5bd7 Mon Sep 17 00:00:00 2001 From: Ky Date: Wed, 4 Oct 2023 14:49:17 +0700 Subject: [PATCH 2/5] implement profile v2 --- src/status_im/ui/screens/popover/views.cljs | 10 +- .../ui/screens/profile/user/components.cljs | 63 ++++++ .../ui/screens/profile/user/list_items.cljs | 189 ++++++++++++++++++ .../ui/screens/profile/user/styles.cljs | 61 +++++- .../ui/screens/profile/user/views.cljs | 78 ++++---- .../ui/screens/profile/user/views_v2.cljs | 123 ++++++++++++ src/status_im/ui/screens/screens.cljs | 177 ++++++++-------- 7 files changed, 578 insertions(+), 123 deletions(-) create mode 100644 src/status_im/ui/screens/profile/user/components.cljs create mode 100644 src/status_im/ui/screens/profile/user/list_items.cljs create mode 100644 src/status_im/ui/screens/profile/user/views_v2.cljs diff --git a/src/status_im/ui/screens/popover/views.cljs b/src/status_im/ui/screens/popover/views.cljs index 86f60a48a57..110b3a37a33 100644 --- a/src/status_im/ui/screens/popover/views.cljs +++ b/src/status_im/ui/screens/popover/views.cljs @@ -52,10 +52,10 @@ request-close (fn [] (when-not (:prevent-closing? @current-popover) (reset! clear-timeout - (js/setTimeout - #(do (reset! current-popover nil) - (re-frame/dispatch [:hide-popover])) - 300)) + (js/setTimeout + #(do (reset! current-popover nil) + (re-frame/dispatch [:hide-popover])) + 300)) (hide-panel-anim bottom-anim-value alpha-value @@ -163,4 +163,4 @@ [] (views/letsubs [current-popover [:popover/popover] {window-height :height} [:dimensions/window]] - [popover-view current-popover window-height])) + [popover-view current-popover window-height])) diff --git a/src/status_im/ui/screens/profile/user/components.cljs b/src/status_im/ui/screens/profile/user/components.cljs new file mode 100644 index 00000000000..fd1a3b0ef1e --- /dev/null +++ b/src/status_im/ui/screens/profile/user/components.cljs @@ -0,0 +1,63 @@ +(ns status-im.ui.screens.profile.user.components + (:require [status-im.ui.components.react :as react] + [quo.components.header :as header] + [quo.core :as quo] + [status-im.ui.screens.profile.user.styles :as styles] + [status-im2.contexts.chat.messages.avatar.view :as avatar] + [status-im.multiaccounts.core :as multiaccounts])) + +(def top-background-view + [react/view + {:style styles/top-background-view}]) + +(defn button [{:keys [icon accessibility-label on-press]}] + [header/header-action + {:icon icon + :on-press on-press + :accessibility-label accessibility-label + :style styles/header-icon-style}]) + +(defn fixed-toolbar [{:keys [on-close on-switch-profile on-show-qr on-share]}] + [react/view + {:style styles/toolbar} + [button + {:icon :main-icons/close + :accessibility-label :close-header-button + :on-press on-close}] + [react/view + {:style styles/right-accessories} + [button + {:icon :main-icons/multi-profile + :accessibility-label :multi-profile-header-button + :on-press on-switch-profile}] + [button + {:icon :main-icons/qr2 + :accessibility-label :qr-header-button + :on-press on-show-qr}] + [button + {:icon :main-icons/share + :accessibility-label :share-header-button + :on-press on-share}]]]) + +(defn user-info + [{:keys [emoji-hash, account, public-key about]}] + [react/view + [react/view + {:style styles/avatar} + [avatar/avatar public-key :big]] + + [react/view + {:style styles/user-info} + [quo/text + {:weight :semi-bold + :size :xx-large + :style {:margin-top 16}} + (multiaccounts/displayed-name account)] + [quo/text + {:size :large + :style {:margin-top 8}} + about] + [quo/text + {:size :large + :style {:margin-top 8}} + emoji-hash]]]) \ No newline at end of file diff --git a/src/status_im/ui/screens/profile/user/list_items.cljs b/src/status_im/ui/screens/profile/user/list_items.cljs new file mode 100644 index 00000000000..2cfd10368c2 --- /dev/null +++ b/src/status_im/ui/screens/profile/user/list_items.cljs @@ -0,0 +1,189 @@ +(ns status-im.ui.screens.profile.user.list-items + (:require [quo.core :as quo] + [quo.design-system.colors :as colors] + [re-frame.core :as re-frame] + [status-im.ui.components.common.common :as components.common] + [status-im.ui.components.react :as react] + [status-im.ui.screens.profile.user.styles :as styles] + [utils.i18n :as i18n] + [status-im.ui.components.icons.icons :as icons] + [quo.components.text :as text] + [quo2.foundations.colors :as fcolors])) + +(def separator + [quo/separator]) + +(defn list-item + [{:keys [icon, title, title-color, accessibility-label, chevron, accessory, on-press]}] + [quo/list-item + {:icon icon + :icon-bg-color "transparent" + :icon-color (:text-03 @colors/theme) + :title title + :title-color title-color + :accessibility-label accessibility-label + :chevron chevron + :container-style {:background-color "#242D3F"} + :accessory accessory + :on-press on-press}]) + +(def personal-info-group + [react/view + {:style styles/rounded-view} + [list-item + {:icon :main-icons/edit-profile + :title (i18n/label :t/edit-profile) + :accessibility-label :edit-profile-settings-button + :chevron true + ;; TODO: No edit profile action + ;; :on-press #(re-frame/dispatch [:navigate-to :edit]) + }] + separator + [list-item + {:icon :main-icons/key-profile + :title (i18n/label :t/password) + :accessibility-label :password-settings-button + :chevron true + :on-press #(re-frame/dispatch [:navigate-to :reset-password])}]]) + +(defn activity-settings-group + [{:keys [mnemonic]}] + + [react/view + {:style styles/rounded-view} + [list-item + {:icon :main-icons/message-profile + :title (i18n/label :t/messages) + :accessibility-label :message-settings-button + :chevron true + :accessory (when mnemonic + [components.common/counter {:size 22} 1]) + ;; TODO: Chat home doesn't look great + :on-press #(re-frame/dispatch [:navigate-to :chat-home])}] + separator + [list-item + {:icon :main-icons/communities + :title (i18n/label :t/communities) + :accessibility-label :communities-settings-button + :chevron true + :accessory (when mnemonic + [components.common/counter {:size 22} 1]) + ;; TODO: Community home doesn't work correctly + ;; :on-press #(re-frame/dispatch [:navigate-to :community-home]) + }] + separator + [list-item + {:icon :main-icons/wallet-profile + :title (i18n/label :t/wallet) + :accessibility-label :wallet-settings-button + :chevron true + :accessory (when mnemonic + [components.common/counter {:size 22} 1]) + ;; TODO: Wallet screen needs back button + :on-press #(re-frame/dispatch [:navigate-to :wallet])}] + separator + [list-item + {:icon :main-icons/dapps + :title (i18n/label :t/dapps) + :accessibility-label :dapps-settings-button + :chevron true + :accessory (when mnemonic + [components.common/counter {:size 22} 1]) + :on-press #(re-frame/dispatch [:browser.ui/open-url "https://dap.ps"])}] + separator + [list-item + {:icon :main-icons/browser + :title (i18n/label :t/browser) + :accessibility-label :browser-settings-button + :chevron true + ;; TODO: Needs back button? + :on-press #(re-frame/dispatch [:navigate-to :browser])}] + separator + [list-item + {:icon :main-icons/keycard-profile + :title (i18n/label :t/keycard) + :accessibility-label :keycard-settings-button + :chevron true + :accessory (when mnemonic + [components.common/counter {:size 22} 1]) + :on-press #(re-frame/dispatch [:navigate-to :keycard-settings])}]]) + +(defn device-settings-group + [{:keys [local-pairing-mode-enabled?]}] + [react/view + {:style styles/rounded-view} + (when local-pairing-mode-enabled? + [react/view + [list-item + {:icon :main-icons/syncing + :title (i18n/label :t/syncing) + :accessibility-label :syncing-settings-button + :chevron true + :on-press #(re-frame/dispatch [:navigate-to :settings-syncing])}] + separator]) + [list-item + {:icon :main-icons/notification + :title (i18n/label :t/notifications) + :accessibility-label :notifications-settings-button + :chevron true + :on-press #(re-frame/dispatch [:navigate-to :notifications])}] + separator + [list-item + {:icon :main-icons/appearance + :title (i18n/label :t/appearance) + :accessibility-label :appearance-settings-button + :chevron true + :on-press #(re-frame/dispatch [:navigate-to :appearance])}] + separator + [list-item + {:icon :main-icons/globe + :title (i18n/label :t/language-and-currency) + :accessibility-label :language-settings-button + :chevron true + ;; TODO: No language screen + ;; :on-press #(re-frame/dispatch [:navigate-to :appearance]) + }]]) + +(def advanced-settings-group + [react/view + {:style styles/rounded-view} + [list-item + {:icon :main-icons/mobile-profile + :title (i18n/label :t/data-usage) + :accessibility-label :data-usage-settings-button + :chevron true + :on-press #(re-frame/dispatch [:navigate-to :mobile-network-settings])}] + separator + [list-item + {:icon :main-icons/settings + :title (i18n/label :t/advanced) + :accessibility-label :advanced-settings-button + :chevron true + :on-press #(re-frame/dispatch [:navigate-to :advanced-settings])}]]) + +(def about-help-group + [react/view + {:style styles/rounded-view} + [list-item + {:title (i18n/label :t/about-app) + :accessibility-label :about-button + :chevron true + :on-press #(re-frame/dispatch [:navigate-to :about-app])}] + separator + [list-item + {:title (i18n/label :t/status-help) + :accessibility-label :help-button + :chevron true + :on-press #(re-frame/dispatch [:navigate-to :help-center])}]]) + +(def logout-item + [react/view + {:style styles/logout-container + :on-press + #(re-frame/dispatch [:multiaccounts.logout.ui/logout-pressed]) + :accessibility-label :log-out-button} + [icons/icon :main-icons/log-out {:color fcolors/danger-60}] + [text/text + {:style {:color fcolors/danger-60 + :margin-left 8}} + (i18n/label :t/logout)]]) diff --git a/src/status_im/ui/screens/profile/user/styles.cljs b/src/status_im/ui/screens/profile/user/styles.cljs index 5baa83e71f6..a1197cc80e6 100644 --- a/src/status_im/ui/screens/profile/user/styles.cljs +++ b/src/status_im/ui/screens/profile/user/styles.cljs @@ -1,6 +1,65 @@ -(ns status-im.ui.screens.profile.user.styles) +(ns status-im.ui.screens.profile.user.styles + (:require [quo2.foundations.colors :as colors] + [react-native.safe-area :as safe-area])) (def share-link-button {:margin-top 12 :margin-horizontal 16 :margin-bottom 16}) + +(def radius 16) + +(def top-background-view {:background-color colors/magenta-opa-40 + :position :absolute + :top 0 + :left 0 + :height 400 + :width 400 + :z-index -1}) + +(def toolbar {:padding-bottom 16 + :padding-top (safe-area/get-top) + :flex-direction :row + :align-items :center + :justify-content :space-between}) + +(def header-icon-style {:border-radius 10 + :margin-left 16 + :background-color colors/white-opa-10}) + +(def right-accessories {:flex-direction :row + :align-items :center + :justify-content :space-between + :margin-right 16}) + +(def avatar {:margin-top 16 + :margin-horizontal 16 + :z-index 100}) + +(def user-info {:background-color colors/neutral-95 + :padding-horizontal 16 + :border-top-left-radius 20 + :border-top-right-radius 20 + :margin-top -32 + :padding-top 32 + :padding-bottom 16}) + +(def container-style {:background-color colors/neutral-95}) + +(def items-container {:background-color colors/neutral-95}) + +(def rounded-view {:margin-top 16 + :margin-horizontal 16 + :overflow "hidden" + :border-radius radius}) + +(def logout-container {:align-items :center + :justify-content :center + :flex-direction :row + :height 54 + :margin-horizontal 16 + :margin-top 16 + :overflow "hidden" + :border-radius radius + :background-color colors/danger-50-opa-20}) + diff --git a/src/status_im/ui/screens/profile/user/views.cljs b/src/status_im/ui/screens/profile/user/views.cljs index 45c06d1832b..e0c5f298728 100644 --- a/src/status_im/ui/screens/profile/user/views.cljs +++ b/src/status_im/ui/screens/profile/user/views.cljs @@ -28,45 +28,45 @@ [] (views/letsubs [{:keys [address ens-name]} [:popover/popover] width (reagent/atom nil)] - (let [link (universal-links/generate-link :user :external (or ens-name address))] - [react/view {:on-layout #(reset! width (-> ^js % .-nativeEvent .-layout .-width))} - [react/view {:style {:padding-top 16 :padding-horizontal 16}} - (when @width - [qr-code-viewer/qr-code-view (- @width 32) address]) - (when ens-name - [react/view - [copyable-text/copyable-text-view - {:label :t/ens-username - :container-style {:margin-top 12 :margin-bottom 4} - :copied-text ens-name} - [quo/text - {:monospace true - :accessibility-label :ens-username} - ens-name]] - [react/view - {:height 1 - :margin-top 12 - :margin-horizontal -16 - :background-color colors/gray-lighter}]]) - [copyable-text/copyable-text-view - {:label :t/chat-key - :container-style {:margin-top 12 :margin-bottom 4} - :copied-text address} - [quo/text - {:number-of-lines 1 - :ellipsize-mode :middle - :accessibility-label :chat-key - :monospace true} - address]]] - [react/view styles/share-link-button - [quo/button - {:on-press (fn [] - (re-frame/dispatch [:hide-popover]) - (js/setTimeout - #(list-selection/open-share {:message link}) - 250)) - :accessibility-label :share-my-contact-code-button} - (i18n/label :t/share-link)]]]))) + (let [link (universal-links/generate-link :user :external (or ens-name address))] + [react/view {:on-layout #(reset! width (-> ^js % .-nativeEvent .-layout .-width))} + [react/view {:style {:padding-top 16 :padding-horizontal 16}} + (when @width + [qr-code-viewer/qr-code-view (- @width 32) address]) + (when ens-name + [react/view + [copyable-text/copyable-text-view + {:label :t/ens-username + :container-style {:margin-top 12 :margin-bottom 4} + :copied-text ens-name} + [quo/text + {:monospace true + :accessibility-label :ens-username} + ens-name]] + [react/view + {:height 1 + :margin-top 12 + :margin-horizontal -16 + :background-color colors/gray-lighter}]]) + [copyable-text/copyable-text-view + {:label :t/chat-key + :container-style {:margin-top 12 :margin-bottom 4} + :copied-text address} + [quo/text + {:number-of-lines 1 + :ellipsize-mode :middle + :accessibility-label :chat-key + :monospace true} + address]]] + [react/view styles/share-link-button + [quo/button + {:on-press (fn [] + (re-frame/dispatch [:hide-popover]) + (js/setTimeout + #(list-selection/open-share {:message link}) + 250)) + :accessibility-label :share-my-contact-code-button} + (i18n/label :t/share-link)]]]))) (defn content [] diff --git a/src/status_im/ui/screens/profile/user/views_v2.cljs b/src/status_im/ui/screens/profile/user/views_v2.cljs new file mode 100644 index 00000000000..a44c7037675 --- /dev/null +++ b/src/status_im/ui/screens/profile/user/views_v2.cljs @@ -0,0 +1,123 @@ +(ns status-im.ui.screens.profile.user.views-v2 + (:require [clojure.string :as string] + [quo.core :as quo] + [quo.design-system.colors :as colors] + [re-frame.core :as re-frame] + [reagent.core :as reagent] + [status-im.ui.components.copyable-text :as copyable-text] + [status-im.ui.components.list-selection :as list-selection] + [status-im.ui.components.react :as react] + [status-im.ui.screens.profile.user.components :as components] + [status-im.ui.screens.profile.user.list-items :as profile-list-item] + [status-im.ui.screens.profile.user.styles :as styles] + [status-im.utils.universal-links.utils :as universal-links] + [status-im2.common.qr-code-viewer.view :as qr-code-viewer] + [status-im2.config :as config] + [utils.i18n :as i18n]) + (:require-macros [status-im.utils.views :as views])) + + +(views/defview share-chat-key + [] + (views/letsubs [{:keys [address ens-name]} [:popover/popover] + width (reagent/atom nil)] + (let [link (universal-links/generate-link :user :external (or ens-name address))] + [react/view {:on-layout #(reset! width (-> ^js % .-nativeEvent .-layout .-width))} + [react/view {:style {:padding-top 16 :padding-horizontal 16}} + (when @width + [qr-code-viewer/qr-code-view (- @width 32) address]) + (when ens-name + [react/view + [copyable-text/copyable-text-view + {:label :t/ens-username + :container-style {:margin-top 12 :margin-bottom 4} + :copied-text ens-name} + [quo/text + {:monospace true + :accessibility-label :ens-username} + ens-name]] + [react/view + {:height 1 + :margin-top 12 + :margin-horizontal -16 + :background-color colors/gray-lighter}]]) + [copyable-text/copyable-text-view + {:label :t/chat-key + :container-style {:margin-top 12 :margin-bottom 4} + :copied-text address} + [quo/text + {:number-of-lines 1 + :ellipsize-mode :middle + :accessibility-label :chat-key + :monospace true} + address]]] + [react/view styles/share-link-button + [quo/button + {:on-press (fn [] + (re-frame/dispatch [:hide-popover]) + (js/setTimeout + #(list-selection/open-share {:message link}) + 250)) + :accessibility-label :share-my-contact-code-button} + (i18n/label :t/share-link)]]]))) + +(defn items + [{:keys [mnemonic]}] + [react/view + {:style styles/items-container} + + profile-list-item/personal-info-group + + [profile-list-item/activity-settings-group + {:mnemonic mnemonic}] + + [profile-list-item/device-settings-group + {:local-pairing-mode-enabled? config/local-pairing-mode-enabled?}] + + profile-list-item/advanced-settings-group + + profile-list-item/about-help-group + + profile-list-item/logout-item]) + +(defn my-profile + [] + (fn [] + (let [{:keys [public-key + compressed-key + ens-verified + emoji-hash + mnemonic + ens-name address + key-uid] + :as account} + @(re-frame/subscribe [:profile/multiaccount]) + customization-color (or (:color @(re-frame/subscribe [:onboarding-2/profile])) + @(re-frame/subscribe [:profile/customization-color key-uid])) + on-share #(re-frame/dispatch [:navigate-to :share-view]) + has-picture @(re-frame/subscribe [:profile/has-picture]) + link (universal-links/generate-link :user :external (or ens-name address))] + + [react/view {:flex 1 :style styles/container-style} + + components/top-background-view + + [components/fixed-toolbar + {:on-share #(list-selection/open-share {:message link}) + :on-close #(re-frame/dispatch [:navigate-back]) + ;; TODO: No action for switch account + :on-switch-profile nil + :on-show-qr on-share}] + + [react/scroll-view + [components/user-info + {:on-share on-share + :has-picture has-picture + :customization-color customization-color + :account account + :emoji-hash (string/join emoji-hash) + :ens-verified ens-verified + :public-key public-key + :compressed-key compressed-key}] + [items + {:mnemonic mnemonic}]]]))) diff --git a/src/status_im/ui/screens/screens.cljs b/src/status_im/ui/screens/screens.cljs index 82be0f7398f..e23f899f301 100644 --- a/src/status_im/ui/screens/screens.cljs +++ b/src/status_im/ui/screens/screens.cljs @@ -1,80 +1,84 @@ (ns status-im.ui.screens.screens (:require - [quo.design-system.colors :as colors] - [utils.i18n :as i18n] - [status-im.ui.components.icons.icons :as icons] - [status-im.ui.screens.about-app.views :as about-app] - [status-im.ui.screens.advanced-settings.views :as advanced-settings] - [status-im.ui.screens.appearance.views :as appearance] - [status-im.ui.screens.backup-settings.view :as backup-settings] - [status-im.ui.screens.bootnodes-settings.edit-bootnode.views :as edit-bootnode] - [status-im.ui.screens.bootnodes-settings.views :as bootnodes-settings] - [status-im.ui.screens.browser.bookmarks.views :as bookmarks] - [status-im.ui.screens.bug-report :as bug-report] - [status-im.ui.screens.communities.create :as communities.create] - [status-im.ui.screens.communities.import :as communities.import] - [status-im.ui.screens.communities.invite :as communities.invite] - [status-im.ui.screens.communities.members :as members] - [status-im.ui.screens.communities.membership :as membership] - [status-im.ui.screens.contacts-list.views :as contacts-list] - [status-im.ui.screens.currency-settings.views :as currency-settings] - [status-im.ui.screens.dapps-permissions.views :as dapps-permissions] - [status-im.ui.screens.default-sync-period-settings.view :as default-sync-period-settings] - [status-im.ui.screens.ens.views :as ens] - [status-im.ui.screens.fleet-settings.views :as fleet-settings] - [status-im.ui.screens.glossary.view :as glossary] - [status-im.ui.screens.group.views :as group-chat] - [status-im.ui.screens.help-center.views :as help-center] - [status-im.ui.screens.keycard.authentication-method.views :as keycard.authentication] - [status-im.ui.screens.keycard.onboarding.views :as keycard.onboarding] - [status-im.ui.screens.keycard.pairing.views :as keycard.pairing] - [status-im.ui.screens.keycard.pin.views :as keycard.pin] - [status-im.ui.screens.keycard.recovery.views :as keycard.recovery] - [status-im.ui.screens.keycard.settings.views :as keycard.settings] - [status-im.ui.screens.keycard.views :as keycard] - [status-im.ui.screens.link-previews-settings.views :as link-previews-settings] - [status-im.ui.screens.log-level-settings.views :as log-level-settings] - [status-im.ui.screens.mobile-network-settings.view :as mobile-network-settings] - [status-im.ui.screens.network-info.views :as network-info] - [status-im.ui.screens.network.edit-network.views :as edit-network] - [status-im.ui.screens.network.network-details.views :as network-details] - [status-im.ui.screens.network.views :as network] - [status-im.ui.screens.notifications-settings.views :as notifications-settings] - [status-im.ui.screens.offline-messaging-settings.edit-mailserver.views :as edit-mailserver] - [status-im.ui.screens.offline-messaging-settings.views :as offline-messaging-settings] - [status-im.ui.screens.pairing.views :as pairing] - [status-im.ui.screens.peers-stats :as peers-stats] - [status-im.ui.screens.privacy-and-security-settings.delete-profile :as delete-profile] - [status-im.ui.screens.privacy-and-security-settings.messages-from-contacts-only :as - messages-from-contacts-only] - [status-im.ui.screens.privacy-and-security-settings.views :as privacy-and-security] - [status-im.ui.screens.profile.contact.views :as contact] - [status-im.ui.screens.profile.group-chat.views :as profile.group-chat] - [status-im.ui.screens.profile.seed.views :as profile.seed] - [status-im.ui.screens.profile.user.views :as profile.user] - [status-im.ui.screens.progress.views :as progress] - [status-im.ui.screens.qr-scanner.views :as qr-scanner] - [status-im.ui.screens.reset-password.views :as reset-password] - [status-im.ui.screens.rpc-usage-info :as rpc-usage-info] - [status-im.ui.screens.stickers.views :as stickers] - [status-im.ui.screens.sync-settings.views :as sync-settings] - [status-im.ui.screens.wakuv2-settings.edit-node.views :as edit-wakuv2-node] - [status-im.ui.screens.wakuv2-settings.views :as wakuv2-settings] - [status-im.ui.screens.wallet.account-settings.views :as account-settings] - [status-im.ui.screens.wallet.account.views :as wallet.account] - [status-im.ui.screens.wallet.accounts-manage.views :as accounts-manage] - [status-im.ui.screens.wallet.accounts.views :as wallet.accounts] - [status-im.ui.screens.wallet.add-new.views :as add-account] - [status-im.ui.screens.wallet.buy-crypto.views :as wallet.buy-crypto] - [status-im.ui.screens.wallet.collectibles.views :as wallet.collectibles] - [status-im.ui.screens.wallet.custom-tokens.views :as custom-tokens] - [status-im.ui.screens.wallet.manage-connections.views :as manage-all-connections] - [status-im.ui.screens.wallet.recipient.views :as recipient] - [status-im.ui.screens.wallet.send.views :as wallet.send] - [status-im.ui.screens.wallet.settings.views :as wallet-settings] - [status-im.ui.screens.wallet.swap.views :as wallet.swap] - [status-im.ui.screens.wallet.transactions.views :as wallet-transactions] - [status-im2.contexts.chat.group-details.view :as group-details])) + [quo.design-system.colors :as colors] + [utils.i18n :as i18n] + [status-im.ui.components.icons.icons :as icons] + [status-im.ui.screens.about-app.views :as about-app] + [status-im.ui.screens.advanced-settings.views :as advanced-settings] + [status-im.ui.screens.appearance.views :as appearance] + [status-im.ui.screens.backup-settings.view :as backup-settings] + [status-im.ui.screens.bootnodes-settings.edit-bootnode.views :as edit-bootnode] + [status-im.ui.screens.bootnodes-settings.views :as bootnodes-settings] + [status-im.ui.screens.browser.bookmarks.views :as bookmarks] + [status-im.ui.screens.bug-report :as bug-report] + [status-im.ui.screens.communities.create :as communities.create] + [status-im.ui.screens.communities.import :as communities.import] + [status-im.ui.screens.communities.invite :as communities.invite] + [status-im.ui.screens.communities.members :as members] + [status-im.ui.screens.communities.membership :as membership] + [status-im.ui.screens.contacts-list.views :as contacts-list] + [status-im.ui.screens.currency-settings.views :as currency-settings] + [status-im.ui.screens.dapps-permissions.views :as dapps-permissions] + [status-im.ui.screens.default-sync-period-settings.view :as default-sync-period-settings] + [status-im.ui.screens.ens.views :as ens] + [status-im.ui.screens.fleet-settings.views :as fleet-settings] + [status-im.ui.screens.glossary.view :as glossary] + [status-im.ui.screens.group.views :as group-chat] + [status-im.ui.screens.help-center.views :as help-center] + [status-im.ui.screens.keycard.authentication-method.views :as keycard.authentication] + [status-im.ui.screens.keycard.onboarding.views :as keycard.onboarding] + [status-im.ui.screens.keycard.pairing.views :as keycard.pairing] + [status-im.ui.screens.keycard.pin.views :as keycard.pin] + [status-im.ui.screens.keycard.recovery.views :as keycard.recovery] + [status-im.ui.screens.keycard.settings.views :as keycard.settings] + [status-im.ui.screens.keycard.views :as keycard] + [status-im.ui.screens.link-previews-settings.views :as link-previews-settings] + [status-im.ui.screens.log-level-settings.views :as log-level-settings] + [status-im.ui.screens.mobile-network-settings.view :as mobile-network-settings] + [status-im.ui.screens.network-info.views :as network-info] + [status-im.ui.screens.network.edit-network.views :as edit-network] + [status-im.ui.screens.network.network-details.views :as network-details] + [status-im.ui.screens.network.views :as network] + [status-im.ui.screens.notifications-settings.views :as notifications-settings] + [status-im.ui.screens.offline-messaging-settings.edit-mailserver.views :as edit-mailserver] + [status-im.ui.screens.offline-messaging-settings.views :as offline-messaging-settings] + [status-im.ui.screens.pairing.views :as pairing] + [status-im.ui.screens.peers-stats :as peers-stats] + [status-im.ui.screens.privacy-and-security-settings.delete-profile :as delete-profile] + [status-im.ui.screens.privacy-and-security-settings.messages-from-contacts-only :as + messages-from-contacts-only] + [status-im.ui.screens.privacy-and-security-settings.views :as privacy-and-security] + [status-im.ui.screens.profile.contact.views :as contact] + [status-im.ui.screens.profile.group-chat.views :as profile.group-chat] + [status-im.ui.screens.profile.seed.views :as profile.seed] + [status-im.ui.screens.profile.user.views-v2 :as profile.user] + [status-im.ui.screens.progress.views :as progress] + [status-im.ui.screens.qr-scanner.views :as qr-scanner] + [status-im.ui.screens.reset-password.views :as reset-password] + [status-im.ui.screens.rpc-usage-info :as rpc-usage-info] + [status-im.ui.screens.stickers.views :as stickers] + [status-im.ui.screens.sync-settings.views :as sync-settings] + [status-im.ui.screens.wakuv2-settings.edit-node.views :as edit-wakuv2-node] + [status-im.ui.screens.wakuv2-settings.views :as wakuv2-settings] + [status-im.ui.screens.wallet.account-settings.views :as account-settings] + [status-im.ui.screens.wallet.account.views :as wallet.account] + [status-im.ui.screens.wallet.accounts-manage.views :as accounts-manage] + [status-im.ui.screens.wallet.accounts.views :as wallet.accounts] + [status-im.ui.screens.wallet.add-new.views :as add-account] + [status-im.ui.screens.wallet.buy-crypto.views :as wallet.buy-crypto] + [status-im.ui.screens.wallet.collectibles.views :as wallet.collectibles] + [status-im.ui.screens.wallet.custom-tokens.views :as custom-tokens] + [status-im.ui.screens.wallet.manage-connections.views :as manage-all-connections] + [status-im.ui.screens.wallet.recipient.views :as recipient] + [status-im.ui.screens.wallet.send.views :as wallet.send] + [status-im.ui.screens.wallet.settings.views :as wallet-settings] + [status-im.ui.screens.wallet.swap.views :as wallet.swap] + [status-im.ui.screens.wallet.transactions.views :as wallet-transactions] + [status-im2.contexts.chat.group-details.view :as group-details] + [status-im2.contexts.chat.home.view :as chat-home] + [status-im2.contexts.communities.home.view :as communities-home] + [status-im2.contexts.shell.share.view :as share-view] + [status-im.ui.screens.browser.stack :as browser])) (defn right-button-options [id icon] @@ -110,7 +114,11 @@ :component stickers/pack} ;; Community (legacy only for e2e needed) - + {:name :community-home + :options {:topBar {:title {:text (i18n/label :t/import-community-title)}} + :insets {:top? true + :bottom? true}} + :component communities-home/view} {:name :community-members ;;TODO custom subtitle :options {:insets {:top? true}} @@ -425,6 +433,11 @@ :top? true}} :component contact/nickname-view} + {:name :chat-home + :options {:topBar {:title {:text (i18n/label :t/chat)}} + :insets {:top? true}} + :component chat-home/view} + ;[Group chat] Add participants {:name :add-participants-toggle-list :on-focus [:group/add-participants-toggle-list] @@ -530,6 +543,11 @@ :options {:insets {:bottom? true :top? true}} :component bookmarks/new-bookmark} + {:name :browser + ;;TODO dynamic title + :options {:insets {:bottom? false + :top? false}} + :component browser/browser-stack} ;Profile {:name :profile @@ -661,13 +679,16 @@ {:name :change-pairing-code :insets {:bottom? true} :component keycard.pairing/change-pairing-code} - {:name :show-all-connections :options {:topBar {:title {:text (i18n/label :all-connections)}} :insets {:bottom? true :top? true}} :component manage-all-connections/views} - + {:name :share-view + :options {:topBar {:title {:text (i18n/label :t/share-link)}} + :insets {:bottom? false + :top? false}} + :component share-view/view} ;; BUG REPORT {:name :bug-report :options {:insets {:top? true}} From 7e50f4f583d31b575373d18d9758fb7c846897df Mon Sep 17 00:00:00 2001 From: Ky Date: Wed, 4 Oct 2023 18:43:22 +0700 Subject: [PATCH 3/5] customize the spacing to match the design --- src/quo/components/header.cljs | 5 +- src/quo/components/list/item.cljs | 20 ++- src/quo2/foundations/colors.cljs | 2 +- src/status_im/ui/screens/popover/views.cljs | 12 +- .../ui/screens/profile/user/components.cljs | 42 +++-- .../ui/screens/profile/user/list_items.cljs | 38 ++-- .../ui/screens/profile/user/styles.cljs | 101 ++++++----- .../ui/screens/profile/user/views.cljs | 78 ++++----- .../ui/screens/profile/user/views_v2.cljs | 102 +++++------ src/status_im/ui/screens/screens.cljs | 163 +++++++++--------- 10 files changed, 297 insertions(+), 266 deletions(-) diff --git a/src/quo/components/header.cljs b/src/quo/components/header.cljs index 9be8106cf66..782e933b3e3 100644 --- a/src/quo/components/header.cljs +++ b/src/quo/components/header.cljs @@ -80,7 +80,7 @@ :flex 1}) (defn header-action - [{:keys [icon label on-press disabled accessibility-label]}] + [{:keys [icon label on-press disabled accessibility-label style]}] [button/button (merge {:on-press on-press :disabled disabled} @@ -89,7 +89,8 @@ :theme :icon} label {:type :secondary}) (when accessibility-label - {:accessibility-label accessibility-label})) + {:accessibility-label accessibility-label}) + {:style style}) (cond icon icon label label)]) diff --git a/src/quo/components/list/item.cljs b/src/quo/components/list/item.cljs index 63160a2fb77..5da13aa0d7c 100644 --- a/src/quo/components/list/item.cljs +++ b/src/quo/components/list/item.cljs @@ -43,13 +43,13 @@ [size] (case size :small 36 - 40)) + (min size 40))) (defn size->container-size [size] (case size :small 52 - 64)) + (min size 64))) (defn size->single-title-size [size] @@ -70,29 +70,31 @@ children)) (defn icon-column - [{:keys [icon icon-bg-color icon-color size icon-container-style]}] + [{:keys [icon icon-bg-color icon-color icon-size icon-container-style]}] (when icon - (let [icon-size (size->icon-size size)] + (let [_icon-size (size->icon-size icon-size)] [rn/view {:style (or icon-container-style (:tiny spacing/padding-horizontal))} (cond (vector? icon) icon (keyword? icon) [rn/view - {:style {:width icon-size - :height icon-size + {:style {:width _icon-size + :height _icon-size :align-items :center :justify-content :center - :border-radius (/ icon-size 2) + :border-radius (/ _icon-size 2) :background-color icon-bg-color}} [icons/icon icon {:color icon-color}]])]))) (defn title-column [{:keys [title text-color subtitle subtitle-max-lines subtitle-secondary title-accessibility-label size text-size title-text-weight + title-style right-side-present?]}] [rn/view {:style (merge (:tiny spacing/padding-horizontal) + title-style ;; make left-side title grow if nothing is present on right-side (when-not right-side-present? {:flex 1 @@ -215,8 +217,10 @@ (defn list-item [{:keys [theme accessory disabled subtitle-max-lines icon icon-container-style + icon-size left-side-alignment icon-color icon-bg-color title subtitle subtitle-secondary active on-press on-long-press chevron size text-size + title-style accessory-text accessibility-label title-accessibility-label accessory-style haptic-feedback haptic-type error animated animated-accessory? title-text-weight container-style @@ -267,10 +271,12 @@ [container {:size size :container-style container-style} [left-side {:icon-color icon-color + :icon-size icon-size :text-color (if on-press text-color (:text-color (themes :main))) :left-side-alignment left-side-alignment + :title-style title-style :icon-bg-color icon-bg-color :title-accessibility-label title-accessibility-label :icon icon diff --git a/src/quo2/foundations/colors.cljs b/src/quo2/foundations/colors.cljs index db3a545208c..d5b8c2bafc1 100644 --- a/src/quo2/foundations/colors.cljs +++ b/src/quo2/foundations/colors.cljs @@ -123,7 +123,7 @@ (def magenta "#EC266C") ;; with transparency -(def magenta-opa-40 (alpha magenta 0.4)) +(def magenta-opa-40 (alpha "#EC266C" 0.4)) ;;;;Blur diff --git a/src/status_im/ui/screens/popover/views.cljs b/src/status_im/ui/screens/popover/views.cljs index 110b3a37a33..d2670a0ac36 100644 --- a/src/status_im/ui/screens/popover/views.cljs +++ b/src/status_im/ui/screens/popover/views.cljs @@ -8,7 +8,7 @@ [status-im.ui.components.react :as react] [status-im.ui.screens.keycard.frozen-card.view :as frozen-card] [status-im.ui.screens.keycard.views :as keycard.views] - [status-im.ui.screens.profile.user.views :as profile.user] + [status-im.ui.screens.profile.user.views-v2 :as profile.user] [status-im.ui.screens.reset-password.views :as reset-password.views] [status-im.ui.screens.signing.sheets :as signing-sheets] [status-im.ui.screens.signing.views :as signing] @@ -52,10 +52,10 @@ request-close (fn [] (when-not (:prevent-closing? @current-popover) (reset! clear-timeout - (js/setTimeout - #(do (reset! current-popover nil) - (re-frame/dispatch [:hide-popover])) - 300)) + (js/setTimeout + #(do (reset! current-popover nil) + (re-frame/dispatch [:hide-popover])) + 300)) (hide-panel-anim bottom-anim-value alpha-value @@ -163,4 +163,4 @@ [] (views/letsubs [current-popover [:popover/popover] {window-height :height} [:dimensions/window]] - [popover-view current-popover window-height])) + [popover-view current-popover window-height])) diff --git a/src/status_im/ui/screens/profile/user/components.cljs b/src/status_im/ui/screens/profile/user/components.cljs index fd1a3b0ef1e..68e09c2f6a7 100644 --- a/src/status_im/ui/screens/profile/user/components.cljs +++ b/src/status_im/ui/screens/profile/user/components.cljs @@ -10,37 +10,41 @@ [react/view {:style styles/top-background-view}]) -(defn button [{:keys [icon accessibility-label on-press]}] +(defn button + [{:keys [icon accessibility-label on-press style]}] [header/header-action - {:icon icon - :on-press on-press + {:icon icon + :on-press on-press :accessibility-label accessibility-label - :style styles/header-icon-style}]) + :style (merge styles/header-icon-style style)}]) -(defn fixed-toolbar [{:keys [on-close on-switch-profile on-show-qr on-share]}] +(defn fixed-toolbar + [{:keys [on-close on-switch-profile on-show-qr on-share]}] [react/view {:style styles/toolbar} [button - {:icon :main-icons/close + {:icon :main-icons/close :accessibility-label :close-header-button - :on-press on-close}] + :on-press on-close + :style {:margin-left 20}}] [react/view {:style styles/right-accessories} [button - {:icon :main-icons/multi-profile + {:icon :main-icons/multi-profile :accessibility-label :multi-profile-header-button - :on-press on-switch-profile}] + :on-press on-switch-profile}] [button - {:icon :main-icons/qr2 + {:icon :main-icons/qr2 :accessibility-label :qr-header-button - :on-press on-show-qr}] + :on-press on-show-qr + :style {:margin-left 14}}] [button - {:icon :main-icons/share + {:icon :main-icons/share :accessibility-label :share-header-button - :on-press on-share}]]]) + :on-press on-share}]]]) (defn user-info - [{:keys [emoji-hash, account, public-key about]}] + [{:keys [emoji-hash account public-key about]}] [react/view [react/view {:style styles/avatar} @@ -50,14 +54,14 @@ {:style styles/user-info} [quo/text {:weight :semi-bold - :size :xx-large - :style {:margin-top 16}} + :size :xx-large + :style {:margin-top 16}} (multiaccounts/displayed-name account)] [quo/text - {:size :large + {:size :large :style {:margin-top 8}} about] [quo/text - {:size :large + {:size :large :style {:margin-top 8}} - emoji-hash]]]) \ No newline at end of file + emoji-hash]]]) diff --git a/src/status_im/ui/screens/profile/user/list_items.cljs b/src/status_im/ui/screens/profile/user/list_items.cljs index 2cfd10368c2..11c2b2ca812 100644 --- a/src/status_im/ui/screens/profile/user/list_items.cljs +++ b/src/status_im/ui/screens/profile/user/list_items.cljs @@ -14,16 +14,19 @@ [quo/separator]) (defn list-item - [{:keys [icon, title, title-color, accessibility-label, chevron, accessory, on-press]}] + [{:keys [icon title title-color accessibility-label chevron accessory on-press title-style]}] [quo/list-item {:icon icon :icon-bg-color "transparent" + :icon-size 32 :icon-color (:text-03 @colors/theme) :title title :title-color title-color + :title-style (merge {:padding-horizontal 0} title-style) :accessibility-label accessibility-label :chevron chevron - :container-style {:background-color "#242D3F"} + :size 50 + :container-style styles/list-item-container :accessory accessory :on-press on-press}]) @@ -35,9 +38,9 @@ :title (i18n/label :t/edit-profile) :accessibility-label :edit-profile-settings-button :chevron true - ;; TODO: No edit profile action - ;; :on-press #(re-frame/dispatch [:navigate-to :edit]) - }] + ;; TODO: No edit profile action + ;; :on-press #(re-frame/dispatch [:navigate-to :edit]) + }] separator [list-item {:icon :main-icons/key-profile @@ -58,7 +61,7 @@ :chevron true :accessory (when mnemonic [components.common/counter {:size 22} 1]) - ;; TODO: Chat home doesn't look great + ;; TODO: Chat home doesn't look great :on-press #(re-frame/dispatch [:navigate-to :chat-home])}] separator [list-item @@ -68,9 +71,9 @@ :chevron true :accessory (when mnemonic [components.common/counter {:size 22} 1]) - ;; TODO: Community home doesn't work correctly - ;; :on-press #(re-frame/dispatch [:navigate-to :community-home]) - }] + ;; TODO: Community home doesn't work correctly + ;; :on-press #(re-frame/dispatch [:navigate-to :community-home]) + }] separator [list-item {:icon :main-icons/wallet-profile @@ -79,7 +82,7 @@ :chevron true :accessory (when mnemonic [components.common/counter {:size 22} 1]) - ;; TODO: Wallet screen needs back button + ;; TODO: Wallet screen needs back button :on-press #(re-frame/dispatch [:navigate-to :wallet])}] separator [list-item @@ -96,7 +99,7 @@ :title (i18n/label :t/browser) :accessibility-label :browser-settings-button :chevron true - ;; TODO: Needs back button? + ;; TODO: Needs back button? :on-press #(re-frame/dispatch [:navigate-to :browser])}] separator [list-item @@ -140,9 +143,9 @@ :title (i18n/label :t/language-and-currency) :accessibility-label :language-settings-button :chevron true - ;; TODO: No language screen - ;; :on-press #(re-frame/dispatch [:navigate-to :appearance]) - }]]) + ;; TODO: No language screen + ;; :on-press #(re-frame/dispatch [:navigate-to :appearance]) + }]]) (def advanced-settings-group [react/view @@ -168,12 +171,15 @@ {:title (i18n/label :t/about-app) :accessibility-label :about-button :chevron true + :title-style {:margin-horizontal 16} :on-press #(re-frame/dispatch [:navigate-to :about-app])}] separator [list-item {:title (i18n/label :t/status-help) :accessibility-label :help-button - :chevron true + :chevron false + :accessory [icons/icon :main-icons/external {:color colors/gray}] + :title-style {:margin-horizontal 16} :on-press #(re-frame/dispatch [:navigate-to :help-center])}]]) (def logout-item @@ -184,6 +190,6 @@ :accessibility-label :log-out-button} [icons/icon :main-icons/log-out {:color fcolors/danger-60}] [text/text - {:style {:color fcolors/danger-60 + {:style {:color fcolors/danger-60 :margin-left 8}} (i18n/label :t/logout)]]) diff --git a/src/status_im/ui/screens/profile/user/styles.cljs b/src/status_im/ui/screens/profile/user/styles.cljs index a1197cc80e6..a903a1b790a 100644 --- a/src/status_im/ui/screens/profile/user/styles.cljs +++ b/src/status_im/ui/screens/profile/user/styles.cljs @@ -9,57 +9,72 @@ (def radius 16) -(def top-background-view {:background-color colors/magenta-opa-40 - :position :absolute - :top 0 - :left 0 - :height 400 - :width 400 - :z-index -1}) +(def top-background-view + {:background-color colors/magenta-opa-40 + :position :absolute + :top 0 + :left 0 + :height 400 + :width 400 + :z-index -1}) -(def toolbar {:padding-bottom 16 - :padding-top (safe-area/get-top) - :flex-direction :row - :align-items :center - :justify-content :space-between}) +(def toolbar + {:padding-bottom 16 + :padding-top (safe-area/get-top) + :flex-direction :row + :align-items :center + :justify-content :space-between}) -(def header-icon-style {:border-radius 10 - :margin-left 16 - :background-color colors/white-opa-10}) +(def header-icon-style + {:border-radius 10 + :margin-left 16 + :width 32 + :height 32 + :background-color colors/white-opa-10}) -(def right-accessories {:flex-direction :row - :align-items :center - :justify-content :space-between - :margin-right 16}) +(def right-accessories + {:flex-direction :row + :align-items :center + :justify-content :space-between + :margin-right 20}) -(def avatar {:margin-top 16 - :margin-horizontal 16 - :z-index 100}) +(def avatar + {:margin-top 8 + :margin-horizontal 24 + :z-index 100}) -(def user-info {:background-color colors/neutral-95 - :padding-horizontal 16 - :border-top-left-radius 20 - :border-top-right-radius 20 - :margin-top -32 - :padding-top 32 - :padding-bottom 16}) +(def user-info + {:background-color colors/neutral-95 + :padding-horizontal 16 + :border-top-left-radius 20 + :border-top-right-radius 20 + :margin-top -38 + :padding-top 38 + :padding-bottom 16}) (def container-style {:background-color colors/neutral-95}) -(def items-container {:background-color colors/neutral-95}) +(def rounded-view + {:margin-top 16 + :margin-horizontal 20 + :overflow "hidden" + :border-radius radius}) -(def rounded-view {:margin-top 16 - :margin-horizontal 16 - :overflow "hidden" - :border-radius radius}) +(def list-item-container + {:background-color "#242D3F" + :padding-left -12 + :padding-right 6 + :height 50}) -(def logout-container {:align-items :center - :justify-content :center - :flex-direction :row - :height 54 - :margin-horizontal 16 - :margin-top 16 - :overflow "hidden" - :border-radius radius - :background-color colors/danger-50-opa-20}) +(def logout-container + {:align-items :center + :justify-content :center + :flex-direction :row + :height 48 + :margin-horizontal 20 + :margin-top 16 + :margin-bottom 64 + :overflow "hidden" + :border-radius radius + :background-color colors/danger-50-opa-20}) diff --git a/src/status_im/ui/screens/profile/user/views.cljs b/src/status_im/ui/screens/profile/user/views.cljs index e0c5f298728..45c06d1832b 100644 --- a/src/status_im/ui/screens/profile/user/views.cljs +++ b/src/status_im/ui/screens/profile/user/views.cljs @@ -28,45 +28,45 @@ [] (views/letsubs [{:keys [address ens-name]} [:popover/popover] width (reagent/atom nil)] - (let [link (universal-links/generate-link :user :external (or ens-name address))] - [react/view {:on-layout #(reset! width (-> ^js % .-nativeEvent .-layout .-width))} - [react/view {:style {:padding-top 16 :padding-horizontal 16}} - (when @width - [qr-code-viewer/qr-code-view (- @width 32) address]) - (when ens-name - [react/view - [copyable-text/copyable-text-view - {:label :t/ens-username - :container-style {:margin-top 12 :margin-bottom 4} - :copied-text ens-name} - [quo/text - {:monospace true - :accessibility-label :ens-username} - ens-name]] - [react/view - {:height 1 - :margin-top 12 - :margin-horizontal -16 - :background-color colors/gray-lighter}]]) - [copyable-text/copyable-text-view - {:label :t/chat-key - :container-style {:margin-top 12 :margin-bottom 4} - :copied-text address} - [quo/text - {:number-of-lines 1 - :ellipsize-mode :middle - :accessibility-label :chat-key - :monospace true} - address]]] - [react/view styles/share-link-button - [quo/button - {:on-press (fn [] - (re-frame/dispatch [:hide-popover]) - (js/setTimeout - #(list-selection/open-share {:message link}) - 250)) - :accessibility-label :share-my-contact-code-button} - (i18n/label :t/share-link)]]]))) + (let [link (universal-links/generate-link :user :external (or ens-name address))] + [react/view {:on-layout #(reset! width (-> ^js % .-nativeEvent .-layout .-width))} + [react/view {:style {:padding-top 16 :padding-horizontal 16}} + (when @width + [qr-code-viewer/qr-code-view (- @width 32) address]) + (when ens-name + [react/view + [copyable-text/copyable-text-view + {:label :t/ens-username + :container-style {:margin-top 12 :margin-bottom 4} + :copied-text ens-name} + [quo/text + {:monospace true + :accessibility-label :ens-username} + ens-name]] + [react/view + {:height 1 + :margin-top 12 + :margin-horizontal -16 + :background-color colors/gray-lighter}]]) + [copyable-text/copyable-text-view + {:label :t/chat-key + :container-style {:margin-top 12 :margin-bottom 4} + :copied-text address} + [quo/text + {:number-of-lines 1 + :ellipsize-mode :middle + :accessibility-label :chat-key + :monospace true} + address]]] + [react/view styles/share-link-button + [quo/button + {:on-press (fn [] + (re-frame/dispatch [:hide-popover]) + (js/setTimeout + #(list-selection/open-share {:message link}) + 250)) + :accessibility-label :share-my-contact-code-button} + (i18n/label :t/share-link)]]]))) (defn content [] diff --git a/src/status_im/ui/screens/profile/user/views_v2.cljs b/src/status_im/ui/screens/profile/user/views_v2.cljs index a44c7037675..8e7d06e639f 100644 --- a/src/status_im/ui/screens/profile/user/views_v2.cljs +++ b/src/status_im/ui/screens/profile/user/views_v2.cljs @@ -21,50 +21,50 @@ [] (views/letsubs [{:keys [address ens-name]} [:popover/popover] width (reagent/atom nil)] - (let [link (universal-links/generate-link :user :external (or ens-name address))] - [react/view {:on-layout #(reset! width (-> ^js % .-nativeEvent .-layout .-width))} - [react/view {:style {:padding-top 16 :padding-horizontal 16}} - (when @width - [qr-code-viewer/qr-code-view (- @width 32) address]) - (when ens-name - [react/view - [copyable-text/copyable-text-view - {:label :t/ens-username - :container-style {:margin-top 12 :margin-bottom 4} - :copied-text ens-name} - [quo/text - {:monospace true - :accessibility-label :ens-username} - ens-name]] - [react/view - {:height 1 - :margin-top 12 - :margin-horizontal -16 - :background-color colors/gray-lighter}]]) - [copyable-text/copyable-text-view - {:label :t/chat-key - :container-style {:margin-top 12 :margin-bottom 4} - :copied-text address} - [quo/text - {:number-of-lines 1 - :ellipsize-mode :middle - :accessibility-label :chat-key - :monospace true} - address]]] - [react/view styles/share-link-button - [quo/button - {:on-press (fn [] - (re-frame/dispatch [:hide-popover]) - (js/setTimeout - #(list-selection/open-share {:message link}) - 250)) - :accessibility-label :share-my-contact-code-button} - (i18n/label :t/share-link)]]]))) + (let [link (universal-links/generate-link :user :external (or ens-name address))] + [react/view {:on-layout #(reset! width (-> ^js % .-nativeEvent .-layout .-width))} + [react/view {:style {:padding-top 16 :padding-horizontal 16}} + (when @width + [qr-code-viewer/qr-code-view (- @width 32) address]) + (when ens-name + [react/view + [copyable-text/copyable-text-view + {:label :t/ens-username + :container-style {:margin-top 12 :margin-bottom 4} + :copied-text ens-name} + [quo/text + {:monospace true + :accessibility-label :ens-username} + ens-name]] + [react/view + {:height 1 + :margin-top 12 + :margin-horizontal -16 + :background-color colors/gray-lighter}]]) + [copyable-text/copyable-text-view + {:label :t/chat-key + :container-style {:margin-top 12 :margin-bottom 4} + :copied-text address} + [quo/text + {:number-of-lines 1 + :ellipsize-mode :middle + :accessibility-label :chat-key + :monospace true} + address]]] + [react/view styles/share-link-button + [quo/button + {:on-press (fn [] + (re-frame/dispatch [:hide-popover]) + (js/setTimeout + #(list-selection/open-share {:message link}) + 250)) + :accessibility-label :share-my-contact-code-button} + (i18n/label :t/share-link)]]]))) (defn items [{:keys [mnemonic]}] [react/view - {:style styles/items-container} + {:style styles/container-style} profile-list-item/personal-info-group @@ -103,21 +103,21 @@ components/top-background-view [components/fixed-toolbar - {:on-share #(list-selection/open-share {:message link}) - :on-close #(re-frame/dispatch [:navigate-back]) - ;; TODO: No action for switch account + {:on-share #(list-selection/open-share {:message link}) + :on-close #(re-frame/dispatch [:navigate-back]) + ;; TODO: No action for switch account :on-switch-profile nil - :on-show-qr on-share}] + :on-show-qr on-share}] [react/scroll-view [components/user-info - {:on-share on-share - :has-picture has-picture + {:on-share on-share + :has-picture has-picture :customization-color customization-color - :account account - :emoji-hash (string/join emoji-hash) - :ens-verified ens-verified - :public-key public-key - :compressed-key compressed-key}] + :account account + :emoji-hash (string/join emoji-hash) + :ens-verified ens-verified + :public-key public-key + :compressed-key compressed-key}] [items {:mnemonic mnemonic}]]]))) diff --git a/src/status_im/ui/screens/screens.cljs b/src/status_im/ui/screens/screens.cljs index e23f899f301..292afab3f00 100644 --- a/src/status_im/ui/screens/screens.cljs +++ b/src/status_im/ui/screens/screens.cljs @@ -1,84 +1,85 @@ (ns status-im.ui.screens.screens (:require - [quo.design-system.colors :as colors] - [utils.i18n :as i18n] - [status-im.ui.components.icons.icons :as icons] - [status-im.ui.screens.about-app.views :as about-app] - [status-im.ui.screens.advanced-settings.views :as advanced-settings] - [status-im.ui.screens.appearance.views :as appearance] - [status-im.ui.screens.backup-settings.view :as backup-settings] - [status-im.ui.screens.bootnodes-settings.edit-bootnode.views :as edit-bootnode] - [status-im.ui.screens.bootnodes-settings.views :as bootnodes-settings] - [status-im.ui.screens.browser.bookmarks.views :as bookmarks] - [status-im.ui.screens.bug-report :as bug-report] - [status-im.ui.screens.communities.create :as communities.create] - [status-im.ui.screens.communities.import :as communities.import] - [status-im.ui.screens.communities.invite :as communities.invite] - [status-im.ui.screens.communities.members :as members] - [status-im.ui.screens.communities.membership :as membership] - [status-im.ui.screens.contacts-list.views :as contacts-list] - [status-im.ui.screens.currency-settings.views :as currency-settings] - [status-im.ui.screens.dapps-permissions.views :as dapps-permissions] - [status-im.ui.screens.default-sync-period-settings.view :as default-sync-period-settings] - [status-im.ui.screens.ens.views :as ens] - [status-im.ui.screens.fleet-settings.views :as fleet-settings] - [status-im.ui.screens.glossary.view :as glossary] - [status-im.ui.screens.group.views :as group-chat] - [status-im.ui.screens.help-center.views :as help-center] - [status-im.ui.screens.keycard.authentication-method.views :as keycard.authentication] - [status-im.ui.screens.keycard.onboarding.views :as keycard.onboarding] - [status-im.ui.screens.keycard.pairing.views :as keycard.pairing] - [status-im.ui.screens.keycard.pin.views :as keycard.pin] - [status-im.ui.screens.keycard.recovery.views :as keycard.recovery] - [status-im.ui.screens.keycard.settings.views :as keycard.settings] - [status-im.ui.screens.keycard.views :as keycard] - [status-im.ui.screens.link-previews-settings.views :as link-previews-settings] - [status-im.ui.screens.log-level-settings.views :as log-level-settings] - [status-im.ui.screens.mobile-network-settings.view :as mobile-network-settings] - [status-im.ui.screens.network-info.views :as network-info] - [status-im.ui.screens.network.edit-network.views :as edit-network] - [status-im.ui.screens.network.network-details.views :as network-details] - [status-im.ui.screens.network.views :as network] - [status-im.ui.screens.notifications-settings.views :as notifications-settings] - [status-im.ui.screens.offline-messaging-settings.edit-mailserver.views :as edit-mailserver] - [status-im.ui.screens.offline-messaging-settings.views :as offline-messaging-settings] - [status-im.ui.screens.pairing.views :as pairing] - [status-im.ui.screens.peers-stats :as peers-stats] - [status-im.ui.screens.privacy-and-security-settings.delete-profile :as delete-profile] - [status-im.ui.screens.privacy-and-security-settings.messages-from-contacts-only :as - messages-from-contacts-only] - [status-im.ui.screens.privacy-and-security-settings.views :as privacy-and-security] - [status-im.ui.screens.profile.contact.views :as contact] - [status-im.ui.screens.profile.group-chat.views :as profile.group-chat] - [status-im.ui.screens.profile.seed.views :as profile.seed] - [status-im.ui.screens.profile.user.views-v2 :as profile.user] - [status-im.ui.screens.progress.views :as progress] - [status-im.ui.screens.qr-scanner.views :as qr-scanner] - [status-im.ui.screens.reset-password.views :as reset-password] - [status-im.ui.screens.rpc-usage-info :as rpc-usage-info] - [status-im.ui.screens.stickers.views :as stickers] - [status-im.ui.screens.sync-settings.views :as sync-settings] - [status-im.ui.screens.wakuv2-settings.edit-node.views :as edit-wakuv2-node] - [status-im.ui.screens.wakuv2-settings.views :as wakuv2-settings] - [status-im.ui.screens.wallet.account-settings.views :as account-settings] - [status-im.ui.screens.wallet.account.views :as wallet.account] - [status-im.ui.screens.wallet.accounts-manage.views :as accounts-manage] - [status-im.ui.screens.wallet.accounts.views :as wallet.accounts] - [status-im.ui.screens.wallet.add-new.views :as add-account] - [status-im.ui.screens.wallet.buy-crypto.views :as wallet.buy-crypto] - [status-im.ui.screens.wallet.collectibles.views :as wallet.collectibles] - [status-im.ui.screens.wallet.custom-tokens.views :as custom-tokens] - [status-im.ui.screens.wallet.manage-connections.views :as manage-all-connections] - [status-im.ui.screens.wallet.recipient.views :as recipient] - [status-im.ui.screens.wallet.send.views :as wallet.send] - [status-im.ui.screens.wallet.settings.views :as wallet-settings] - [status-im.ui.screens.wallet.swap.views :as wallet.swap] - [status-im.ui.screens.wallet.transactions.views :as wallet-transactions] - [status-im2.contexts.chat.group-details.view :as group-details] - [status-im2.contexts.chat.home.view :as chat-home] - [status-im2.contexts.communities.home.view :as communities-home] - [status-im2.contexts.shell.share.view :as share-view] - [status-im.ui.screens.browser.stack :as browser])) + [quo.design-system.colors :as colors] + [utils.i18n :as i18n] + [status-im.ui.components.icons.icons :as icons] + [status-im.ui.screens.about-app.views :as about-app] + [status-im.ui.screens.advanced-settings.views :as advanced-settings] + [status-im.ui.screens.appearance.views :as appearance] + [status-im.ui.screens.backup-settings.view :as backup-settings] + [status-im.ui.screens.bootnodes-settings.edit-bootnode.views :as edit-bootnode] + [status-im.ui.screens.bootnodes-settings.views :as bootnodes-settings] + [status-im.ui.screens.browser.bookmarks.views :as bookmarks] + [status-im.ui.screens.bug-report :as bug-report] + [status-im.ui.screens.communities.create :as communities.create] + [status-im.ui.screens.communities.import :as communities.import] + [status-im.ui.screens.communities.invite :as communities.invite] + [status-im.ui.screens.communities.members :as members] + [status-im.ui.screens.communities.membership :as membership] + [status-im.ui.screens.contacts-list.views :as contacts-list] + [status-im.ui.screens.currency-settings.views :as currency-settings] + [status-im.ui.screens.dapps-permissions.views :as dapps-permissions] + [status-im.ui.screens.default-sync-period-settings.view :as default-sync-period-settings] + [status-im.ui.screens.ens.views :as ens] + [status-im.ui.screens.fleet-settings.views :as fleet-settings] + [status-im.ui.screens.glossary.view :as glossary] + [status-im.ui.screens.group.views :as group-chat] + [status-im.ui.screens.help-center.views :as help-center] + [status-im.ui.screens.keycard.authentication-method.views :as keycard.authentication] + [status-im.ui.screens.keycard.onboarding.views :as keycard.onboarding] + [status-im.ui.screens.keycard.pairing.views :as keycard.pairing] + [status-im.ui.screens.keycard.pin.views :as keycard.pin] + [status-im.ui.screens.keycard.recovery.views :as keycard.recovery] + [status-im.ui.screens.keycard.settings.views :as keycard.settings] + [status-im.ui.screens.keycard.views :as keycard] + [status-im.ui.screens.link-previews-settings.views :as link-previews-settings] + [status-im.ui.screens.log-level-settings.views :as log-level-settings] + [status-im.ui.screens.mobile-network-settings.view :as mobile-network-settings] + [status-im.ui.screens.network-info.views :as network-info] + [status-im.ui.screens.network.edit-network.views :as edit-network] + [status-im.ui.screens.network.network-details.views :as network-details] + [status-im.ui.screens.network.views :as network] + [status-im.ui.screens.notifications-settings.views :as notifications-settings] + [status-im.ui.screens.offline-messaging-settings.edit-mailserver.views :as edit-mailserver] + [status-im.ui.screens.offline-messaging-settings.views :as offline-messaging-settings] + [status-im.ui.screens.pairing.views :as pairing] + [status-im.ui.screens.peers-stats :as peers-stats] + [status-im.ui.screens.privacy-and-security-settings.delete-profile :as delete-profile] + [status-im.ui.screens.privacy-and-security-settings.messages-from-contacts-only :as + messages-from-contacts-only] + [status-im.ui.screens.privacy-and-security-settings.views :as privacy-and-security] + [status-im.ui.screens.profile.contact.views :as contact] + [status-im.ui.screens.profile.group-chat.views :as profile.group-chat] + [status-im.ui.screens.profile.seed.views :as profile.seed] + [status-im.ui.screens.profile.user.views-v2 :as profile.user] + [status-im.ui.screens.progress.views :as progress] + [status-im.ui.screens.qr-scanner.views :as qr-scanner] + [status-im.ui.screens.reset-password.views :as reset-password] + [status-im.ui.screens.rpc-usage-info :as rpc-usage-info] + [status-im.ui.screens.stickers.views :as stickers] + [status-im.ui.screens.sync-settings.views :as sync-settings] + [status-im.ui.screens.wakuv2-settings.edit-node.views :as edit-wakuv2-node] + [status-im.ui.screens.wakuv2-settings.views :as wakuv2-settings] + [status-im.ui.screens.wallet.account-settings.views :as account-settings] + [status-im.ui.screens.wallet.account.views :as wallet.account] + [status-im.ui.screens.wallet.accounts-manage.views :as accounts-manage] + [status-im.ui.screens.wallet.accounts.views :as wallet.accounts] + [status-im.ui.screens.wallet.add-new.views :as add-account] + [status-im.ui.screens.wallet.buy-crypto.views :as wallet.buy-crypto] + [status-im.ui.screens.wallet.collectibles.views :as wallet.collectibles] + [status-im.ui.screens.wallet.custom-tokens.views :as custom-tokens] + [status-im.ui.screens.wallet.manage-connections.views :as manage-all-connections] + [status-im.ui.screens.wallet.recipient.views :as recipient] + [status-im.ui.screens.wallet.send.views :as wallet.send] + [status-im.ui.screens.wallet.settings.views :as wallet-settings] + [status-im.ui.screens.wallet.swap.views :as wallet.swap] + [status-im.ui.screens.wallet.transactions.views :as wallet-transactions] + [status-im2.contexts.chat.group-details.view :as group-details] + [status-im2.contexts.chat.home.view :as chat-home] + [status-im2.contexts.communities.home.view :as communities-home] + [status-im2.contexts.shell.share.view :as share-view] + [status-im.ui.screens.browser.stack :as browser] + [status-im2.navigation.options :as options])) (defn right-button-options [id icon] @@ -685,9 +686,7 @@ :top? true}} :component manage-all-connections/views} {:name :share-view - :options {:topBar {:title {:text (i18n/label :t/share-link)}} - :insets {:bottom? false - :top? false}} + :options options/transparent-screen-options :component share-view/view} ;; BUG REPORT {:name :bug-report From 62751cbef6fd6ad33e8962fbe9dcfb3d50bafb40 Mon Sep 17 00:00:00 2001 From: Ky Date: Wed, 4 Oct 2023 19:49:18 +0700 Subject: [PATCH 4/5] move new profile to status_im2 --- src/quo/core.cljs | 1 + src/status_im/ui/screens/popover/views.cljs | 2 +- src/status_im/ui/screens/screens.cljs | 2 +- .../profile/profiles}/components.cljs | 7 +- .../profile/profiles}/list_items.cljs | 7 +- .../contexts/profile/profiles/style.cljs | 81 ++++++++++++++++++- .../contexts/profile/profiles}/views_v2.cljs | 8 +- 7 files changed, 93 insertions(+), 15 deletions(-) rename src/{status_im/ui/screens/profile/user => status_im2/contexts/profile/profiles}/components.cljs (91%) rename src/{status_im/ui/screens/profile/user => status_im2/contexts/profile/profiles}/list_items.cljs (97%) rename src/{status_im/ui/screens/profile/user => status_im2/contexts/profile/profiles}/views_v2.cljs (94%) diff --git a/src/quo/core.cljs b/src/quo/core.cljs index 0b3eb3d4b7a..cc07ef3ac25 100644 --- a/src/quo/core.cljs +++ b/src/quo/core.cljs @@ -16,6 +16,7 @@ (def text text/text) (def header header/header) +(def header-action header/header-action) (def animated-header animated-header/header) (def text-input text-input/text-input) (def tooltip tooltip/tooltip) diff --git a/src/status_im/ui/screens/popover/views.cljs b/src/status_im/ui/screens/popover/views.cljs index d2670a0ac36..a20ad165a0f 100644 --- a/src/status_im/ui/screens/popover/views.cljs +++ b/src/status_im/ui/screens/popover/views.cljs @@ -8,7 +8,7 @@ [status-im.ui.components.react :as react] [status-im.ui.screens.keycard.frozen-card.view :as frozen-card] [status-im.ui.screens.keycard.views :as keycard.views] - [status-im.ui.screens.profile.user.views-v2 :as profile.user] + [status-im2.contexts.profile.profiles.views-v2 :as profile.user] [status-im.ui.screens.reset-password.views :as reset-password.views] [status-im.ui.screens.signing.sheets :as signing-sheets] [status-im.ui.screens.signing.views :as signing] diff --git a/src/status_im/ui/screens/screens.cljs b/src/status_im/ui/screens/screens.cljs index 292afab3f00..b8995617f0e 100644 --- a/src/status_im/ui/screens/screens.cljs +++ b/src/status_im/ui/screens/screens.cljs @@ -51,7 +51,7 @@ [status-im.ui.screens.profile.contact.views :as contact] [status-im.ui.screens.profile.group-chat.views :as profile.group-chat] [status-im.ui.screens.profile.seed.views :as profile.seed] - [status-im.ui.screens.profile.user.views-v2 :as profile.user] + [status-im2.contexts.profile.profiles.views-v2 :as profile.user] [status-im.ui.screens.progress.views :as progress] [status-im.ui.screens.qr-scanner.views :as qr-scanner] [status-im.ui.screens.reset-password.views :as reset-password] diff --git a/src/status_im/ui/screens/profile/user/components.cljs b/src/status_im2/contexts/profile/profiles/components.cljs similarity index 91% rename from src/status_im/ui/screens/profile/user/components.cljs rename to src/status_im2/contexts/profile/profiles/components.cljs index 68e09c2f6a7..7f370c6f380 100644 --- a/src/status_im/ui/screens/profile/user/components.cljs +++ b/src/status_im2/contexts/profile/profiles/components.cljs @@ -1,8 +1,7 @@ -(ns status-im.ui.screens.profile.user.components +(ns status-im2.contexts.profile.profiles.components (:require [status-im.ui.components.react :as react] - [quo.components.header :as header] [quo.core :as quo] - [status-im.ui.screens.profile.user.styles :as styles] + [status-im2.contexts.profile.profiles.style :as styles] [status-im2.contexts.chat.messages.avatar.view :as avatar] [status-im.multiaccounts.core :as multiaccounts])) @@ -12,7 +11,7 @@ (defn button [{:keys [icon accessibility-label on-press style]}] - [header/header-action + [quo/header-action {:icon icon :on-press on-press :accessibility-label accessibility-label diff --git a/src/status_im/ui/screens/profile/user/list_items.cljs b/src/status_im2/contexts/profile/profiles/list_items.cljs similarity index 97% rename from src/status_im/ui/screens/profile/user/list_items.cljs rename to src/status_im2/contexts/profile/profiles/list_items.cljs index 11c2b2ca812..ee6d1274517 100644 --- a/src/status_im/ui/screens/profile/user/list_items.cljs +++ b/src/status_im2/contexts/profile/profiles/list_items.cljs @@ -1,13 +1,12 @@ -(ns status-im.ui.screens.profile.user.list-items +(ns status-im2.contexts.profile.profiles.list-items (:require [quo.core :as quo] [quo.design-system.colors :as colors] [re-frame.core :as re-frame] [status-im.ui.components.common.common :as components.common] [status-im.ui.components.react :as react] - [status-im.ui.screens.profile.user.styles :as styles] + [status-im2.contexts.profile.profiles.style :as styles] [utils.i18n :as i18n] [status-im.ui.components.icons.icons :as icons] - [quo.components.text :as text] [quo2.foundations.colors :as fcolors])) (def separator @@ -189,7 +188,7 @@ #(re-frame/dispatch [:multiaccounts.logout.ui/logout-pressed]) :accessibility-label :log-out-button} [icons/icon :main-icons/log-out {:color fcolors/danger-60}] - [text/text + [quo/text {:style {:color fcolors/danger-60 :margin-left 8}} (i18n/label :t/logout)]]) diff --git a/src/status_im2/contexts/profile/profiles/style.cljs b/src/status_im2/contexts/profile/profiles/style.cljs index 458cadcfc0d..a40645dfe07 100644 --- a/src/status_im2/contexts/profile/profiles/style.cljs +++ b/src/status_im2/contexts/profile/profiles/style.cljs @@ -1,6 +1,7 @@ (ns status-im2.contexts.profile.profiles.style (:require [quo2.foundations.colors :as colors] - [react-native.reanimated :as reanimated])) + [react-native.reanimated :as reanimated] + [react-native.safe-area :as safe-area])) ;; Profiles Section @@ -62,3 +63,81 @@ (def forget-password-step-container {:flex-direction :row :margin-top 14}) (def forget-password-step-content {:margin-left 10}) (def forget-password-step-title {:flex-direction :row}) + + +(def share-link-button + {:margin-top 12 + :margin-horizontal 16 + :margin-bottom 16}) + +(def radius 16) + +(def top-background-view + {:background-color colors/magenta-opa-40 + :position :absolute + :top 0 + :left 0 + :height 400 + :width 400 + :z-index -1}) + +(def toolbar + {:padding-bottom 16 + :padding-top (safe-area/get-top) + :flex-direction :row + :align-items :center + :justify-content :space-between}) + +(def header-icon-style + {:border-radius 10 + :margin-left 16 + :width 32 + :height 32 + :background-color colors/white-opa-10}) + +(def right-accessories + {:flex-direction :row + :align-items :center + :justify-content :space-between + :margin-right 20}) + +(def avatar + {:margin-top 8 + :margin-horizontal 24 + :z-index 100}) + +(def user-info + {:background-color colors/neutral-95 + :padding-horizontal 16 + :border-top-left-radius 20 + :border-top-right-radius 20 + :margin-top -38 + :padding-top 38 + :padding-bottom 16}) + +(def container-style {:background-color colors/neutral-95}) + +(def rounded-view + {:margin-top 16 + :margin-horizontal 20 + :overflow "hidden" + :border-radius radius}) + +(def list-item-container + {:background-color "#242D3F" + :padding-left -12 + :padding-right 6 + :height 50}) + +(def logout-container + {:align-items :center + :justify-content :center + :flex-direction :row + :height 48 + :margin-horizontal 20 + :margin-top 16 + :margin-bottom 64 + :overflow "hidden" + :border-radius radius + :background-color colors/danger-50-opa-20}) + diff --git a/src/status_im/ui/screens/profile/user/views_v2.cljs b/src/status_im2/contexts/profile/profiles/views_v2.cljs similarity index 94% rename from src/status_im/ui/screens/profile/user/views_v2.cljs rename to src/status_im2/contexts/profile/profiles/views_v2.cljs index 8e7d06e639f..c35a5319ca2 100644 --- a/src/status_im/ui/screens/profile/user/views_v2.cljs +++ b/src/status_im2/contexts/profile/profiles/views_v2.cljs @@ -1,4 +1,4 @@ -(ns status-im.ui.screens.profile.user.views-v2 +(ns status-im2.contexts.profile.profiles.views-v2 (:require [clojure.string :as string] [quo.core :as quo] [quo.design-system.colors :as colors] @@ -7,9 +7,9 @@ [status-im.ui.components.copyable-text :as copyable-text] [status-im.ui.components.list-selection :as list-selection] [status-im.ui.components.react :as react] - [status-im.ui.screens.profile.user.components :as components] - [status-im.ui.screens.profile.user.list-items :as profile-list-item] - [status-im.ui.screens.profile.user.styles :as styles] + [status-im2.contexts.profile.profiles.components :as components] + [status-im2.contexts.profile.profiles.list-items :as profile-list-item] + [status-im2.contexts.profile.profiles.style :as styles] [status-im.utils.universal-links.utils :as universal-links] [status-im2.common.qr-code-viewer.view :as qr-code-viewer] [status-im2.config :as config] From da460d028e349dc6cd575f0333245a93ef001dc9 Mon Sep 17 00:00:00 2001 From: Ky Date: Thu, 5 Oct 2023 14:30:37 +0700 Subject: [PATCH 5/5] Changes as reviewed --- ios/Podfile.lock | 2 +- src/quo/components/list/item.cljs | 14 +- src/quo/core.cljs | 1 - src/quo2/foundations/colors.cljs | 5 - src/status_im/ui/screens/popover/views.cljs | 2 +- .../ui/screens/profile/user/styles.cljs | 76 +---------- src/status_im/ui/screens/screens.cljs | 25 +--- .../contexts/profile/profiles/components.cljs | 46 ++++--- .../contexts/profile/profiles/list_items.cljs | 86 ++++++------ .../contexts/profile/profiles/style.cljs | 9 +- .../contexts/profile/profiles/views.cljs | 72 ++++++++++ .../contexts/profile/profiles/views_v2.cljs | 123 ------------------ src/status_im2/navigation/screens.cljs | 7 + 13 files changed, 161 insertions(+), 307 deletions(-) create mode 100644 src/status_im2/contexts/profile/profiles/views.cljs delete mode 100644 src/status_im2/contexts/profile/profiles/views_v2.cljs diff --git a/ios/Podfile.lock b/ios/Podfile.lock index d65479ef4c2..d80e56cf568 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -772,7 +772,7 @@ SPEC CHECKSUMS: RNLanguages: 962e562af0d34ab1958d89bcfdb64fafc37c513e RNPermissions: ad71dd4f767ec254f2cd57592fbee02afee75467 RNReactNativeHapticFeedback: 2566b468cc8d0e7bb2f84b23adc0f4614594d071 - RNReanimated: 43adb0307a62c1ce9694f36f124ca3b51a15272a + RNReanimated: aaa16b8dc7b9552ead99d5c78a35a3066b2838a4 RNShare: d82e10f6b7677f4b0048c23709bd04098d5aee6c RNStaticSafeAreaInsets: 055ddbf5e476321720457cdaeec0ff2ba40ec1b8 RNSVG: 80584470ff1ffc7994923ea135a3e5ad825546b9 diff --git a/src/quo/components/list/item.cljs b/src/quo/components/list/item.cljs index 5da13aa0d7c..c50083224ce 100644 --- a/src/quo/components/list/item.cljs +++ b/src/quo/components/list/item.cljs @@ -43,13 +43,13 @@ [size] (case size :small 36 - (min size 40))) + 40)) (defn size->container-size [size] (case size :small 52 - (min size 64))) + 64)) (defn size->single-title-size [size] @@ -70,20 +70,20 @@ children)) (defn icon-column - [{:keys [icon icon-bg-color icon-color icon-size icon-container-style]}] + [{:keys [icon icon-bg-color icon-color size icon-container-style]}] (when icon - (let [_icon-size (size->icon-size icon-size)] + (let [icon-size (size->icon-size size)] [rn/view {:style (or icon-container-style (:tiny spacing/padding-horizontal))} (cond (vector? icon) icon (keyword? icon) [rn/view - {:style {:width _icon-size - :height _icon-size + {:style {:width icon-size + :height icon-size :align-items :center :justify-content :center - :border-radius (/ _icon-size 2) + :border-radius (/ icon-size 2) :background-color icon-bg-color}} [icons/icon icon {:color icon-color}]])]))) diff --git a/src/quo/core.cljs b/src/quo/core.cljs index cc07ef3ac25..0b3eb3d4b7a 100644 --- a/src/quo/core.cljs +++ b/src/quo/core.cljs @@ -16,7 +16,6 @@ (def text text/text) (def header header/header) -(def header-action header/header-action) (def animated-header animated-header/header) (def text-input text-input/text-input) (def tooltip tooltip/tooltip) diff --git a/src/quo2/foundations/colors.cljs b/src/quo2/foundations/colors.cljs index b5e98afa033..f8dbaf1133f 100644 --- a/src/quo2/foundations/colors.cljs +++ b/src/quo2/foundations/colors.cljs @@ -121,11 +121,6 @@ (def white-opa-90 (alpha white 0.9)) (def white-opa-95 (alpha white 0.95)) -(def magenta "#EC266C") -;; with transparency -(def magenta-opa-40 (alpha "#EC266C" 0.4)) - - ;;;;Blur (def white-70-blur (alpha white 0.7)) (def white-70-blur-opaque (alpha-opaque white 0.7)) diff --git a/src/status_im/ui/screens/popover/views.cljs b/src/status_im/ui/screens/popover/views.cljs index a20ad165a0f..86f60a48a57 100644 --- a/src/status_im/ui/screens/popover/views.cljs +++ b/src/status_im/ui/screens/popover/views.cljs @@ -8,7 +8,7 @@ [status-im.ui.components.react :as react] [status-im.ui.screens.keycard.frozen-card.view :as frozen-card] [status-im.ui.screens.keycard.views :as keycard.views] - [status-im2.contexts.profile.profiles.views-v2 :as profile.user] + [status-im.ui.screens.profile.user.views :as profile.user] [status-im.ui.screens.reset-password.views :as reset-password.views] [status-im.ui.screens.signing.sheets :as signing-sheets] [status-im.ui.screens.signing.views :as signing] diff --git a/src/status_im/ui/screens/profile/user/styles.cljs b/src/status_im/ui/screens/profile/user/styles.cljs index a903a1b790a..5baa83e71f6 100644 --- a/src/status_im/ui/screens/profile/user/styles.cljs +++ b/src/status_im/ui/screens/profile/user/styles.cljs @@ -1,80 +1,6 @@ -(ns status-im.ui.screens.profile.user.styles - (:require [quo2.foundations.colors :as colors] - [react-native.safe-area :as safe-area])) +(ns status-im.ui.screens.profile.user.styles) (def share-link-button {:margin-top 12 :margin-horizontal 16 :margin-bottom 16}) - -(def radius 16) - -(def top-background-view - {:background-color colors/magenta-opa-40 - :position :absolute - :top 0 - :left 0 - :height 400 - :width 400 - :z-index -1}) - -(def toolbar - {:padding-bottom 16 - :padding-top (safe-area/get-top) - :flex-direction :row - :align-items :center - :justify-content :space-between}) - -(def header-icon-style - {:border-radius 10 - :margin-left 16 - :width 32 - :height 32 - :background-color colors/white-opa-10}) - -(def right-accessories - {:flex-direction :row - :align-items :center - :justify-content :space-between - :margin-right 20}) - -(def avatar - {:margin-top 8 - :margin-horizontal 24 - :z-index 100}) - -(def user-info - {:background-color colors/neutral-95 - :padding-horizontal 16 - :border-top-left-radius 20 - :border-top-right-radius 20 - :margin-top -38 - :padding-top 38 - :padding-bottom 16}) - -(def container-style {:background-color colors/neutral-95}) - -(def rounded-view - {:margin-top 16 - :margin-horizontal 20 - :overflow "hidden" - :border-radius radius}) - -(def list-item-container - {:background-color "#242D3F" - :padding-left -12 - :padding-right 6 - :height 50}) - -(def logout-container - {:align-items :center - :justify-content :center - :flex-direction :row - :height 48 - :margin-horizontal 20 - :margin-top 16 - :margin-bottom 64 - :overflow "hidden" - :border-radius radius - :background-color colors/danger-50-opa-20}) - diff --git a/src/status_im/ui/screens/screens.cljs b/src/status_im/ui/screens/screens.cljs index b8995617f0e..eca1511a223 100644 --- a/src/status_im/ui/screens/screens.cljs +++ b/src/status_im/ui/screens/screens.cljs @@ -10,6 +10,7 @@ [status-im.ui.screens.bootnodes-settings.edit-bootnode.views :as edit-bootnode] [status-im.ui.screens.bootnodes-settings.views :as bootnodes-settings] [status-im.ui.screens.browser.bookmarks.views :as bookmarks] + [status-im.ui.screens.browser.stack :as browser] [status-im.ui.screens.bug-report :as bug-report] [status-im.ui.screens.communities.create :as communities.create] [status-im.ui.screens.communities.import :as communities.import] @@ -51,7 +52,6 @@ [status-im.ui.screens.profile.contact.views :as contact] [status-im.ui.screens.profile.group-chat.views :as profile.group-chat] [status-im.ui.screens.profile.seed.views :as profile.seed] - [status-im2.contexts.profile.profiles.views-v2 :as profile.user] [status-im.ui.screens.progress.views :as progress] [status-im.ui.screens.qr-scanner.views :as qr-scanner] [status-im.ui.screens.reset-password.views :as reset-password] @@ -74,12 +74,7 @@ [status-im.ui.screens.wallet.settings.views :as wallet-settings] [status-im.ui.screens.wallet.swap.views :as wallet.swap] [status-im.ui.screens.wallet.transactions.views :as wallet-transactions] - [status-im2.contexts.chat.group-details.view :as group-details] - [status-im2.contexts.chat.home.view :as chat-home] - [status-im2.contexts.communities.home.view :as communities-home] - [status-im2.contexts.shell.share.view :as share-view] - [status-im.ui.screens.browser.stack :as browser] - [status-im2.navigation.options :as options])) + [status-im2.contexts.chat.group-details.view :as group-details])) (defn right-button-options [id icon] @@ -115,11 +110,6 @@ :component stickers/pack} ;; Community (legacy only for e2e needed) - {:name :community-home - :options {:topBar {:title {:text (i18n/label :t/import-community-title)}} - :insets {:top? true - :bottom? true}} - :component communities-home/view} {:name :community-members ;;TODO custom subtitle :options {:insets {:top? true}} @@ -230,9 +220,6 @@ ;;PROFILE - {:name :my-profile - :options {:topBar {:visible false}} - :component profile.user/my-profile} {:name :contacts-list :options {:topBar {:title {:text (i18n/label :t/contacts)}} :insets {:top? true}} @@ -434,11 +421,6 @@ :top? true}} :component contact/nickname-view} - {:name :chat-home - :options {:topBar {:title {:text (i18n/label :t/chat)}} - :insets {:top? true}} - :component chat-home/view} - ;[Group chat] Add participants {:name :add-participants-toggle-list :on-focus [:group/add-participants-toggle-list] @@ -685,9 +667,6 @@ :insets {:bottom? true :top? true}} :component manage-all-connections/views} - {:name :share-view - :options options/transparent-screen-options - :component share-view/view} ;; BUG REPORT {:name :bug-report :options {:insets {:top? true}} diff --git a/src/status_im2/contexts/profile/profiles/components.cljs b/src/status_im2/contexts/profile/profiles/components.cljs index 7f370c6f380..acd1e2781c1 100644 --- a/src/status_im2/contexts/profile/profiles/components.cljs +++ b/src/status_im2/contexts/profile/profiles/components.cljs @@ -1,66 +1,70 @@ (ns status-im2.contexts.profile.profiles.components - (:require [status-im.ui.components.react :as react] - [quo.core :as quo] + (:require [react-native.core :as rn] + [quo2.core :as quo] [status-im2.contexts.profile.profiles.style :as styles] [status-im2.contexts.chat.messages.avatar.view :as avatar] [status-im.multiaccounts.core :as multiaccounts])) (def top-background-view - [react/view + [rn/view {:style styles/top-background-view}]) (defn button [{:keys [icon accessibility-label on-press style]}] - [quo/header-action - {:icon icon - :on-press on-press + [quo/button + {:icon-only? true + :type :grey + :background :blur + :size 32 + :container-style style :accessibility-label accessibility-label - :style (merge styles/header-icon-style style)}]) + :on-press on-press} + icon]) (defn fixed-toolbar [{:keys [on-close on-switch-profile on-show-qr on-share]}] - [react/view + [rn/view {:style styles/toolbar} [button - {:icon :main-icons/close + {:icon :i/close :accessibility-label :close-header-button :on-press on-close :style {:margin-left 20}}] - [react/view + [rn/view {:style styles/right-accessories} [button - {:icon :main-icons/multi-profile + {:icon :i/multi-profile :accessibility-label :multi-profile-header-button :on-press on-switch-profile}] [button - {:icon :main-icons/qr2 + {:icon :i/qr-code :accessibility-label :qr-header-button :on-press on-show-qr - :style {:margin-left 14}}] + :style {:margin-horizontal 14}}] [button - {:icon :main-icons/share + {:icon :i/share :accessibility-label :share-header-button :on-press on-share}]]]) (defn user-info [{:keys [emoji-hash account public-key about]}] - [react/view - [react/view + [rn/view + [rn/view {:style styles/avatar} [avatar/avatar public-key :big]] - [react/view + [rn/view {:style styles/user-info} [quo/text - {:weight :semi-bold - :size :xx-large + {:size :heading-1 + :weight :semi-bold :style {:margin-top 16}} (multiaccounts/displayed-name account)] [quo/text - {:size :large + {:size :paragraph-1 :style {:margin-top 8}} about] [quo/text - {:size :large + {:size :paragraph-1 :style {:margin-top 8}} emoji-hash]]]) diff --git a/src/status_im2/contexts/profile/profiles/list_items.cljs b/src/status_im2/contexts/profile/profiles/list_items.cljs index ee6d1274517..c20a321c741 100644 --- a/src/status_im2/contexts/profile/profiles/list_items.cljs +++ b/src/status_im2/contexts/profile/profiles/list_items.cljs @@ -1,48 +1,49 @@ (ns status-im2.contexts.profile.profiles.list-items - (:require [quo.core :as quo] + (:require [quo2.core :as quo2] + [quo.core :as quo] [quo.design-system.colors :as colors] [re-frame.core :as re-frame] - [status-im.ui.components.common.common :as components.common] - [status-im.ui.components.react :as react] + [status-im.ui.components.badge :as components.common] + [react-native.core :as rn] [status-im2.contexts.profile.profiles.style :as styles] [utils.i18n :as i18n] - [status-im.ui.components.icons.icons :as icons] + [quo2.components.icon :as icons] [quo2.foundations.colors :as fcolors])) (def separator - [quo/separator]) + [quo2/separator]) (defn list-item - [{:keys [icon title title-color accessibility-label chevron accessory on-press title-style]}] + [{:keys [icon title accessibility-label chevron accessory on-press title-style]}] [quo/list-item {:icon icon :icon-bg-color "transparent" :icon-size 32 :icon-color (:text-03 @colors/theme) :title title - :title-color title-color + :title-color (:text-01 @colors/theme) :title-style (merge {:padding-horizontal 0} title-style) :accessibility-label accessibility-label :chevron chevron - :size 50 + :size :small :container-style styles/list-item-container :accessory accessory :on-press on-press}]) (def personal-info-group - [react/view + [rn/view {:style styles/rounded-view} [list-item - {:icon :main-icons/edit-profile + {:icon :i/edit-profile :title (i18n/label :t/edit-profile) :accessibility-label :edit-profile-settings-button :chevron true ;; TODO: No edit profile action ;; :on-press #(re-frame/dispatch [:navigate-to :edit]) - }] + }] separator [list-item - {:icon :main-icons/key-profile + {:icon :i/key-profile :title (i18n/label :t/password) :accessibility-label :password-settings-button :chevron true @@ -51,50 +52,47 @@ (defn activity-settings-group [{:keys [mnemonic]}] - [react/view + [rn/view {:style styles/rounded-view} [list-item - {:icon :main-icons/message-profile + {:icon :i/message-profile :title (i18n/label :t/messages) :accessibility-label :message-settings-button :chevron true :accessory (when mnemonic - [components.common/counter {:size 22} 1]) - ;; TODO: Chat home doesn't look great - :on-press #(re-frame/dispatch [:navigate-to :chat-home])}] + [components.common/badge {:size 22} 1]) + ;; TODO: Chat home doesn't look great + ;; :on-press #(re-frame/dispatch [:navigate-to :chat]) + }] separator [list-item - {:icon :main-icons/communities + {:icon :i/communities :title (i18n/label :t/communities) :accessibility-label :communities-settings-button :chevron true :accessory (when mnemonic - [components.common/counter {:size 22} 1]) + [components.common/badge {:size 22} 1]) ;; TODO: Community home doesn't work correctly ;; :on-press #(re-frame/dispatch [:navigate-to :community-home]) - }] + }] separator [list-item - {:icon :main-icons/wallet-profile + {:icon :i/wallet-profile :title (i18n/label :t/wallet) :accessibility-label :wallet-settings-button :chevron true - :accessory (when mnemonic - [components.common/counter {:size 22} 1]) ;; TODO: Wallet screen needs back button :on-press #(re-frame/dispatch [:navigate-to :wallet])}] separator [list-item - {:icon :main-icons/dapps + {:icon :i/dapps :title (i18n/label :t/dapps) :accessibility-label :dapps-settings-button :chevron true - :accessory (when mnemonic - [components.common/counter {:size 22} 1]) :on-press #(re-frame/dispatch [:browser.ui/open-url "https://dap.ps"])}] separator [list-item - {:icon :main-icons/browser + {:icon :i/browser :title (i18n/label :t/browser) :accessibility-label :browser-settings-button :chevron true @@ -102,69 +100,67 @@ :on-press #(re-frame/dispatch [:navigate-to :browser])}] separator [list-item - {:icon :main-icons/keycard-profile + {:icon :i/keycard-profile :title (i18n/label :t/keycard) :accessibility-label :keycard-settings-button :chevron true - :accessory (when mnemonic - [components.common/counter {:size 22} 1]) :on-press #(re-frame/dispatch [:navigate-to :keycard-settings])}]]) (defn device-settings-group [{:keys [local-pairing-mode-enabled?]}] - [react/view + [rn/view {:style styles/rounded-view} (when local-pairing-mode-enabled? - [react/view + [rn/view [list-item - {:icon :main-icons/syncing + {:icon :i/syncing :title (i18n/label :t/syncing) :accessibility-label :syncing-settings-button :chevron true :on-press #(re-frame/dispatch [:navigate-to :settings-syncing])}] separator]) [list-item - {:icon :main-icons/notification + {:icon :i/notification :title (i18n/label :t/notifications) :accessibility-label :notifications-settings-button :chevron true :on-press #(re-frame/dispatch [:navigate-to :notifications])}] separator [list-item - {:icon :main-icons/appearance + {:icon :i/appearance :title (i18n/label :t/appearance) :accessibility-label :appearance-settings-button :chevron true :on-press #(re-frame/dispatch [:navigate-to :appearance])}] separator [list-item - {:icon :main-icons/globe + {:icon :i/globe :title (i18n/label :t/language-and-currency) :accessibility-label :language-settings-button :chevron true ;; TODO: No language screen ;; :on-press #(re-frame/dispatch [:navigate-to :appearance]) - }]]) + }]]) (def advanced-settings-group - [react/view + [rn/view {:style styles/rounded-view} [list-item - {:icon :main-icons/mobile-profile + {:icon :i/mobile-profile :title (i18n/label :t/data-usage) :accessibility-label :data-usage-settings-button :chevron true :on-press #(re-frame/dispatch [:navigate-to :mobile-network-settings])}] separator [list-item - {:icon :main-icons/settings + {:icon :i/settings :title (i18n/label :t/advanced) :accessibility-label :advanced-settings-button :chevron true :on-press #(re-frame/dispatch [:navigate-to :advanced-settings])}]]) (def about-help-group - [react/view + [rn/view {:style styles/rounded-view} [list-item {:title (i18n/label :t/about-app) @@ -177,18 +173,18 @@ {:title (i18n/label :t/status-help) :accessibility-label :help-button :chevron false - :accessory [icons/icon :main-icons/external {:color colors/gray}] + :accessory [icons/icon :i/external {:color colors/gray}] :title-style {:margin-horizontal 16} :on-press #(re-frame/dispatch [:navigate-to :help-center])}]]) (def logout-item - [react/view + [rn/view {:style styles/logout-container :on-press #(re-frame/dispatch [:multiaccounts.logout.ui/logout-pressed]) :accessibility-label :log-out-button} - [icons/icon :main-icons/log-out {:color fcolors/danger-60}] - [quo/text + [icons/icon :i/log-out {:color fcolors/danger-60}] + [quo2/text {:style {:color fcolors/danger-60 :margin-left 8}} (i18n/label :t/logout)]]) diff --git a/src/status_im2/contexts/profile/profiles/style.cljs b/src/status_im2/contexts/profile/profiles/style.cljs index a835897e51c..128aa03debd 100644 --- a/src/status_im2/contexts/profile/profiles/style.cljs +++ b/src/status_im2/contexts/profile/profiles/style.cljs @@ -73,12 +73,12 @@ (def radius 16) (def top-background-view - {:background-color colors/magenta-opa-40 + {:background-color (colors/custom-color :magenta 50 40) :position :absolute :top 0 :left 0 :height 400 - :width 400 + :right 0 :z-index -1}) (def toolbar @@ -126,8 +126,7 @@ (def list-item-container {:background-color "#242D3F" :padding-left -12 - :padding-right 6 - :height 50}) + :padding-right 6}) (def logout-container {:align-items :center @@ -139,4 +138,4 @@ :margin-bottom 64 :overflow "hidden" :border-radius radius - :background-color colors/danger-50-opa-20}) + :background-color (colors/custom-color :danger 50 20)}) diff --git a/src/status_im2/contexts/profile/profiles/views.cljs b/src/status_im2/contexts/profile/profiles/views.cljs new file mode 100644 index 00000000000..4fbdd68b01f --- /dev/null +++ b/src/status_im2/contexts/profile/profiles/views.cljs @@ -0,0 +1,72 @@ +(ns status-im2.contexts.profile.profiles.views + (:require [clojure.string :as string] + [re-frame.core :as re-frame] + [utils.debounce :refer [dispatch-and-chill]] + [status-im.ui.components.list-selection :as list-selection] + [react-native.core :as rn] + [status-im2.contexts.profile.profiles.components :as components] + [status-im2.contexts.profile.profiles.list-items :as profile-list-item] + [status-im2.contexts.profile.profiles.style :as styles] + [status-im.utils.universal-links.utils :as universal-links] + [status-im2.config :as config])) + +(defn items + [{:keys [mnemonic]}] + [rn/view + {:style styles/container-style} + + profile-list-item/personal-info-group + + [profile-list-item/activity-settings-group + {:mnemonic mnemonic}] + + [profile-list-item/device-settings-group + {:local-pairing-mode-enabled? config/local-pairing-mode-enabled?}] + + profile-list-item/advanced-settings-group + + profile-list-item/about-help-group + + profile-list-item/logout-item]) + +(defn my-profile + [] + (fn [] + (let [{:keys [public-key + compressed-key + ens-verified + emoji-hash + mnemonic + ens-name address + key-uid] + :as account} + @(re-frame/subscribe [:profile/multiaccount]) + customization-color (or (:color @(re-frame/subscribe [:onboarding-2/profile])) + @(re-frame/subscribe [:profile/customization-color key-uid])) + on-share #(dispatch-and-chill [:open-modal :share-shell] 1000) + has-picture @(re-frame/subscribe [:profile/has-picture]) + link (universal-links/generate-link :user :external (or ens-name address))] + + [rn/view {:flex 1 :style styles/container-style} + + components/top-background-view + + [components/fixed-toolbar + {:on-share #(list-selection/open-share {:message link}) + :on-close #(re-frame/dispatch [:navigate-back]) + ;; TODO: No action for switch account + :on-switch-profile nil + :on-show-qr on-share}] + + [rn/scroll-view + [components/user-info + {:on-share on-share + :has-picture has-picture + :customization-color customization-color + :account account + :emoji-hash (string/join emoji-hash) + :ens-verified ens-verified + :public-key public-key + :compressed-key compressed-key}] + [items + {:mnemonic mnemonic}]]]))) diff --git a/src/status_im2/contexts/profile/profiles/views_v2.cljs b/src/status_im2/contexts/profile/profiles/views_v2.cljs deleted file mode 100644 index c35a5319ca2..00000000000 --- a/src/status_im2/contexts/profile/profiles/views_v2.cljs +++ /dev/null @@ -1,123 +0,0 @@ -(ns status-im2.contexts.profile.profiles.views-v2 - (:require [clojure.string :as string] - [quo.core :as quo] - [quo.design-system.colors :as colors] - [re-frame.core :as re-frame] - [reagent.core :as reagent] - [status-im.ui.components.copyable-text :as copyable-text] - [status-im.ui.components.list-selection :as list-selection] - [status-im.ui.components.react :as react] - [status-im2.contexts.profile.profiles.components :as components] - [status-im2.contexts.profile.profiles.list-items :as profile-list-item] - [status-im2.contexts.profile.profiles.style :as styles] - [status-im.utils.universal-links.utils :as universal-links] - [status-im2.common.qr-code-viewer.view :as qr-code-viewer] - [status-im2.config :as config] - [utils.i18n :as i18n]) - (:require-macros [status-im.utils.views :as views])) - - -(views/defview share-chat-key - [] - (views/letsubs [{:keys [address ens-name]} [:popover/popover] - width (reagent/atom nil)] - (let [link (universal-links/generate-link :user :external (or ens-name address))] - [react/view {:on-layout #(reset! width (-> ^js % .-nativeEvent .-layout .-width))} - [react/view {:style {:padding-top 16 :padding-horizontal 16}} - (when @width - [qr-code-viewer/qr-code-view (- @width 32) address]) - (when ens-name - [react/view - [copyable-text/copyable-text-view - {:label :t/ens-username - :container-style {:margin-top 12 :margin-bottom 4} - :copied-text ens-name} - [quo/text - {:monospace true - :accessibility-label :ens-username} - ens-name]] - [react/view - {:height 1 - :margin-top 12 - :margin-horizontal -16 - :background-color colors/gray-lighter}]]) - [copyable-text/copyable-text-view - {:label :t/chat-key - :container-style {:margin-top 12 :margin-bottom 4} - :copied-text address} - [quo/text - {:number-of-lines 1 - :ellipsize-mode :middle - :accessibility-label :chat-key - :monospace true} - address]]] - [react/view styles/share-link-button - [quo/button - {:on-press (fn [] - (re-frame/dispatch [:hide-popover]) - (js/setTimeout - #(list-selection/open-share {:message link}) - 250)) - :accessibility-label :share-my-contact-code-button} - (i18n/label :t/share-link)]]]))) - -(defn items - [{:keys [mnemonic]}] - [react/view - {:style styles/container-style} - - profile-list-item/personal-info-group - - [profile-list-item/activity-settings-group - {:mnemonic mnemonic}] - - [profile-list-item/device-settings-group - {:local-pairing-mode-enabled? config/local-pairing-mode-enabled?}] - - profile-list-item/advanced-settings-group - - profile-list-item/about-help-group - - profile-list-item/logout-item]) - -(defn my-profile - [] - (fn [] - (let [{:keys [public-key - compressed-key - ens-verified - emoji-hash - mnemonic - ens-name address - key-uid] - :as account} - @(re-frame/subscribe [:profile/multiaccount]) - customization-color (or (:color @(re-frame/subscribe [:onboarding-2/profile])) - @(re-frame/subscribe [:profile/customization-color key-uid])) - on-share #(re-frame/dispatch [:navigate-to :share-view]) - has-picture @(re-frame/subscribe [:profile/has-picture]) - link (universal-links/generate-link :user :external (or ens-name address))] - - [react/view {:flex 1 :style styles/container-style} - - components/top-background-view - - [components/fixed-toolbar - {:on-share #(list-selection/open-share {:message link}) - :on-close #(re-frame/dispatch [:navigate-back]) - ;; TODO: No action for switch account - :on-switch-profile nil - :on-show-qr on-share}] - - [react/scroll-view - [components/user-info - {:on-share on-share - :has-picture has-picture - :customization-color customization-color - :account account - :emoji-hash (string/join emoji-hash) - :ens-verified ens-verified - :public-key public-key - :compressed-key compressed-key}] - [items - {:mnemonic mnemonic}]]]))) diff --git a/src/status_im2/navigation/screens.cljs b/src/status_im2/navigation/screens.cljs index 6ea8bd8941f..8b5fb43581d 100644 --- a/src/status_im2/navigation/screens.cljs +++ b/src/status_im2/navigation/screens.cljs @@ -27,6 +27,7 @@ [status-im2.contexts.onboarding.syncing.results.view :as syncing-results] [status-im2.contexts.onboarding.welcome.view :as welcome] [status-im2.contexts.profile.profiles.view :as profiles] + [status-im2.contexts.profile.profiles.views :as my-profile] [status-im2.contexts.quo-preview.main :as quo.preview] [status-im2.contexts.shell.activity-center.view :as activity-center] [status-im2.contexts.shell.jump-to.view :as shell] @@ -129,6 +130,12 @@ :on-focus [:onboarding/overlay-dismiss] :component profiles/view} + {:name :my-profile + :options {:theme :dark + :layout options/onboarding-layout} + :on-focus [:onboarding/overlay-dismiss] + :component my-profile/my-profile} + {:name :new-to-status :options {:theme :dark :layout options/onboarding-transparent-layout