From 651a7e5e9def91b640cfad2a04dccacf1902e6dd Mon Sep 17 00:00:00 2001 From: jahongireshonqulov Date: Sat, 25 Oct 2025 20:13:11 +0500 Subject: [PATCH] feat: changing language done --- assets/icons/Vector (8).svg | 3 - assets/icons/ic_deliver.svg | 3 + assets/icons/ic_eng.png | Bin 0 -> 19575 bytes assets/icons/ic_gift.svg | 3 + assets/icons/ic_help.svg | 3 + assets/icons/ic_language.svg | 2 + assets/icons/ic_like.svg | 3 + assets/icons/ic_orders_svg.svg | 3 + assets/icons/ic_promotions.svg | 3 + assets/icons/ic_rewards.svg | 4 + assets/icons/ic_rus.png | Bin 0 -> 15318 bytes assets/icons/ic_settings.svg | 8 + assets/icons/ic_uber_pass.svg | 3 + assets/icons/ic_uzb.png | Bin 0 -> 21574 bytes assets/icons/ic_wallet.svg | 4 + assets/images/img_avatar.jpg | Bin 0 -> 4468 bytes assets/translations/app_en.arb | 21 +- assets/translations/app_ru.arb | 21 +- assets/translations/app_uz.arb | 21 +- lib/core/l10n/app_localizations.dart | 102 +++++++++ lib/core/l10n/app_localizations_en.dart | 51 +++++ lib/core/l10n/app_localizations_ru.dart | 53 ++++- lib/core/l10n/app_localizations_uz.dart | 53 ++++- lib/core/theme/app_icons.dart | 24 +- lib/core/theme/app_images.dart | 15 +- .../presentation/mixins/account_mixins.dart | 21 ++ .../pages/account_page/account_page.dart | 37 +--- .../account_page/widgets/w_account_body.dart | 208 ++++++++++++++++++ .../presentation/widgets/app_list_tile.dart | 2 +- .../presentation/mixins/main_page_mixin.dart | 1 - .../pages/main_page/main_page.dart | 6 + 31 files changed, 621 insertions(+), 57 deletions(-) delete mode 100644 assets/icons/Vector (8).svg create mode 100644 assets/icons/ic_deliver.svg create mode 100644 assets/icons/ic_eng.png create mode 100644 assets/icons/ic_gift.svg create mode 100644 assets/icons/ic_help.svg create mode 100644 assets/icons/ic_language.svg create mode 100644 assets/icons/ic_like.svg create mode 100644 assets/icons/ic_orders_svg.svg create mode 100644 assets/icons/ic_promotions.svg create mode 100644 assets/icons/ic_rewards.svg create mode 100644 assets/icons/ic_rus.png create mode 100644 assets/icons/ic_settings.svg create mode 100644 assets/icons/ic_uber_pass.svg create mode 100644 assets/icons/ic_uzb.png create mode 100644 assets/icons/ic_wallet.svg create mode 100644 assets/images/img_avatar.jpg create mode 100644 lib/feature/account/presentation/mixins/account_mixins.dart create mode 100644 lib/feature/account/presentation/pages/account_page/widgets/w_account_body.dart diff --git a/assets/icons/Vector (8).svg b/assets/icons/Vector (8).svg deleted file mode 100644 index 40fb2bf..0000000 --- a/assets/icons/Vector (8).svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/assets/icons/ic_deliver.svg b/assets/icons/ic_deliver.svg new file mode 100644 index 0000000..1b95eb6 --- /dev/null +++ b/assets/icons/ic_deliver.svg @@ -0,0 +1,3 @@ + + + diff --git a/assets/icons/ic_eng.png b/assets/icons/ic_eng.png new file mode 100644 index 0000000000000000000000000000000000000000..8be3aa9a33b93d9c2d2f5b600987f3c86f0a5b6d GIT binary patch literal 19575 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 KMNUMnLSTa4PJXBW literal 0 HcmV?d00001 diff --git a/assets/icons/ic_gift.svg b/assets/icons/ic_gift.svg new file mode 100644 index 0000000..c9ddb81 --- /dev/null +++ b/assets/icons/ic_gift.svg @@ -0,0 +1,3 @@ + + + diff --git a/assets/icons/ic_help.svg b/assets/icons/ic_help.svg new file mode 100644 index 0000000..e79cbce --- /dev/null +++ b/assets/icons/ic_help.svg @@ -0,0 +1,3 @@ + + + diff --git a/assets/icons/ic_language.svg b/assets/icons/ic_language.svg new file mode 100644 index 0000000..4da9bb6 --- /dev/null +++ b/assets/icons/ic_language.svg @@ -0,0 +1,2 @@ + +ionicons-v5-l \ No newline at end of file diff --git a/assets/icons/ic_like.svg b/assets/icons/ic_like.svg new file mode 100644 index 0000000..7162ed4 --- /dev/null +++ b/assets/icons/ic_like.svg @@ -0,0 +1,3 @@ + + + diff --git a/assets/icons/ic_orders_svg.svg b/assets/icons/ic_orders_svg.svg new file mode 100644 index 0000000..b45ffa1 --- /dev/null +++ b/assets/icons/ic_orders_svg.svg @@ -0,0 +1,3 @@ + + + diff --git a/assets/icons/ic_promotions.svg b/assets/icons/ic_promotions.svg new file mode 100644 index 0000000..888aa32 --- /dev/null +++ b/assets/icons/ic_promotions.svg @@ -0,0 +1,3 @@ + + + diff --git a/assets/icons/ic_rewards.svg b/assets/icons/ic_rewards.svg new file mode 100644 index 0000000..52c5bdc --- /dev/null +++ b/assets/icons/ic_rewards.svg @@ -0,0 +1,4 @@ + + + + diff --git a/assets/icons/ic_rus.png b/assets/icons/ic_rus.png new file mode 100644 index 0000000000000000000000000000000000000000..dbc0e4f10448cae8af69e976a90ac7904c37619e GIT binary patch literal 15318 zcmXwA1z40#*M0y21w{!#R6>wf=~5b5Wsw$Kx=}%5>24NLDM<+_Q7MU~LvletNZB={e^<_c=3jo)GmX@|P&CQ$P@ONl^igfFNSnBW zoO6DpsCgdz@i}i641T}hprGdrK~&9zzeI7|R5w5&ql=ubi-!G67x!mQ=8(I)JD-&u z()q zutA>YsQ#~N16w9^Uire1_L8NoZMkciewi$KwAx|yjXpV*$iv5voF31%i_g{j`QO`< zH8V?bHnFJv7)gFP=Djm+_eP`Ps^P9Hu961gR7I{#lv!!K8C~JiQMyD=?cY;KL(MsH zRE6L&L8jhe+h?0x*-xsO+vU9)9Bh#{^o6ajVi5U|IwVX%0bVVaVZ=H3x!i7beqZ2~go>S}Pmm7~wOw@m?uCDHP5nxSKhfqwt z`Ubqbyi+`#Nd>VZ%J3b!Xrq~>uz6E$O?Z58n}Pn4sLiNfDVU1($t`G9o(QVw9T?D@ z-}bVwM(69>pN6<$LW(nWoMbkuQ+m8C>XJkxUWokCN zu(C$qh1$-4R{uIsvBDmQkncG4>*E(ly}+2M3jc`Jm-!Ow)x5e(u0l>s7D|jNyGj+* zIk~>~jLoSQv1s~iojHYiNFQ^HZP&AI!h3Ubb10eW+!i@0WR+Q7UjDseWnX`3O3sXh z+A*>Fbv`{qbV3|rmopPT^P5cJ4jq(H`}XbIvG3o%H?T1s74?Y;*N(18Iz$Le1T ze|*|5O&+y)7gA8vN9u^(d;mutGf|5pzIE~SDF+2h<;Pa%ef>Ib_0b5W2`7RnT?lGQ zpIYCmj73nwGq5hqrk~2NOLEf>(Az7SnVBp}-6S@TiBOK=;o+plg}dj_+r*gz53)8P z#V>J)!jTGJ`P(#A*+78fF05vv6wo^`-V2-22XgQy4AF>wPl)`D+_XuBElyKk{~%yN zpzR4AB&LL1x%B3dd`KH3n^V-9{S{pvw#tf%iisBX@V~d~_rFuGtgOgZ*VOcAE2VO> zT?Mmoetn8Owuo%q%zpLi)upT^*3G9-lx6_T^m68a9@~Zyb-Q3HxdO@f28R2*pMjy_ z(OWQ;Asuu(1v^4P7AS8J?^=)b%36?uRU?$@Y({r3`C(3X3jbK>*B=bKXihVepI&7iQK#+X4MkJ-D9^ z0zq?+iEJU980AMv7RaH$#KM``O-qddlhI$WMBCGaLS!gn)Pp6@Exe~v4hsc|j42{7 zcnoNw;@h`xEiTtG7$_hw^xS&QoX{ExXSOQb?#ua4{CA<@oJ%)Erst-ok6>`VtI^Ma zIBj&2gU9G1TMN0kxha#W0tX%wHMnh$mD>jdA3cI|U1}xj^-hLQA52b8;+zMeiXdWC z;V=D~SB-z#m2%R;6v7vzpaa`-Z1u$IF0O?=r1(AsRL^$pVmEy>F1QV!RSGG5P>V&( zF)%R5m`j{T093NE^^J^3@X?1E<;6;jxzI!HpUeFKzsO>6nC~w1ALNPJoCpg0@@qbh ztpo-)d^-gx)bmkSeXglF%nbz`*Z<6vij-B^3N77ex^^>j;50-b8muEFv)s5aHkY4| z?}T!Rq=c4~m69~Dkt7ZwYK?A9?j~;d=59NB^3=*|p))J6L5~i_(>FF|Xs(CVQp$O+ zVnGz8UxtkgX{+Mk;K)<42oSyt>A{dIRBs+J1S`}9PhXE9VRd!2L>I0d9%H7;V6*9v z*|+%k_;KFOY9n}7VmC3X?U4@r3EkWR=&8 z(}Wmm>*@WrlekC|NgNdb$n&LMylZmsJHb>^*oXlio5jKLiG?cp!{<*SAqCbeYuuRy z)Y1KKFa}UadO6m;#;{-$kbRPB(8K2f3TDAz73@5n)q3z;!ZwOUEYbXYoSb@=66eVx zh@)mlMn{91pBKwmp(BOB1Xz!T6*qs(r%$GV3#{`p6tL@*Zyp6%qF1jl4^lRGs_HNG zD=8^43o@NMmL*b`9(8jlv!jDBN}u(V@s-A&b1%|BnPQVQuI7^`K9! z*=!rO7~E+A7*@K|1=@XQ-&u;|BcM+oeZDDb|Jn+}Jusuz~OG*qPh31tKTEA7zb zaSIB*`CNh$T5fh;_c)pc)?c0#Xxe%g;^ez>{$^fmwHCYsYz$>g0W5(Js5g6ob@%}V zEY#Y@hG%Wx$G=w}uq7#Uu)uF*WF%u2U~2sZ%J}3UCN)yAawume3KnOIdf;4T*h)`N z&j&VU((*i<4y@kkwe6@qMW77or@(*Akr?WWWSD0X=j%g>qu9!@1z@T6dRSSuNzqht zh~}$091jc%x)o}Ad(JU z`&7OI1cyVS8A2640%)7UB7(=5FOu2+()U&kYJZ$U?4a9Ybj(Z>y#P!M7V0s+;>Mz( zu6{Q2BO(WNXXj0igwE{`!52k=U=Tl*5;|RVpFR6~Co9m5k^&_Q3^;(z3F8pL0@#P;gNj zDdg4-bW=L_>-$f{9qLoZ_i(_&WPz33nNI-BpuT8?^|Pl>e=R8G*!AlPQIoP>c-3ec z5-i2ac6cL#7+SzreRL&y*#A)I5-DpVs7eh!l865Qb_6BDkaci46*s`JxrFk6pP}38 z0@qTw*noAK0$s8;+4SnO=pzst9~W2?U&)~^(40TFLmO@JrjZ4T`HbM)_7S`J@tK4| z)+gvT4EQWV&h6L1bcB%^^M@-|vI86c+ywIyk(#1_5-LHQ0fRfK0)+8I@v}ve5eKBJ zk}JB?p@`1Ec{FE@UZtmwT;PGC@OQ3^^e zK01oypDs}@O?~IszZCnC(0^83JgD?Ed=Y8Z!uthh>?~6*ry4X zV3)>=F#av6U#oLjAd2>yp~2vKaz;`=LCbK^G>X(8iqbAaERwghw1_5C#dO?-B(I!5 z*R7*;jCG-cU};v=;!S|G?IaX(zd$zfJ*s|o_rR>Z_KwuzjjOw-qb^avqYuATzq`eR z-p0L_i-Dr>U*gS~3^X;jJ}j{2yd^G*`^P+9F!&h2Aw=`VfYa5?(Q#b^NQj1_fu1;^ z;Y3<(yA$vl6s68oVatL5e!B#8ens5Ne(mCut3YY;2gI-}3TyOb9!^fr9xyA6=t?w< zRRC!1ZSX}ALRU>ywvtNRs)?OMu$3OB4GlsGUC!;VfK*^2cNwDP0|BrWShLJsiF)~Ha=lTEF^*z^$eggEZ0pc93LAw0SOLcexKFnsnD+2j}$#4#8)no zErIywK9GRv&yc?kVn`PDl(?=tbQGyy%TH>|7SdRtH4b#Su{r`#((7_1+k70l22iJ= zB+bF5=ZhzY)-t~a{{-aUlSDO{kr9!rxdfl5&UrySdM~X-k9C4F)1nO4OMc-N7_8Z1Nw)cd;0f3m!aYMzrQTEh|uLj zE?4fD$q`^F8rtRpzy;-~a^7dBqZl`p2%;4_p@ZF}lTbvay5>m|LC4wU56VG|N!2eN z!_-4hX^Z=PBwCm3{;#~a`kCJ3PmSnFLz4anyKjwKdRlhjQFwdvN(Oi!ErRDC5h zNkE@5Xv+Hi#Rn?|T{ZbyC;ZR$6aHA{O7ug5 zi50zhTsbOT{LgvU#c5|lAWl*xfJ8z1Dv*BesxJX<4&GU^`|>n`tR z$!k_r1xS#>OdGlubY<)6uY#Yk`x7==N8h2vf38nVIJ9oh1`jsS|)( zfy7wtMt3s$`uZYO-U>V*G1bGm5_aCk%-2~`AjtIHl3?$f@M+Wcj9}Y;dQAl^U5niLssbUF4PTf=(DzUuN8(D%O%iMFHMZ)#46prXuA z*y@6ejN9`AL`;Y;(*JnxtlrJE&)SW0A}oUX9Vb(FRfO;>*6AGIjW5KQ+Wk^ z`it2L3xvAp?kME`v5eqABI%=lwU2<&8SV5z01};_dS{cafmCr!6ciQC(H|&A$I7A3 zn1koZk9xpfY!wJ=8{jYd;HzSs0D4QC?~6?!sN`K{`I8RWS2PbudM73x+`b-OKtpZ+ zW%m*UqhBoI$*Ta&tik48&P3R9JG+Lo{m9X-ZFJ;&}mp$%~{NCH2EBD@; zpC#i!i1)HW&?on@c-Or6_(5g|ROq%l3qIi7x6{pC{*x(|dQ&iYgPv?plJGP!byWpM z@>(w^s%OYOMIvg22!fsFTfR#XiCQ@{g76-GnWt!Tv@3}?0K|NnXu@0h@uOjKj^puq z9O<9B%tr24OoH^ML?AH#%AWN=&%$I3N9Y)zZ!7Z|GfE7h0uIe=4=WF9Y%vrK-{m@y z#wH^Y85nTchT2={W<`<5?5epd5i?sMo3{HYJzq;km_jHkMm zZS=IJFqsHK-41Rp^I4PI>#MgLnj>CwlpX!+I}Yw-Z};3WaoO4*@JXX+SYHhZkK zqH+qD;n9TAZ+*wE<5Tovr-&~Xl!gvJ`X-rm7!R&?Z)>@$C^!9g_^RHfKbyGdOYu^0 zy&N#JC%VPOn_uf|F+-%LGfJtO6S);h_41&ieWyDVTb-#~URb%h>Pqx&sywoL?Aqe& z#3_MMemH23Z|}sA*7^DuQZ`sDNz{)Q!Xc=EI;{|SYG;odT_RrlHL??O90qooQZyYF z(O&0kUr1Q+$rg$ODOr0Qc@D7jO8Wg3aZ%|Co5%JOqj|(@&tyl%lk&h63RV@^jg!S* z@j6dJH;bj39VXq|5cKDD57zbOaPsa-88o)H*Y{;tyF&Y-6b2C@vDG{3HZ!!Lfsm>yZ^iS2UDBt{i z1#R+~h`n#~_4tmIG`T{cXP(CaFb*p#^Ztl5s&7riMLx1aubY1m5oG>*xV*_=&%P3p z+Syo)iNsj)EBS!UMcJ?vSaEwEg=da3wN@HH#zxc@{a4-l8|1+0eHNrkEj}x|o>cw#wkYto4&O)O@kSNf2SXGv*}!h2>f%z? z{b)erCB6r8-qF~R%Izf+Zpa;T(tayo=Ywz#s6v#NwM^*m;MU^uh z4<@sj+!zIABIjzd#c2t1K9l|GeSj_W^}Pgh&gf1&Q`4nnw)6_W6>ic$1S(m0TkvQO z2nA(kQ2n{oV@ZF!t?$ov#NiGVvUVZG3N2v@mFBAUX*1mKWz5*btqsOcO{yCpRFML zFaDW<--$UmyBJ*RqP8Qt2*Jn>*sgF6==)doo^}#D^iX!Xk6#IO03d`I=fh_0mQE71 zeLQ7Q{FDuc$dR3)5f#ARQHB8S-~@AMdverCT$D37OL&eE(tUxP?&Kz_=Ye?9<1f0J z3E;7`3ty?;pW>&4y%5v4{f{8~M;hO1+%{WH=uuf%%bb6*N!Fh-PnM~G!^^O_f^^%7 zVPK;%XhFL6@uOl6wvEDscpcIa&+}IxC^5f^H;dWBRqu_08qwZzSOn)wc7ha3%j0|M zgH`DlIH5*2?^nM8f*LLa?6jSW{z%-*9I|-@aCQmo8}|e4jBE&SAJYBE4eaE?NcHkx zHfd7UF~&Jg6!6Ib4i+w7!O-W+oG*h-l{_qBH|FZofb>V6@4uV^C3o%xrN03^J_!zV zse&GD#NmH~)!@w%rxS0-VDj&hf%2kAlMJS?;gS5?dK1{JU;4=r1Y$8o^71xzOLVSm zz7t>qa20Ef$cxtI;k%y|2*#a*%US0a*cn+#oCiXBVxi*`JouX_Pk;%CLM)s6rH-!A zxLe`^E7+H~(YROC;MG!P6>=cs?uF1F%J~Ifjcoq)y#4YJ-K|gyj*ftUQo4hU%v|A< zp8w`>aT%@BmLHe}=Q+qMdPjk$HS|Z>=)ab_hBdsSgwqyq&(4z-ZU%w|K-Zv|uA!m! z7&iXj)Q)Ig?(3DDXB8fX2HHFYasMiQeX9U|4UiN}B;-fAuHdN4MKFJcr3yD_p9t2; z8rEz>otI4LTB796Q;@Ga_P-{ElnD?q6!nJZ@-ERih&9i{P>ClpS&`5%WN4)?zSZ37 z->Rheo`8X(T*vq_c`KC#fly)e`?%}SS*ey3pSgiu!sHVeSTuE|!SDD^8Uil$nrT3} zvLinzF9{yyaP0g7N~5$4<3sfxRB~INNiCw)yd_^ME%XBw*g?wsRcBW{&j)!;|0HvC zQzs~H$+0}?U*%NsBkhPGivRzu{FQb=E5-jhE;*9&q_tX$oN29fDPA?cC;htWnVQ->I%01sbacnkgU^o;eX2asKs)1E;;dwo^`x4WR5OcR+w;7<|Le)P$Y)&F;oVH z+H7nylpjMy-=xPcr~`pkaUD$0(BlH%P;9YGOo z2Spv4fY{r({^ueD6MQ9u8)O5Zrf}lH15=05-|cYrzXb|HoyPOtWdRvS++C~E3EiSY z`J^3;*?{B7pVyOyL)l=IhP2g_hJPhrZtlZ?HL2Xts`}tf1YrLgtkbGV8Al7OFi3^h z#6>K5Zi3JGjBn$vdPs=+ADI(fGivCRdoRz5U4^ zV5GTgr^<#D=ONh3lGqrlbV`$hjm<8Wn}X=s_n-Y(5{LoV0&>asmpwIdb!-S6_9?a` zucOxX<#Pg+wS1fhRN10%;_O3 z*xHxcw!9mwAErj|Y_LpCpXom-MVr5XLQ39UPq{Jdw8ro|7hK(GUf$q!=R1oUauGcx zXp=*IqHBm{-_C#J8Rxfp!vM2WPAu?6XxGtV5{U86yPTh%HcLbG6~k)Cl^ZS_8b)2V zf))s{y^Nf@8;jxYKii)wx!Ug^484S65z&IOn+B<2fRkd($BK^Duz{F15eigrTM^Cb z5Is0;qPB$d2Wq-%j_gVy&4ao^jx#U%$TQ$@(6+9=i&*`yyL9Z>nUfiu@!Yjv+P0lo zS3{!7Qjauit9XAf0dy#6#Q7E0o$x!48Q{(-m`MslN}SR!El;wh<$)o$3*`z`S{Z6b&3(Zd5b%7&C2c3E2MjllL0LR4k-NcCao&*B%A-Y+mK^Zhb}ppClDI3M z(DFV2sKK01xxG25HrZ=)!Z>o#+i>mCoOj-c(*X<6^X>lF>Q~(@nBOvmqN^)|7l9@U zv^))|fGJVjFiAaiI}4Tt>~v4QpR@qHKe;B!v)VmTUpWMvDt2N~_~U}%=*aiKX7MO-x;LO$NS#{tK-pFq)6CxTVq&|CAvb*sP}Qx0e9xf zN6i%`0)0LG!GU3(YxRDWaW@z&N@=4u{@wNX-DJX%;MdV%P&iJYs-URY{+|>IxQ88f z#-93KPdhxCI(of$B!5tS353}n*R}R9Z@DHvU_eRB(;u7E_Y4ko0qxLCd-5`x=(xC^ zon*vZ@n7H8$ul^DoDURTQP1$?_8e1n=Lk5<6kheEMQ*Yz_JC-CwfMh*X&f$X`kus{Q^n^282^o6K&xx3-3GcB5=4d$zB0iEC^A#17E-L1BJFx;u9dI6RK-)<8eg zgoW<;YW^zuS7~4P>rI;P>epiQ@wgvscbiH2-fBgF4WXY!^Pe#TvJ&4y7V=u&g9&e= zG!qZ!1Uuax4zLn2_+`eMNSVn|PYrwN(jm3e(Gk>3Xy9mnJ*DnWy-1WV*nNF_YE`Q; z3FDC*nJxr}J7uZWYF1U<2R!^l-7aAoFNn`3nNVZQbFZ+ot2s8`+se;KBUc$14k04`S9bk%J_CId{y)>sp*<0W&Ghz@`2Tt zT}luNZ7>zhwO*BxG6%mW$1d&Uw@>l^je!Bxx0N(Yn~!m{54%3%CmHMO@O@$#QG3AL z1C9@$(rSh8h=zO2q+M+vcJK33aaUvXe^IgnZe>K)o+Pi;n5{@!k$%d(=a-4pRK2Zt z2<|%GSGnbcUp!pN#5}>Cyw`>_ed|_6Eh1~)mxFx^CEEYUkc>qrdiNS5bQZN%W$@$$ zBcF@Sn8B^B$_p*69|O%f47azhwU1Rv%*67o26#)y{(J$<&dTZK>h|g)C5`t~8k*x+ zU)mcdt>%7-S8aq2c#Fj5+?!^3i5m53TT{0WA=m7iv|C+?>nmaY2yR9 zB#^+}5##ruhk!xtM~PAt%>(G|85V(yf`j$z2%UpPUgrac13cX;Bw**BWG`&GeHA?t4+ zXOQ57&%tyHq@L9W4`{KhaPiN~!XVVUmvQ^HTE<(K`o-ah3}|575Ys5^UHIngdRwJl zT=+!j2#-UHrpn%y1CCr_<-??~;nZUXJywX7-Sfvq`@)by=~0)6E<_ge_259ao5(wr zpNk`&1At9TDa1ZanooUqJV7YCM#HYms2EqNK=FyU^M8s~X$?D(q84S$SHAsYUf z%Ou#NWt14xbpb-HI9}q7^m-g2*5?wzq_{w=eweLHQctp5Jx0*h!FTBw8)|uW)%m~A zsx_cw^zhv4%<;l{(GEfbw;!du8JX-R7>lxno09MQgrQ{5#kW68kKR-eWV0MR!(UeS z!kS7rHC?pt3#5tjZ4$y2m-@c|?`4qWWUA=W+eOJj18WI+`-~P&RF^j1zb~nc(q1bW zJZ?2$YY(3o2~TEXvb)gB{m;ovOG~C+_Efx$bp{sRUnYVZ60}FUC%kO$rto+9 zWI1nX>32akvy8%CChlEP!G!0o<(HT8f=8OTsDx6}W%^1W&2bmK(%pu-ZkmKn7dk-A zB|PhR;hFrW?nXFE2_^rG8N%{^8n5~63Ky>06W#+4_oz}%49A@*`!}-vqwl2>4d<7d z?HTUwMc*PkUH)#l@8uy@k+q=SFAiSeC>!<;7i;PcRTE$AQ)+ zK-ZMxR45Q?iexN?sOQ*=(1t+!Z#o)~_Bt{Sr$g6(+ zvCSQ6#MS9yW*}pAZR3a?X0hY1xq19ZkyMVSLRo+d1|}R9gvI4=I;0XL^>Z>+a`SDH zf&V_hKuD}05~?V3!mRQ{)b8z=5jMKeBkJ5SS*>#-IOq}q@B9iZpxPWterxe^ssF=g$%a;=NUj@{rSQ?MlresV%Yjynv+4 z{ZD0wrCpDh@kzI+36}xgMQ^p>gIm&B*psOtqJBM47mftvkUZ0ikvWY* z=AODXab%@uT&HMo%a_2{-l)O*9~k~hp@vXp8L`thr4K9qUOtJI#MqILnv!cXd1A+n zBBf4k2`KkXa2~EdWj;w8jSx*`*Ln)MJs+&?$1izJ&P);Xuw~pm=F5EJWWXd+AeB9? z_`JiNw=#~0>-FiEy#@%zxVjfH>`xtd+Wi#r`i%da9Qkv9w$_5sby*i*T$)zsy%is* zI;TKRhcdqI*Rwi1-7PciNSJyw-uq}Q0m<@h0oE_xM~Z|FEC+whNeyrJmdX=|bnnzB zX!TTc{6!^5RFIeW3~e=auy@zWY|K-(5}x9(w2Rx|T7ypKDwkt8 zs*x)|+r*>Gaok;Iqj2wsDjy*|>b-8@k=ummT&k|C#&KO%sTl=jyKyRYs=n6dW* zY*C{Hc&j!eMp}B_+btrQ)x^2Ygn?!>Ai;}A=IE!%m*u(#)P4=5}fqAm2Zd4hP9iX$E4lA;VxkE z2now)z-{b4UsL0wK#^Dj#r{m$-|W_Tvp>cSK^09MJ%jaAv&QY@N~P}$7SB#HC`EVsZ7!i(34^1j#r`s%;9tmP3(UI^7M&bxN-nkzzl^ zd;`<{q0>T`&80ZZ>s>r~DM%7UtnI&aL|q&iU&na-XOocP0Tc3cV`41&FCzKrZV%4K zT0*%Z9m)uH&r12r$s5kMXuLJzch+nVoM-Cq_Ds0)kNq~6pakiX7TeJl$9yI8<(tdh z=lw+?p;vKB{S%&t6Zeh+WIiG#C{JX_66wnDDF=a)^mRK9HVcb40bop74PCXUdw#aJ zQel>=TU9L@b)G_qfswouU3&kOCI$%>?`MP@%1<&t20qMbWurfhP8{^!FYxS1fGkXd zx<4@{^2~-?w2}iqa92@fpC~rUR*R1PC67Md-~*|EqphD}$h6aZ+GB@DS$IPE^o-B4 zJ%hayMv9ij*L$D(WAIx2dPOhjQ1{lmV}+&6XLi_uKaz&qFh`NHw%p~I(9OnUHFo}Hy`=4HQLuQwR0>~BUGmju?% zr{ZwGQkV67!`;=baUFPP=MK~6a2f`rjQWBE*B8hqRnr@7{>BG#wZ#NMqL!b7U>f(i zv>>N$>7Y}^;^C<})HlX3bY!lw`z3)v?xSbj2(XObjgrnABV&3Rvs6_FUpTT#Kb_u% z7@rTeGn`f&{BGCL!X7kJ6~4$ zazN4w?B%-3D7x{!+w|C9cca6Q1s;Wq6fiP<-vhP6MZe`YY0X2T#UfAxN;gpHIbQKa z0pt2loFB+$q6s68`mBAt7=P;ky~`3VwKGW<(yH1@6lKSw>{I$5Ce1+D%x=bLNHi%T zu$hpu%-?<75@OU-?`h!DzTpGZnnAw%HK{x0I6GC#^-zma)#BlXI#kloaUkiG-}9jM z&c^(v{ID(4Q7Xyse{oB+tA5@OIE{*5d`mW&eId}s#;sQ4!+&_Jh7YUXbc_QKM})Z_ z;FoH>R~-!pSNXihUFgLEiKE_NeO600YfO9&bB9arivt7;bZQA_bXE>Er(wqq4{;y5 zi7lQ&B?E+c&06mGhn>u|Os&kao>HNBUR<3S1sGuITN%f_td@~n50~jg*DYdy6}vy! z)0r-2*y$aA+V2S6P6Q@cvzy`W`V3#p&V1Tw-R}u<#R)m*4ij-fE|`M}lk_kdW`IA` zw1e99n)b@k`S-c2^?1d8JyT{<$fS7DfZ^oc&X2={R_%OqUnuI<7<-C(7bozr8RZLdf|B7AG^O}b6I9sPGeH zT7w{ayL(g-$vpxf|eAL-2VM$=yHc1 z=A_U_t={LG-Gy~~GKHtwjsZJ21&%rH`wWLP`Md9X^?OE*?7fUIHt-%%%YBYaW^lu7 zb)UG&Gn~4i=$_5YSgxkj;npH@B^>AN{W?1QwkUATzbv@xU7w+^+F|MrP%`)_<3lLnN}ks=64JNh)&>z0x7pXYt*VLvuSVeoWrG?}ew3*g5cJh#7^>;2*o5X`|K7yj-cg z$=L%Duun$t?THxgbF}zuN?LQgsNogBlTP593YVG0dm?`l#b#$0BjRLqcE=gO$`juZ zqcR9aV=;PZsc_YAeI=w?__+jC)IlxtI$ql94f5z~7}CDrv~od=@Ii;z^B2dL*sJ3U z4`sK0i_ZSQ-gnZtWy+0Z#jK=?Z*#1Et1b;P_WhL&b_qTa`SbPC5bw{(qg@Opl-Ia~ z^`JeJ@DWA76s?=pF21x?#yLy1?$eRCe0frL;POKvl;9-`6G8s^iuF*u4sN{P?t&xZ zt&+D~T)p)RHU7EQWT&+|{FwS47iP0N;9D01-|a3A>zQiqDHdMITN|_F<}?;)TA?WO z5bq)CTe}76%=0`fM^lcXMpzpOnvxr&5NGD!BNKei4H2w+-OkBPZ=>{4!Y4O|SIr%J zw#IQg;W>3KZQBX;rV^Kn7(sKzG{?8uw&ZRDD)id&SeJ$Jz6Ok7%?w8oD@r|_@U zbt5;vMaZwSU0qkb%E_eh= zHo~*mi6kEp!SwY^{F~PHl74WrDaW%=8yu~J3;V=~*EX|GA>KAdz0zKL?+b3t$mG>m z`6VtW!0f?SHx<{rj~4iLvi{8cnzYH>u%>6y!|FBVnk<9u{e*fe2`x%O1fVe{<=7nvdsJYd^vvP^Qq%yu3E48)uo{i z-RCaS;ciDey7<<)+Zx~%*W-|CA@#fM1AC!lX$vX}G6jnrUoCb8)2ie($EOMy{bXk% zF{5@8v{4FlkXfzkoQbc4Sy#35WZqC$Q3B76=BuQ`^xQH!HEvA5r*oJ#a*@MPGM5gI zXTnr0z$ah!uiLo51+ViEpYbu1cULv-m(J^1KV0=0*g(t?H7GK0n!{G|vMa~SxBqXkIr6_|?R?(JC$AYhW@vWjN2qq^|EB4> zYN>U!QHu_xcuz|77eg9%!3~;-p^K3m5B+{T)A^q8LSvbn!=@hcrI++{S?u5(VN^3v z@eTRb@2;nKk6XFiiNsE{jL;tv>AfFh%P6eA?YF-XzAuni7Fv^1KiuBN{q*#-{I&!; zyXAPL*ijDc?I^yUw#BQ~ZJ%_Enp(@Y;91~MZr|jtQRaySB}MIS!ay3!z0^wzcYKg@z9J@-2;~obCGC$5E;5=Z|MFn z*piE~LCtR?BlgVn(h>YS&5_So1e0}VWwO3cHHTT|sBJ`CE3dYmqG4QuOWv0wx4dsf zEgjpoQAcC<(>jg0Rls$)bAP(jetyt@Ss=eywTS)&5Q7O zzRL7s~LT + + + + + + + diff --git a/assets/icons/ic_uber_pass.svg b/assets/icons/ic_uber_pass.svg new file mode 100644 index 0000000..42f1658 --- /dev/null +++ b/assets/icons/ic_uber_pass.svg @@ -0,0 +1,3 @@ + + + diff --git a/assets/icons/ic_uzb.png b/assets/icons/ic_uzb.png new file mode 100644 index 0000000000000000000000000000000000000000..0e7b5d53eb12ea5619d88a239fd6fc338ccd3721 GIT binary patch literal 21574 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 ic$JSP3F?m?aKbW@mCcAk@!-cm=$5(;x + + + diff --git a/assets/images/img_avatar.jpg b/assets/images/img_avatar.jpg new file mode 100644 index 0000000000000000000000000000000000000000..b1d25f5578b1e9d6cb741f6bdcec321e2e6b10fb GIT binary patch literal 4468 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 BT{{2( literal 0 HcmV?d00001 diff --git a/assets/translations/app_en.arb b/assets/translations/app_en.arb index a69e1ed..3b21ecb 100644 --- a/assets/translations/app_en.arb +++ b/assets/translations/app_en.arb @@ -138,7 +138,26 @@ "asian": "Asian", "bakery": "Bakery", "allCategories": "All categories", - "categoriesShort": "Food, shopping, drinks, etc." + "categoriesShort": "Food, shopping, drinks, etc.", + "yourFavourites": "Your favourites", + "restaurantRewards": "Restaurant Rewards", + "wallet": "Wallet", + "sendAGift": "Send a gift", + "businessPreferences": "Business preferences", + "businessSub": "Make work meals quicker and easier", + "help": "Help", + "promotions": "Promotions", + "uberPass": "Uber Pass", + "uberPassSub": "Join free for 1 month", + "deliverWithUber": "Deliver with Uber", + "settings": "Settings", + "home": "Home", + "browse": "Browse", + "baskets": "Baskets", + "account": "Account", + "changeLanguage": "Change language", + "language": "Language" + diff --git a/assets/translations/app_ru.arb b/assets/translations/app_ru.arb index d15929b..f990c18 100644 --- a/assets/translations/app_ru.arb +++ b/assets/translations/app_ru.arb @@ -133,7 +133,26 @@ "asian": "Азиатская кухня", "bakery": "Пекарня", "categoriesShort": "Еда, покупки, напитки и т.д.", - "allCategories": "Все категории" + "allCategories": "Все категории", + "yourFavourites": "Избранное", + "restaurantRewards": "Бонусы ресторанов", + "wallet": "Кошелёк", + "sendAGift": "Отправить подарок", + "businessPreferences": "Рабочие предпочтения", + "businessSub": "Сделайте рабочие обеды быстрее и проще", + "help": "Помощь", + "promotions": "Акции", + "uberPass": "Uber Pass", + "uberPassSub": "Присоединяйтесь бесплатно на 1 месяц", + "deliverWithUber": "Доставляйте с Uber", + "settings": "Настройки", + "home": "Главная", + "browse": "Категории", + "baskets": "Корзина", + "account": "Аккаунт", + "language": "Язык", + "changeLanguage": "Сменить язык" + diff --git a/assets/translations/app_uz.arb b/assets/translations/app_uz.arb index 5d53187..edae951 100644 --- a/assets/translations/app_uz.arb +++ b/assets/translations/app_uz.arb @@ -133,7 +133,26 @@ "asian": "Osiyo taomlari", "bakery": "Qandolatxona", "categoriesShort": "Ovqat, xaridlar, ichimliklar va boshqalar.", - "allCategories": "Barcha toifalar" + "allCategories": "Barcha toifalar", + "yourFavourites": "Sevimlilar", + "restaurantRewards": "Restoran bonuslari", + "wallet": "Hamyon", + "sendAGift": "Sovg‘a yuborish", + "businessPreferences": "Biznes sozlamalari", + "businessSub": "Ishdagi ovqatlarni tezroq va osonroq qiling", + "help": "Yordam", + "promotions": "Aksiyalar", + "uberPass": "Uber Pass", + "uberPassSub": "1 oy bepul ulaning", + "deliverWithUber": "Uber bilan yetkazib bering", + "settings": "Sozlamalar", + "home": "Bosh sahifa", + "browse": "Kategoriya", + "baskets": "Savatcha", + "account": "Profil", + "language": "Til", + "changeLanguage": "Tilni o'zgartirish" + diff --git a/lib/core/l10n/app_localizations.dart b/lib/core/l10n/app_localizations.dart index 142ea89..da15842 100644 --- a/lib/core/l10n/app_localizations.dart +++ b/lib/core/l10n/app_localizations.dart @@ -651,6 +651,108 @@ abstract class AppLocalizations { /// In en, this message translates to: /// **'Food, shopping, drinks, etc.'** String get categoriesShort; + + /// No description provided for @yourFavourites. + /// + /// In en, this message translates to: + /// **'Your favourites'** + String get yourFavourites; + + /// No description provided for @wallet. + /// + /// In en, this message translates to: + /// **'Wallet'** + String get wallet; + + /// No description provided for @sendAGift. + /// + /// In en, this message translates to: + /// **'Send a gift'** + String get sendAGift; + + /// No description provided for @businessPreferences. + /// + /// In en, this message translates to: + /// **'Business preferences'** + String get businessPreferences; + + /// No description provided for @businessSub. + /// + /// In en, this message translates to: + /// **'Make work meals quicker and easier'** + String get businessSub; + + /// No description provided for @help. + /// + /// In en, this message translates to: + /// **'Help'** + String get help; + + /// No description provided for @promotions. + /// + /// In en, this message translates to: + /// **'Promotions'** + String get promotions; + + /// No description provided for @uberPass. + /// + /// In en, this message translates to: + /// **'Uber Pass'** + String get uberPass; + + /// No description provided for @uberPassSub. + /// + /// In en, this message translates to: + /// **'Join free for 1 month'** + String get uberPassSub; + + /// No description provided for @deliverWithUber. + /// + /// In en, this message translates to: + /// **'Deliver with Uber'** + String get deliverWithUber; + + /// No description provided for @settings. + /// + /// In en, this message translates to: + /// **'Settings'** + String get settings; + + /// No description provided for @home. + /// + /// In en, this message translates to: + /// **'Home'** + String get home; + + /// No description provided for @browse. + /// + /// In en, this message translates to: + /// **'Browse'** + String get browse; + + /// No description provided for @baskets. + /// + /// In en, this message translates to: + /// **'Baskets'** + String get baskets; + + /// No description provided for @account. + /// + /// In en, this message translates to: + /// **'Account'** + String get account; + + /// No description provided for @changeLanguage. + /// + /// In en, this message translates to: + /// **'Change language'** + String get changeLanguage; + + /// No description provided for @language. + /// + /// In en, this message translates to: + /// **'Language'** + String get language; } class _AppLocalizationsDelegate diff --git a/lib/core/l10n/app_localizations_en.dart b/lib/core/l10n/app_localizations_en.dart index 2c2a205..1d91b16 100644 --- a/lib/core/l10n/app_localizations_en.dart +++ b/lib/core/l10n/app_localizations_en.dart @@ -295,4 +295,55 @@ class AppLocalizationsEn extends AppLocalizations { @override String get categoriesShort => 'Food, shopping, drinks, etc.'; + + @override + String get yourFavourites => 'Your favourites'; + + @override + String get wallet => 'Wallet'; + + @override + String get sendAGift => 'Send a gift'; + + @override + String get businessPreferences => 'Business preferences'; + + @override + String get businessSub => 'Make work meals quicker and easier'; + + @override + String get help => 'Help'; + + @override + String get promotions => 'Promotions'; + + @override + String get uberPass => 'Uber Pass'; + + @override + String get uberPassSub => 'Join free for 1 month'; + + @override + String get deliverWithUber => 'Deliver with Uber'; + + @override + String get settings => 'Settings'; + + @override + String get home => 'Home'; + + @override + String get browse => 'Browse'; + + @override + String get baskets => 'Baskets'; + + @override + String get account => 'Account'; + + @override + String get changeLanguage => 'Change language'; + + @override + String get language => 'Language'; } diff --git a/lib/core/l10n/app_localizations_ru.dart b/lib/core/l10n/app_localizations_ru.dart index 65d6fc1..ded80b9 100644 --- a/lib/core/l10n/app_localizations_ru.dart +++ b/lib/core/l10n/app_localizations_ru.dart @@ -271,7 +271,7 @@ class AppLocalizationsRu extends AppLocalizations { String get latestDeals => 'Новые предложения'; @override - String get restaurantRewards => 'Ресторанные бонусы'; + String get restaurantRewards => 'Бонусы ресторанов'; @override String get nationwideShipping => 'Доставка по всей стране'; @@ -296,4 +296,55 @@ class AppLocalizationsRu extends AppLocalizations { @override String get categoriesShort => 'Еда, покупки, напитки и т.д.'; + + @override + String get yourFavourites => 'Избранное'; + + @override + String get wallet => 'Кошелёк'; + + @override + String get sendAGift => 'Отправить подарок'; + + @override + String get businessPreferences => 'Рабочие предпочтения'; + + @override + String get businessSub => 'Сделайте рабочие обеды быстрее и проще'; + + @override + String get help => 'Помощь'; + + @override + String get promotions => 'Акции'; + + @override + String get uberPass => 'Uber Pass'; + + @override + String get uberPassSub => 'Присоединяйтесь бесплатно на 1 месяц'; + + @override + String get deliverWithUber => 'Доставляйте с Uber'; + + @override + String get settings => 'Настройки'; + + @override + String get home => 'Главная'; + + @override + String get browse => 'Категории'; + + @override + String get baskets => 'Корзина'; + + @override + String get account => 'Аккаунт'; + + @override + String get changeLanguage => 'Сменить язык'; + + @override + String get language => 'Язык'; } diff --git a/lib/core/l10n/app_localizations_uz.dart b/lib/core/l10n/app_localizations_uz.dart index 69c7487..52cc231 100644 --- a/lib/core/l10n/app_localizations_uz.dart +++ b/lib/core/l10n/app_localizations_uz.dart @@ -271,7 +271,7 @@ class AppLocalizationsUz extends AppLocalizations { String get latestDeals => 'Yangi chegirmalar'; @override - String get restaurantRewards => 'Restoran mukofotlari'; + String get restaurantRewards => 'Restoran bonuslari'; @override String get nationwideShipping => 'Butun mamlakat bo‘ylab yetkazib berish'; @@ -296,4 +296,55 @@ class AppLocalizationsUz extends AppLocalizations { @override String get categoriesShort => 'Ovqat, xaridlar, ichimliklar va boshqalar.'; + + @override + String get yourFavourites => 'Sevimlilar'; + + @override + String get wallet => 'Hamyon'; + + @override + String get sendAGift => 'Sovg‘a yuborish'; + + @override + String get businessPreferences => 'Biznes sozlamalari'; + + @override + String get businessSub => 'Ishdagi ovqatlarni tezroq va osonroq qiling'; + + @override + String get help => 'Yordam'; + + @override + String get promotions => 'Aksiyalar'; + + @override + String get uberPass => 'Uber Pass'; + + @override + String get uberPassSub => '1 oy bepul ulaning'; + + @override + String get deliverWithUber => 'Uber bilan yetkazib bering'; + + @override + String get settings => 'Sozlamalar'; + + @override + String get home => 'Bosh sahifa'; + + @override + String get browse => 'Kategoriya'; + + @override + String get baskets => 'Savatcha'; + + @override + String get account => 'Profil'; + + @override + String get changeLanguage => 'Tilni o\'zgartirish'; + + @override + String get language => 'Til'; } diff --git a/lib/core/theme/app_icons.dart b/lib/core/theme/app_icons.dart index dfb10b7..b8d6568 100644 --- a/lib/core/theme/app_icons.dart +++ b/lib/core/theme/app_icons.dart @@ -34,10 +34,20 @@ abstract class AppIcons { static const String icCurrentLocation = "$baseUrl/ic_current_loc.svg"; static const String icEdit = "$baseUrl/ic_edit.svg"; static const String icSearch = "$baseUrl/ic_search.svg"; - static const String icCheck= "$baseUrl/ic_check.svg"; - static const String icCheck1= "$baseUrl/ic_check1.svg"; - static const String icArrowRight= "$baseUrl/ic_arrow_right.svg"; - + static const String icCheck = "$baseUrl/ic_check.svg"; + static const String icCheck1 = "$baseUrl/ic_check1.svg"; + static const String icArrowRight = "$baseUrl/ic_arrow_right.svg"; + static const String icDeliver = "$baseUrl/ic_deliver.svg"; + static const String icGift = "$baseUrl/ic_gift.svg"; + static const String icHelp = "$baseUrl/ic_help.svg"; + static const String icLike = "$baseUrl/ic_like.svg"; + static const String icPromotions = "$baseUrl/ic_promotions.svg"; + static const String icSettings = "$baseUrl/ic_settings.svg"; + static const String icRewards = "$baseUrl/ic_rewards.svg"; + static const String icUberPass = "$baseUrl/ic_uber_pass.svg"; + static const String icWallet = "$baseUrl/ic_wallet.svg"; + static const String icOrdersSvg = "$baseUrl/ic_orders_svg.svg"; + static const String icLanguage = "$baseUrl/ic_language.svg"; ///.png icons static const String icBestOverall = "$baseUrl/ic_best.png"; @@ -46,6 +56,8 @@ abstract class AppIcons { static const String icGlutenFree = "$baseUrl/ic_gluten_free.png"; static const String icAllergyFriendly = "$baseUrl/ic_allergy_friendly.png"; static const String icClock = "$baseUrl/ic_clock.svg"; - static const String icOrders= "$baseUrl/ic_orders.png"; - + static const String icOrders = "$baseUrl/ic_orders.png"; + static const String icUz = "$baseUrl/ic_uzb.png"; + static const String icRu = "$baseUrl/ic_rus.png"; + static const String icEn = "$baseUrl/ic_eng.png"; } diff --git a/lib/core/theme/app_images.dart b/lib/core/theme/app_images.dart index 4fe7cbd..3350b33 100644 --- a/lib/core/theme/app_images.dart +++ b/lib/core/theme/app_images.dart @@ -11,17 +11,16 @@ abstract class AppImages { static const String imgTakeout = "$baseUrl/img_takeout.png"; static const String imgAsian = "$baseUrl/img_asian.png"; static const String imgIceCream = "$baseUrl/img_ice_cream.png"; - static const String imgHalal= "$baseUrl/img_halal.png"; - static const String imgRetails= "$baseUrl/img_retails.png"; - static const String imgCarribean= "$baseUrl/img_carribean.png"; - static const String imgIndian= "$baseUrl/img_indian.png"; + static const String imgHalal = "$baseUrl/img_halal.png"; + static const String imgRetails = "$baseUrl/img_retails.png"; + static const String imgCarribean = "$baseUrl/img_carribean.png"; + static const String imgIndian = "$baseUrl/img_indian.png"; static const String imgFrench = "$baseUrl/img_french.png"; static const String imgFastFoods = "$baseUrl/img_fast_food.png"; static const String imgBurger = "$baseUrl/img_burger.png"; static const String imgRide = "$baseUrl/img_ride.png"; - static const String imgChinese= "$baseUrl/img_chinese.png"; + static const String imgChinese = "$baseUrl/img_chinese.png"; static const String imgDesert = "$baseUrl/img_desert.png"; - static const String imgPickUp= "$baseUrl/img_pick_up.png"; - - + static const String imgPickUp = "$baseUrl/img_pick_up.png"; + static const String imgAvatar = "$baseUrl/img_avatar.jpg"; } diff --git a/lib/feature/account/presentation/mixins/account_mixins.dart b/lib/feature/account/presentation/mixins/account_mixins.dart new file mode 100644 index 0000000..ab4ada7 --- /dev/null +++ b/lib/feature/account/presentation/mixins/account_mixins.dart @@ -0,0 +1,21 @@ +import '../../../../core/theme/app_icons.dart'; + +mixin AccountMixins { + final List leadingIcons = [ + AppIcons.icOrdersSvg, + AppIcons.icLike, + AppIcons.icRewards, + AppIcons.icWallet, + AppIcons.icGift, + AppIcons.icHelp, + AppIcons.icPromotions, + AppIcons.icUberPass, + AppIcons.icDeliver, + AppIcons.icLanguage, + AppIcons.icSettings, + ]; + + final List flags = [AppIcons.icEn, AppIcons.icUz, AppIcons.icRu]; + + final List languages = ["English", "O'zbekcha", "Русский"]; +} diff --git a/lib/feature/account/presentation/pages/account_page/account_page.dart b/lib/feature/account/presentation/pages/account_page/account_page.dart index 55f6449..1066e42 100644 --- a/lib/feature/account/presentation/pages/account_page/account_page.dart +++ b/lib/feature/account/presentation/pages/account_page/account_page.dart @@ -1,3 +1,5 @@ +import 'package:food_delivery_client/feature/account/presentation/pages/account_page/widgets/w_account_body.dart'; + import '../../../../../food_delivery_client.dart'; class AccountPage extends StatelessWidget { @@ -5,38 +7,7 @@ class AccountPage extends StatelessWidget { @override Widget build(BuildContext context) { - return BlocBuilder( - builder: (context, state) { - return WLayout( - child: Scaffold( - body: Center( - child: Column( - children: [ - Text(context.loc.iCantSignIn), - TextButton( - onPressed: () { - if (state.currentLocale == Locale("uz")) { - context.read().add( - LanguageEvent.changed(Locale('ru')), - ); - } else if (state.currentLocale == Locale("ru")) { - context.read().add( - LanguageEvent.changed(Locale('en')), - ); - } else { - context.read().add( - LanguageEvent.changed(Locale('uz')), - ); - } - }, - child: Text("changelang"), - ), - ], - ), - ), - ), - ); - }, - ); + return WAccountBody(); } } + diff --git a/lib/feature/account/presentation/pages/account_page/widgets/w_account_body.dart b/lib/feature/account/presentation/pages/account_page/widgets/w_account_body.dart new file mode 100644 index 0000000..14d7d06 --- /dev/null +++ b/lib/feature/account/presentation/pages/account_page/widgets/w_account_body.dart @@ -0,0 +1,208 @@ +import 'package:flutter/cupertino.dart'; +import 'package:food_delivery_client/feature/account/presentation/mixins/account_mixins.dart'; + +import '../../../../../../food_delivery_client.dart'; + +class WAccountBody extends StatelessWidget with AccountMixins { + WAccountBody({super.key}); + + @override + Widget build(BuildContext context) { + final List titles = [ + context.loc.orders, + context.loc.yourFavourites, + context.loc.restaurantRewards, + context.loc.wallet, + context.loc.sendAGift, + context.loc.help, + context.loc.promotions, + context.loc.uberPass, + context.loc.deliverWithUber, + context.loc.changeLanguage, + context.loc.settings, + ]; + return WLayout( + child: Scaffold( + appBar: PreferredSize( + preferredSize: Size.fromHeight(56), + child: WAccountAppBar().paddingSymmetric(horizontal: 19), + ), + body: LayoutBuilder( + builder: (context, constraints) => ConstrainedBox( + constraints: BoxConstraints(minHeight: constraints.maxHeight), + child: ListView.builder( + shrinkWrap: true, + itemCount: leadingIcons.length, + padding: EdgeInsets.symmetric(vertical: 15), + physics: const AlwaysScrollableScrollPhysics(), + scrollDirection: Axis.vertical, + itemBuilder: (context, index) => WAccountRowItem( + onTap: () { + if (index == 9) { + WChangeLanguage().show(context); + } + }, + svgPath: leadingIcons[index], + title: titles[index], + ), + ), + ), + ), + ), + ); + } +} + +class WAccountAppBar extends StatelessWidget { + const WAccountAppBar({super.key}); + + @override + Widget build(BuildContext context) { + return AppBar( + centerTitle: false, + leading: ClipRRect( + borderRadius: AppUtils.kBorderRadius40, + child: SizedBox( + child: Image.asset( + AppImages.imgAvatar, + height: 36, + width: 36, + fit: BoxFit.cover, + ), + ), + ), + title: Text('Felix', style: AppTextStyles.size18Medium), + ); + } +} + +class WAccountRowItem extends StatelessWidget { + const WAccountRowItem({ + super.key, + required this.svgPath, + required this.title, + this.subTitle, + this.leadingIcon, + required this.onTap, + }); + + final String svgPath; + final String title; + final String? subTitle; + final Widget? leadingIcon; + final VoidCallback onTap; + + @override + Widget build(BuildContext context) { + return InkWell( + onTap: onTap, + child: Ink( + child: Row( + spacing: 24, + mainAxisAlignment: MainAxisAlignment.start, + children: [ + leadingIcon ?? + SizedBox( + height: 24, + width: 24, + child: SvgPicture.asset(svgPath), + ), + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text(title, style: AppTextStyles.size14Medium), + if (subTitle != null) + Text( + subTitle!, + style: AppTextStyles.size14Medium.copyWith( + color: AppColors.c34A853, + ), + ), + ], + ), + ], + ).paddingSymmetric(vertical: 16, horizontal: 22), + ), + ); + } +} + +class WChangeLanguage extends StatelessWidget with AccountMixins { + WChangeLanguage({super.key}); + + show(BuildContext context) { + showModalBottomSheet( + context: context, + builder: (context) => Wrap(children: [this]), + ); + } + + @override + Widget build(BuildContext context) { + return BlocBuilder( + builder: (context, state) { + return Material( + color: AppColors.cFFFFFF, + borderRadius: AppUtils.kBorderRadiusTop20, + child: SizedBox( + width: context.w, + child: SafeArea( + child: Column( + children: [ + 10.verticalSpace, + SizedBox( + height: 6, + width: 100, + child: DecoratedBox( + decoration: BoxDecoration( + color: AppColors.cEEEEEE, + borderRadius: AppUtils.kBorderRadius8, + ), + ), + ), + 10.verticalSpace, + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Text( + context.loc.changeLanguage, + style: AppTextStyles.size24Medium, + ), + IconButton( + onPressed: () { + context.pop(); + }, + icon: SvgPicture.asset(AppIcons.icClose), + ), + ], + ).paddingSymmetric(horizontal: 16), + 15.verticalSpace, + Column( + children: List.generate(3, (index) { + return AppListTile( + onPressed: () { + context.read().add( + LanguageEvent.changed(L10n.locales[index]), + ); + }, + isSelected: L10n.locales[index] == state.currentLocale, + svgPath: '', + leading: SizedBox( + height: 24, + width: 24, + child: Image.asset(flags[index]), + ), + title: languages[index], + titleTextStyle: AppTextStyles.size16Medium, + ); + }), + ), + ], + ), + ), + ), + ); + }, + ); + } +} diff --git a/lib/feature/common/presentation/widgets/app_list_tile.dart b/lib/feature/common/presentation/widgets/app_list_tile.dart index 27eec38..7928a79 100644 --- a/lib/feature/common/presentation/widgets/app_list_tile.dart +++ b/lib/feature/common/presentation/widgets/app_list_tile.dart @@ -33,7 +33,7 @@ class AppListTile extends StatelessWidget { subtitle: subTitle, contentPadding: contentPadding ?? EdgeInsetsGeometry.only(left: 20, right: 27), - leading: leading ?? SvgPicture.asset(svgPath), + leading:leading ?? SvgPicture.asset(svgPath), title: titleWidget ?? Text(title, style: titleTextStyle ?? AppTextStyles.size16Regular), diff --git a/lib/feature/main/presentation/mixins/main_page_mixin.dart b/lib/feature/main/presentation/mixins/main_page_mixin.dart index 21dbbfb..e5dc4a9 100644 --- a/lib/feature/main/presentation/mixins/main_page_mixin.dart +++ b/lib/feature/main/presentation/mixins/main_page_mixin.dart @@ -24,5 +24,4 @@ mixin MainPageMixin { SvgPicture.asset(AppIcons.icAccountActive), ]; - final List labels = ["Home", "Browse", "Baskets", 'Account']; } diff --git a/lib/feature/main/presentation/pages/main_page/main_page.dart b/lib/feature/main/presentation/pages/main_page/main_page.dart index ff2ab0d..6277027 100644 --- a/lib/feature/main/presentation/pages/main_page/main_page.dart +++ b/lib/feature/main/presentation/pages/main_page/main_page.dart @@ -5,6 +5,12 @@ class MainPage extends StatelessWidget with MainPageMixin { @override Widget build(BuildContext context) { + final List labels = [ + context.loc.home, + context.loc.browse, + context.loc.baskets, + context.loc.account, + ]; return BlocProvider( create: (context) => sl(), child: BlocBuilder(