From 399460a259f1258b280be7748fe4bcdf4c78920c Mon Sep 17 00:00:00 2001 From: jinyaqiu Date: Thu, 7 Aug 2025 10:41:57 +0800 Subject: [PATCH] feat: navbar --- app/(tabs)/login.tsx | 4 ++-- assets/images/png/owner/ask.png | Bin 10376 -> 5527 bytes components/layout/ask.tsx | 14 +++++++------- components/login/login.tsx | 21 ++++++++++----------- i18n/locales/en/login.json | 3 ++- i18n/locales/zh/login.json | 3 ++- 6 files changed, 23 insertions(+), 22 deletions(-) diff --git a/app/(tabs)/login.tsx b/app/(tabs)/login.tsx index e332311..ccc6d0d 100644 --- a/app/(tabs)/login.tsx +++ b/app/(tabs)/login.tsx @@ -75,8 +75,8 @@ const LoginScreen = () => { bounces={false} > - - Awake your Memo + + {t('login:auth.login.titleText')} u>D)y+r6fgq>5y2u zVcB>5{oeoJozG|H&YhWa?sLyM^PF>Utgf~SImvwz5C}xBrmCb50)amQ_jW{t!1d;s z`x0n~y;RM7K_F6^ep;S ze%tJIo^hSHtA0>N4Q+-8)DN~Qxqoa~4u5B48iRngv*`(Nr?H7q#L9l#mspp?h=@Md z{^@Z30fW;i$+#`9s3@tZ_-$0Qo$>@g_3s!p?Dl3%{5==mhM^XBnP{_obs}n1p;M83 z{q1eRsvdQk&exR&nXcGF3Wec-rH1vN(oF|)B~`rV$&V0uRaW*9t)!B zAjWDO*+j&whT&1X#M;Ayt?%J1Y0rf=Q*+-xo&ccqY9al_CC98KA&;2CSyW=v+c29^ z3+H>KU1a{uh0-5t>WqU;=_qwr&U0gP??_^KN7zqWU8CmU2!*A#&8wY1hH1pWn7de= zV8X$TH|o|Vj>ccJWQ-4S;~I~Ych^3JRH->P9mm2Redv?juqjww>Wnvh!8sSQ*cNlf zVONT&QaA6a3mO#No~;q*YtvKDiRRtpcvGHU6vk})^|>HrPcVV@zR6nU`7U4U2Qt%y zuWyvE*7-0kz1M9&7I4J_wd2d_g+^0!<0~3XJRutyE? zRog~HZXpP@S?7^x#N$P4P(yy^^ z#QtZ1djU6ec#AR&-V^*Y5FsS1zGOsOoYv9NVH{|;bB38Cz1h!NKwb~Oa{HW{;u{uJ zK6q)xRTklMmKAWt9I_atH|m|_^?UsL$fcdJTIkI4l0tup&EBylon@{|qeJ(bi(&`0 zu?|(I-*jpvW1{`ZSl}=3D%^o_Y4ZL3v;zt1%*uAz%Y*y=^s|(^hKi!VY zq7g?X_7h{_By&g)H;1XYIg77YF(2ji**XVUP5F&U*3@l@_#2O;E_KpJnASf?C!6t) z0Tt#Kw=LLE!=|EE&mRXZug8Kdn$1E=qcBVsduDVu>D`YwoxejBO277x;c*$tHsbO> z8A7*zmLm?~DbH6gy>JL80HLjS2yD_sHqnoXw@ z?&GHG*4paL{Mv%+@?RHGNy+=2`8D0A9!lMx-?i8`8HgnMxzXfh;??&Rf*rRr!CDWl;?xB_$1~ScGx$VbyZ7 zr2>c3ICw1>O-mb-mSdjD$atc7Yll+#O(H5PghZY^u^V)Ead8oskobNr<|tLKuQxU8 z5q;)BY;n2l1zBu!552CQ*QqGP$z7lBxm4Q8*5vwFxtG8^OtO+2bS3T6DKJI$nMZ<4 zuajZ1Bjw%U`yHvuqOxH*f)sQ%C;OXr=F_w=Vv|mx?{9XB^;cZz_ou5l7TRF2vY$l- zxuu7Hk8Go4()&kbar2cIQKL;lKdjpvf^dW54M~eI*#)}8^yamyuE!tLUQBOlm(S`8 zrN^1AB#ifi@x(+8DYS=%hr^yfe~x_>i1wdqJ7&9jDS8qG{mq~fYtF}R`QbVN-OWYx z@u$5_P#Asa`5w91r~xX?1ChvD&GK%3_UmS!OVo{Sg;Ey-(5g_Xc>lg+tb)mHox*w%J;s`uU0ws6k6hY`k77SZ2h4fk+(D)etg7u=`RqQY2g_ZQ`*Wy$l~q5k2^O2HzXb_OI*`IphtYzH zf#~3{%k}iR+}B6_Bcs^_H6SaCrEj`UC#8VR4$o_JLZFK3=BkY7 zYxkx680IS&p4ebes^Syrv_(bBBCH*we$~O$R8E?Y|^IrAyU9;NlzD zx;ZB@bkGp_LN}*IK25W{YRr%?wKZ=w;Q>e(K&wm2Zh7Qr4sq% zNUcyPzJqJZ$Kg-l8|k|n&kl35DPKqYPBQJXsAwWscf}kc1kE*ugfp|5dqnZ%qSwek z{BSk5_+oa1pHo#F6_!jtL8gGt-6FM4hL-1-8{kf`i(>{Te_-#Okv-I&5fJSU95@Jsk_8@7R29Y*U3UfO$l z3VA8QF`HE)78EV2(L4`B^P+LH#w)*mk#S1)G1jTdX_1kUo%qIe7w-uc(3?OqlBMrh z%cL{@`U3wI&I%SCTUc1o5&YPVqzUwRqW$i_WymDO^XZRMtkvZ-)0t=p?zPm(F zT^hT)0iS4-dFJOj39?C;Pue$1-_)t7A3SrjsBOL0?l$Jc{+yd=b>kZ zKt`k?gntOHVVd|gIy(BBQ>kpmXEK@SMvGkp-SN3=kSVSmx$hkqc%BH(1OHR%>fwP_ zgmwJz-GuBJvoZCrkZ9P~QzPc<*}ZCK%l|lyCro<^%E-Sz%PTMUNC1TXxtnZ9?dtkE zGxx<*p%8Z z7!$G-e&=>dU|YE^zS~oZBc8{iG{(5f%|*psUKVnnxDna@e!9_r=hZZ{O7pFV21&ry zhOn)XTI*$&Xn4E7o7vRw-;thzqmM_~!Tk1NVYj9-xj2j3x;3FdkJNbula)F+m|yAF zNb$^WxOty?W4*R6iarGcgsC#b7+)u($!ocj*)#Rvub=`~Z-1ZQQ#IpQ+azH;ix6xQ z4YxL#+&lOS2o0}ok6%E*9#_=0UhTvYQP9(|zP@+f*UozT6juE&^DH=h`ULKeFp7bm zQq`%pzjt+W3*Et+)_Wf6LRCvdft0v{jlh=$dHeKiHQmJ81xkUcNS6# zAx>(Wt9P4%B_I$zU&*YO9Ng^}1crFSV=pbb5q_&f?K2bOwbK~ctrur#?_Q=DGLRN9 zjw#(=(#sg0_W`3^q||PaZa@u1dh&3n2xIKx}bxHlhd)`Ih5<)-LO zje^7<`@24um65UjvR4j8X=+|pEtw7_jCMsnlj_&CxjjE+Z)s^^TNk7}$5Lv_;SUj- zbJ`j$tMC2F5NX?#px{(esP5{KEffFN=C!}j!iLh^B_^Wga;-j`JvXVaR6CQv1rbV- zCcSFIo&{2|=iLMNxJTM%l^JgHT|FVRzDS!y z{C3G?D1V|(j*AJpbS);z5kLxw*9{ z=qc}L5?nMAzqeFGM8thX+O{kHCQ6IWvD;auc;#uxMw7X3m-`a6m6+8R7U6*#;t|yH z^7t^TgHmT#z$+~s9UNEz|EUxer>zz*eO#A;fx#;T0x?tRb~UikW$9hR)~Up>M0*%3 zH}j6i_h9x*<(oS_FNH}hkOj(@bY89XD3n7v_2>z}RF0hqvbPt`E-ssPvjTdhUzH$H zTHm`TPU#FtAC6@nFp}heN9NS;wRsK}ixuo=Or#45&Oyf{sbz*YmhB(}WefnzWVENU z8^zBn)2J@ufEe$z3Agdf2v}r!7;vJf{SCX1rY5L2fw?wAt z0O1Hb+1sxS?d|QsM76=N!xd$>^fV3ZDQ+;D)Td&vH1W|s0d3fa4(6~+X z!Q({{m*Hj-Hpt`yAkS-VZEs6i%_s`;rU)L`2G*vg~ zDRFIWZErk_>~N_7GFfg$0jE6vux<<%{#K12i{eS=PUm3Y-K^v)CLkuw5(ckZhj-^* z_~Y`ASW2);Jc*!KOUCK-?;6@GliQZzmJfJ;$L)$+OAd-0~}7^gO{=jSTr8S4kF(j_4q)0SXFl5t2m-+}C@}Z(XvR zOtkkfx61EmE$78sJ+xVC+_7rINJwbgdaITpmt_2&o~J}% zgtv(QR+SW=nriz~TP_iotfip1CBKq63jw#>dv2PkI;Ld}Clqunb9Nk~fS%*)ydfZ8w?m@$n{ApV_7b00a6H zkkT3(vpf$u$;}Df`*Hl!Eva}QTdQiC#yz@+vNyvi$%7u+OsG2ZPN>@OmnRjNNk|98Cf9WuuV@v32V{V*a#UPn#ORb#Ge>6G@;yQ zYBJyUR*oHkY^jN$Rc!h8Z&ED;fFH`{_nD4Kr8V|5{*cZD!6{xY>}V;|hol(m&A6l^2@2c#XdpGW<%k!T1d4BW0@81)lrt*yN4$U11f(V~0$f-jR))x5P2KP4jc|Ot-3_*<0 zb2(`ZuTPt4PVZTsCCtq#6^s<6Z>^tA7S8W*C1LJh;;=-l=YR3kAh53db;i|3t;PaJgX=veQy>G)_b zZbvU}Y<*tdvvsY)JqcyRiRM?u3s1d^l?!H0jjum{1|+1E@b51vL1Cs;|NnuhD;fm3 zYM>+2*|rj0Vkb85EL7f;_CMOosC%|BMmfgd&nfV-n=v3L`~C=ZI__B_%4Ndqr_;m6;e({P0_V_c~9{y*lH=o0l1 z1ImNu7+ERHy$-h3)D&(S)rE9wOiN8z8fq(Hwza`A*GdGf{uk$jde48gvc;v*7TUK6ea0)^$0g+(C-QC&QKs~-G*YVeN5Co|{P~QM z`Bh$PQ{4OK!S^1MYKYvpJS&d3LON&urCr-ffnoJW2G*pK%Z0Q{-fu?k^6mXmem2+0 z#wq&V7~%WlFk>S?d*aQW)|rEUehN$oYfW$6L}o{zm&w?*;{EDAE*HUR^X`Uge9say zM8dQ(>^E2IANFa;YK@f1@kM}gbKQJu&r-vi+#zJA^22DDGbJCV@Wm{-BnzGK4EC21 zPp+h%rwX4MUf-B!xW{AKIqM}9v^`~Q(Q^F9yo#5JkaH}c_^Q?IS-{~V@t?sbO~Es@ z+vXf5Zh?FcIY=j(WaRNfML)0a{BoFNP~+iNBz7s<&_z2Vx9HFjqA_>b5;$%^GXj1L z_xxKb-x9q!wG6S#eIS!DG#1_J6h`YYL(V~8tYTHNVr_J=Q{H3DlEExb)BE`8kFHm# zjx?%%)7DeH@{IN>vEw)1Gbx?E%%gJPLG}9FD$(4Q+K_Bp;zp%_U$v zpSHahCZwdOOfS(lrcPSN)&z%&rwVB(c@a?m8y^xY{TY9ErkdR?`V*X@X zQ+Z(nxuW^iAyA~m9{CLwT~zYU`y}d{fzmz}{M55?DtY0n;un(f-2^uRJ$cephzsnRtSV@I z`Va0x4OV?Mt1E<(N$$zck6ZZ`1~#aEpGYsrmaH}Ko!{v#%zTnP=F{<}hMIq&>Yba{ znx>`6fVGaB?k*w6?fc*PP?WAlddUt!Ocu45+byR~oe>o{r#{w~$=>-HBQVJ@WCV5a z6El^*kc0MW`el+_k!BLs@8(zuh%Vvz0u4?gXxC`vG=MW9Qa@3E&Mo#bFWgeM&D60n zLmIQ{+IT*O8Q%UbI=@(LW$@-)u-N@Xwsk!vEN4Dz%A*lyVZ8YKc3_Q9o{_}iPb-(z zGO3=Baq~!Q4LD-ojMI4V$b=Eq*Qt?Bi*J3i=5qVn>9(QvmY;Xd#cIMV)>Z>Q`3{!Z z(Ntf0jgtzJ#dp?>+Ho{^>@|Y~l4}3t2{ZHZzBg|eotz+QQ=LX3Z>XlG=Iw|r`KyAD z3OVZO1J!UPoy5>ey%((U&#|D-(~f7q3XC^B^eZME2G`uaYZXSwG5@uEvU~GzKhcuu zaEO2!$mOW5fT=D; zSk5Ex%*n~gTOzS87)^#=5xc?I({;&1rIm;#)qQ(^e~B9qX&NPytE^h#2+{_EUKVMw zK#c2$qU`a{x06nt+GU|Y9UUE#ZVP_(BCVGRq*zdLAEH!)GiX6rSU@1O)_^GIBV!IW z#SAI~DWN(W=Xm$EsVUaOggd!IHgSqM)+ujaU(9+RHcvZ7$uW}_jBO~)Bpuy!GjKcY zF2{uqbO#-)LoIbld&;n(x%qjsBzE5d4Kj!^wU2!h8y6(1xWfZBMrINr{kpzgF2hVk zm|Jlqfj2>1Nsj5EWrY$fLe2~uI^eqlW#7GfHyh&p?C*zeZ*RX}DM)wrKmMesfPOE7s|@-wx;VntK;&r zrM)K}8mw!D7nRst`7Ze}$5FlP-zsI_k(cS)rJ%K@aq-)=~mN8Q< zv)({$=2(0;>nF(o1_;VP?sf0tz>quXSy@@#I&crW$28NF5pqXZ5H8b^VcYQ|)V&8w z%6UT~BaYR^-n$)?&1VC$#F`t2qEH|{^t;NTT7&aBl!*gsv#W`q3ogVQ-))kkzUvb; zdp3jVgn2K<^`p&7Z^kJsYRS=UxHhCX1b%dpSM;86pQavj@9*vFYjj!ro%2faY`ovd z`+OIjM;m=R*+GFbAy}_y8Bwl_2dQxK8O+%DRmD^}Suk zGzMFazcOG2#@SZ-TqQizZkk+kQ&9@j4Gs+rWqB6MP7G|^pwC*Q)Y&6 zgaURW@Nf3BSUp!)SL1l~rjc#_&VTTU&7%TD`AK%URsSV9%uTfAeF+2FN0n=ABl2p&a!BFVQpxW+l1c zu+rqqV5ZFwN7#Ih`WpL~yYZH1ty!{4o@?E>{bjyh(F}~eC3*?rc1$Pan}@YV`8cKj z$mZ?cq9#L#*JW#}HXLkf*T0z#v5_4r1hw0g==%{yrB!UXJd#cFw|PTj;ohQFpivj` zY%;kIon@d z*R%Pd;TL&BX3ox}su>b~>bTB!84KOKSvAGJ2n1qz!xyu4!3Qbylvy+yjXAulaL`Xw zWE01{m_)r8ynRboEb_NNvQJtDjou&4BCYKe20>S@6cp-=Mxa8f_kN`1N1NpdvtLfW zdW)di`k(AA@f_Bl^Y*%|xrye*(u-BWAdfimmv1b-{`%(~b-3zXQp+@CSMFL%r}E-O zmc!(XUX4pFT)p6)USg=K&HGOMSuB~sdl~2OIe=9`~x)xgqEp? z2L*Wg{tMOgl`R%qhsF~k5@;vIDm{gcfx-VEuzxPO zV9!*k&POX?Xd73jhG;nU$7jaM(|aWR&%F{?z9mP08Ml|ns+1@Q6X|!wkUKf*qu#sG zaisPk%-7s}R)6Ox#U9m9@%GwgH985jK9T!&Iry?!08^*EpLs$c8p9IV!3;tlp45X2 zB`fA!*XAfn9)H{Zbn#gzaCb!hgQ->|NF&@`Zgc<1k?J#XbcHNmks=<{0$j?OaHnc= z(|FICt~?=5{g*)#@?@jlbNkXadvkDqrkLg=-U%hF>#bjrn&m=|%lRl&2Tnl>)rA~Q zO-=m}_dP;pgbJ1qGS2^r;%O2txDt!G`9yBU^NVA}aQ*u#hnrAKf57FwGsQ%&77i&| z{@Jr;5g{QAdEGrYNc{qhJ^4>>P5E_R)K}R5pf~wR2*765_#H(P{GKv7&_OEnikygu ziD3pdAykOQn%z#?O2!>cf-2(~$zc+a`%Ezq6crV997K!^tn5m0XxrJ@`SDP@_&kkb zc$h5HCHQAm``7bW?y)Srqg!=(;sOG znA(LQDfaj*8NE|UkCf=JBf;TiLXucChp$9Cul_r)CzmIPauJGH^i}rYOA;U4iyt_! zd+Lgmq-%TYY`V|!!`hF&UfS-kPjK~+9s1Dg7mW(x;Na*!`nV=mq_trOA_>o-`Mh!4 zucSWU${(Oy@0fbY)ir_S)KnSE4QVJaIW5i4!op$^c1kZDrt7r4veGQ}`0;@y^nT54 zqDZTdd$3$LVWux~xrUU~rS=m9eRr6Aw2%mVZd9@W{2>j@%r5u!#WTi?{(Uv?tM?~J zhOROyf1KVbtJkl0N^5It-*k>H6 zOCLfA-YwoZeRpn$FaJbiMzUg#``#UsNx|OUUX#KRnVH?F@m~bME%uLTtUwtcEt)l* ztfHf*A1NDo^~a$9b>rcLTeAT~1v=94Vt2gm3|+{${bN)g?17#9g#T-c?4uq_ncbtA z(KD(qLu*-}ipn+j;I|nl8H}ak zlJ~}Q#(Tx}yrb9N?E8Ps{_WcvGox@TL5hj&9j$CQH}_{6dedYFeCC*GKg@Kq7w8n| zwHVV5Gtzf2>Jq=KsMY><*%!oqO^2h&cmo0%^Y_|%au(5Qh#}HwdCZ8dK$itSui)}k z@#5dT%ebDU?}OGY|Ng;0DzfE|*z)r7wx9_4CK;I8o5ErK$8%N^`zcqSh5oA3GGV>c z&{uD3$a5pMowA<{Q)a*UmGV*d{zNZ=jV$7yQjR((z+ls+r8*yfB1DunUr3dYw}Vvx zMFpHc5)1wD;|Kazy0~wNpk87hqQK!}A%_wiU%yPhxG38O-zG=>xdtaW7Ib`xX}+S| zh`$$B%l@vAq1woni6%O%s(g04X7h1FXMx)N)xXmD8k{;MV@%+^TXz4b5I4P7#AdzK zdPZDo32a@tGnl=2eDEBqiBC8x|K?#DOrqlI8`>l`T z&dSQl$RT$_03&7u(9VgK7gm{bqm86PYBIG3oo=FBR#sN9HVOYgoDu#q4PSAQ<37lf?2(Yz|S_iv^V<$258gVp!wpLcH=T;t~q zE|h=I+O$J<2^;h&i*ns8LE9FeMt>>XAF}$riHu|sbOXV%4n-?>nWq+JNRX%ew!=3e z$hMNE)2!6@l;Tm?8q1*dK?|sqUQic8K{2Q*FDw7Mh+{ti%5fD~Ay@rDa&q#VVRJIq z8!a^uE1%U10Oe9xiPMNhg<>k7eh|C`j?V{5XQf^T=t}QO&1lNw$3eZmS)g$z;a9kk za~7tU7|EXhgTHb@Erml4B1uzOA(p`vOl+~IMp#)jH-L`oWW`TitzMvjb~eZ{+|nds z;BWR&c(A+kw@o1_@kZcx_`|*5N<8B46<9BGW}PjP{h4w;k;>>;tndmY^>oW*&3!#H z+G;Q<>5@Bbz=>RWWc|)H6vXj}$UNBG2#oMboz( zP|MMY0c$pn*pAf8ZNnsxHHD3LHl0^oM6!;04t=Ka@$s*OL2k(|^(M+FitN9EoiqBb z4rEn_g@sKi=FEQ(n0A91Y`K@POjwky^LhDRALN?`XKNY!iSH3Sc8*Uh9q@^51b+$- zNa059>cZ3hV!fpiOWYsrcSmCu=0fo) zMttXBNHw;w*0Bpw4!SUaXOR=!D_MK)!Bozz2HfH8JA_}ra<1(D)E4gVp*i-`!#3xhM83br=@p39{0zI)$rGmRS7Yk9PCvNC{Tp{iL2^ zhe@6L_cGP)53rfS8^%bdcm7mG+d9%>L6WC~u@ZrA&6ULadH*X_-EN|UKR=|(m-y_~ z3iwVLWov>5H8{P6%u1>79T7@*W6`j)(ds6Fbd@|d$fSIHI5OF&$m9)tBTQ907c8vm z#)8mjbo1|RT>f5!nTg3O9lJF#}HgXOQ-bXM6s&y@^(CZU_6_7Qgep&9JObgJHdrPSQkP0qvd}_- zRd+%`GxxTV4qIafl~murpxs`ukY}*(J<{=}@08v|e3lCyWMh)d6+>b+TUgR`noP!C zx3cLseFN^q;+u>AWuuDlh2Qqvj9^>HLLK+lr7;QAWtQud#^;rN?}8#aO-^z^xw|4+ zdp%4+^Pd~ceul2#?M9TFOjbdV^m4to_n)8d>zt+KdRO+XCk4qK+9WHpJA+L-ozcGx z8-K?*55RNM#8+^9g6WJ&`($KvqQj&a0wE7t1yfE#8EKqVa`fEKgonlf*F>w*r;)qz zB}Gl$3X&tKM>0#fyE*tVtqif4|$>+(r$@1=rZFITmF9i@w7#V@ZR;5mv~p z>!8x+FQ36{u^5(*FRTECZXYkV(tZ7C^7ezJ-iW&#mz#~48GSbP+tcqOTZ8L`(o+^M z&M-YliCMM^W6)8$#kL#v1IoQ$h2i0ldRp?QsN|@}iG!~FLY^!lWTuVEwsJzg17#|R zEk{?sQC#0tB9L}y>9bnvXv92v*Vu?OD;f#}r49>nYQ8vXw#@3|Z7hW=@t}qy=Y!I2 zXUvW6Pq`@@KKI{p=ADcIAb#!|J-dt2V?#hDx&`5i3l&Z?eYW^JjY3Kg`@H&WFSv17 zWmlP6tjmz|fzx77uyYGwpC&fkL z^~*JD6v&tbsZyPHJ9I+jY0ici4OX(+$ufAgQAv+7`$9}~bgiw(7Y)?J{wK_2G7ZL1 zEMU!Ue}DgqEULq+-yux*_FG|PcSivJrkVqqpSZ2QcMAW`{VKN33Sg8S;3vvQj~;y< zu`QiLR0;GU_P4{s!<)a6%kZZt4>V1i{2`jLxnU6SXGpxNVBj`Hl4u#>(-;G2Ee=>$ zTiwUoBZucW_8(6VwN1cZVA^gNv}UZ-{KY$&at(ji*4EH&PA?t8m?Aqq^NxD4kWPr% ztkOMi3&N6_oGdFJTAQnNU12Z*Zh6R(peU^n&gdoSSdQ}&PLbm^NgwuqLSvzIyDxTnFbI3l=h6vgS@r+t-1{nqtg!Fhd87QDa!I% zoC!oJ8>8673GquN$vsO440UQnTGEQ%J`11wc`vX?(PiWR2F=kiIap9a7>BKcYfar! z(agsXPV*lgw4zDsKBKJJ5=Lj2 zi4aYEV16zMhr_LD7jHm20A$B|PC27_bgUoseib2v-uEF)-P|5b>l=Fvy_ldk*r&59%5+o;s67nP@{)>4!Q`MB&T8@Ejd3Qa z2O}qy@e_M23ldv))I`d&No4-H(yd$p-QZ#MU}g72*IWK!=7R>OK(dHGcf_5!z9k&w zu939Uq%zWAWVVkE!zIuEQcwV&dx)m}N&z)p+F`AriYD>x>fH$ve*djW>&4bk{Lcp5 z3)dPB;AmH9dDcKvL0S<00gogkE~hQ{AM|HP!Ys~>K_A7_UI{!jmmX3^YJO zn@tJ|qFw;boZM}ZIbw?k1?m-rL5#oB#4r({?rfbkEb+8`O9Rv-=kMRY9OdKik3E)S zYQcm?M7cYJ8{|<>y{FyBY9U5S3W^$Z-#?ws&dw%hAV9n+-e890x*Dn(8(+P=e=p<# zc0roy$bP59VT+&aOxVDdXazq5Bn6N)K%b!SfG9U}bliH_ZLxPBA0#*|wQsrSwY!}u z9^`U$d7+*v|C2m-F0n3akoaEIQwZ|9JXwh~KFfd9yKFgDY-lXvxivKm;)VV2HjORj zp)`@|j!h`Hr4?0otvvqgp^()&(z)hpcKvbcF`B*8)b9@ZPWOVBTy!BRxx=#E_K3S{ zK8=@jwA!Z0hfCnEyslOH#eHwwNy#r8Ul}BNR`#!jRKS{}IzB^?n<3_kX?{_jHP}?} zq597hp;_d<6Uc>Fz&$G9N~0U@8S|;9wqYcp0zNT{)E$pGZ0igomvH^-yssaJ$c1R3%cnW&&aSne3d6dX>;po$H&oro zkiZmWI`CkJNixX9*?HHv#QB^WG4$rGIS^K7#r#eWBP|?{Fn3P_0p;1Sh=@ z!4k88P58|BsL|c&6Rtz1-Ir)4k6BXwe_O8EzM~WNg%lIEjrnSAS3c8q*E%vtx#11> z-QicN(f$4X0Rcb=61fh-OTZ}8g9{HyZ%E`PVX#VQgOL(EF0}^jRhwAQ+ce35OCGj1 zUWVcg72|991n9gmh7gH1S`FxWHv*-hw*@SBpquMLU$GIa8U1#D9}L%at?bK;JaxTq zM1sZL%aYN5cCL20zH{4tl3~D|1~TJ}Ii;$C+fhLtfHlT}vddFnEH=H3L?mzaqMVve zNT($hT|_2`;IN7N!ZCN<={Ud(Qj`&DiYHplce{B}(bu9OQ1^b3%+*7TD%cAq?D4xH z!laq$B--v=Kvy>mioR;Hlj9vaOV1oNwU$l;YSX%`4BAq`&w`-PTpMW01zLre>dDPl z7r(T_#PS)%pkvt{FYkVgl%CnBhr1m z%0aEF{l!p(M4w9~1MRO2$yg|G#P%@Vv-xb=*wkE!pq#H_a+9T0=U=%kwGKx{KX5ki z#mKO(cAByJ>v&hdjF(YPqSvzGQl$daW=~lG1uUmnU5;hPN{FT@ux1Wg*Fcco+dTCL zfXU~QzdGPSGt8otxo50-V+lZ}HNecU`1jZx(wMq?6HZV&8 zEEv)jXnE;Jl?+vfMprAejx~SB*2{`B^S_k^ z=@}vJ>@%WP@~1M_JAB7Rc7z}Z>ynK8?%_n_MM6B`MzJTVn+2?*VJ?;7T?_c({ zQkZ3fLKZA#Djn9in=^IQsbWJv?CPiyhYAm@C@3gYfQDzRs;Ziym^Z`$LG0}85UFMM z;LayorccVC0X_-(_MDZ>NPM&(3^?X8uFkEFFSY{$HWn8b#bsq>tBD8+{XY4Q5|oR) zS5K#qnNm2KP6V%m4TNGtDe(~b*$pr|RqDQKh6 z3uhrD@i%YYtd`3j)Ia^i8fGe^*0>p;s>WVXa@z-|*d>C_{hzkoJ*Cb|F zuzX8{qcalz$Q%}7aosCk&$-sgoEm|^3d0IqBR}rAet}rTn&icrDr~S-B&lc6SIPFn zD=p@l%DmySC^x!i6326IMzjhK#~$uPU4Oj?0l=xM1_2j`ngV8Ank$}c`WT;Y_83x0 z_1M8AMKKN8 z|5h`{bx~@q@m$-+o)-Ag)2#FlrR=xtAGX*SJ)bFU*^j@4+yMM&Uai|A9$Ww4g_Zy^ z!~s?JDUdg&hqU&`C%VIk63!lvfwAYRvoG`>jF-xRDl%DkfV$pz)#FW%Gch2{Jc8!F z63Q)R$%e1)m1v$dPGq_4>+aKGL6e(D+5k0akCEK|Zz~T#T&Gjf(VaU@e6o?qz${lJ z+0hqK+L2C4ymc4AQXFYiyZ;uLCIiU7R}Z0gCE7Z`oCM`~DUOwT0rbESRNuu{z9tMR zk3K;YLiwQ{5*g2+*9BEm0|Nu`m3o^hg1=j@&#Vn*E5^X0Vhg*+l7j^cOR0Q@cpIY& z>>gUAkeb8IJAj@#us|){@f_Z(pTJ?pwcJG0oH9h+*LNoYL*jCOuJ~ZOEu45kFVQcw zG(A|X%Q&R4ZF$CMrlj#m?^Jx-yT8PX$LTsmAF|{iF9BOpMIN`o{QUuX=HCu^<2ug1S&v@;|!4J9MCeu?4zAi$H0!anY~m5-kjU!%}xooI9v z0Fhi2Q9h}EK8+b^XAzElN7FA>mtY(w1;K#FS`ZaWKt$w^Me0-^=6vmhWC1V`ixEQg zImO1rNEF^GTM*9lnc#kJX=FD-x7|^BZz}WN7)09GP6y`KdAYd_Cr+DNdrLi-&V}7) zB)bv}@>bwm1o4J|W4o4mk^%$)2t*QdIZxDg9_k#CcUDqNNhOSSB`FNlIc;BoqUZ-o zc!qrYWDUo!Yg6-%sO0UJT((tA5auQ}E}g ze)ht#KU!$UYXeA#4sX3sBxYn#r)J5gv9L$L%Y|8YY@77{8(AiS2|$XrvEShd@P(hK z$$h$y#T3_(&LHZh!2J26x)C{ombK!Ha9v4QJ8NrN@;)WcAjr=uEKv*+rsd^EN3E4n34f80mrIH`M2K{DJP?aj$y|`Bao>C)u6hZz%)N&Yw?t7fLShaff(4wRxC#o(@gs#!bJ!zeB#G@kTV+8B-yejud1+hFL8q?Q(yXpF*0h z`y$R|f9h*fv6cj{ORF{RH1e>VzfEy^>>zE)ng1)rl8>>!eqFw$emhcDNALP-lJV1v zZPAZYgL~n3Y+P+U(Qnihw==189t}RR#$t7>6-A|BA@FKmg{;iMt-^+MN;7jdrcTk zIZaLxok7~PEy{&E9N;odfTr|ZknNC1b;zc5HHG@qwC9=tbN7$!^j{q5^pN5-xf#BoBswse%2zC!a;qWQ=v{&8g6i(hWv(`b^JLtut=l z9!zpN4a#M<3|WNI0{arNu#l_5X7+%oURQz { bottom: 0, left: 0, right: 0, - height: 80, // Set a fixed height for the navbar + height: 80, flexDirection: 'row', justifyContent: 'space-between', alignItems: 'center', paddingHorizontal: 32, - backgroundColor: 'transparent', // Make sure it's transparent + backgroundColor: 'transparent', }, centerButton: { position: 'absolute', left: width / 2, - top: -30, // Adjust this value to move the button up or down - marginLeft: -42.5, // Half of the button width (85/2) + top: -30, + marginLeft: -49, width: 85, height: 85, justifyContent: 'center', @@ -143,8 +143,8 @@ const AskNavbar = ({ wsStatus }: AskNavbarProps) => { }, statusIndicator: { position: 'absolute', - top: 15, - right: 15, + top: 3, + right: 20, width: 10, height: 10, borderRadius: 5, @@ -162,7 +162,7 @@ const AskNavbar = ({ wsStatus }: AskNavbarProps) => { return ( - + navigateTo('/memo-list')} diff --git a/components/login/login.tsx b/components/login/login.tsx index 32c27cb..63bab19 100644 --- a/components/login/login.tsx +++ b/components/login/login.tsx @@ -137,6 +137,16 @@ const Login = ({ updateUrlParam, setError, setShowPassword, showPassword }: Logi )} + + + {t('auth.login.signUpMessage', { ns: 'login' })} + + + + {t('auth.login.signUp', { ns: 'login' })} + + + @@ -150,17 +160,6 @@ const Login = ({ updateUrlParam, setError, setShowPassword, showPassword }: Logi - - - - {t('auth.login.signUpMessage', { ns: 'login' })} - - - - {t('auth.login.signUp', { ns: 'login' })} - - - ); }; diff --git a/i18n/locales/en/login.json b/i18n/locales/en/login.json index c4d15e4..016a55e 100644 --- a/i18n/locales/en/login.json +++ b/i18n/locales/en/login.json @@ -67,7 +67,8 @@ "accountPlaceholder": "Enter your account or email", "signUpMessage": "Don’t have an account?", "signUp": "Sign up", - "phoneLogin": "Phone Login" + "phoneLogin": "Phone Login", + "titleText": "Awake your Memo" }, "agree": { "logintext": "By logging in, you agree to our", diff --git a/i18n/locales/zh/login.json b/i18n/locales/zh/login.json index 1a5bf24..fbc9311 100644 --- a/i18n/locales/zh/login.json +++ b/i18n/locales/zh/login.json @@ -67,7 +67,8 @@ "accountPlaceholder": "请输入您的账号或邮箱", "signUpMessage": "还没有账号?", "signUp": "注册", - "phoneLogin": "手机号登录" + "phoneLogin": "手机号登录", + "titleText": "Awake your Memo" }, "agree": { "logintext": "登录即表示您同意我们的",