From 2f934183e464308c980af4590eccb753f36c04f4 Mon Sep 17 00:00:00 2001 From: "mr.mojtaba" Date: Mon, 29 Sep 2025 09:46:36 +0330 Subject: [PATCH] fix: ui changes steward --- android/local.properties | 4 +- assets/icons/empty.svg | 100 +++---- assets/vec/empty.svg.vec | Bin 12318 -> 13666 bytes .../presentation/pages/steward/buy/view.dart | 48 ++-- .../presentation/pages/steward/home/view.dart | 252 +++++++++--------- .../presentation/pages/steward/sale/view.dart | 34 ++- .../widget/steward/widely_used/logic.dart | 2 +- .../widget/steward/widely_used/view.dart | 174 ++++++------ .../widget/card/card_icon_widget.dart | 29 +- .../lib/presentation/widget/empty_widget.dart | 11 +- 10 files changed, 319 insertions(+), 335 deletions(-) diff --git a/android/local.properties b/android/local.properties index ef261f3..462c4e6 100644 --- a/android/local.properties +++ b/android/local.properties @@ -1,5 +1,5 @@ -sdk.dir=C:\\Users\\Housh11\\AppData\\Local\\Android\\sdk +sdk.dir=C:/Users/Housh11/AppData/Local/Android/Sdk flutter.sdk=C:\\src\\flutter -flutter.buildMode=release +flutter.buildMode=debug flutter.versionName=1.3.11 flutter.versionCode=8 \ No newline at end of file diff --git a/assets/icons/empty.svg b/assets/icons/empty.svg index 9d67b54..d39e1d0 100644 --- a/assets/icons/empty.svg +++ b/assets/icons/empty.svg @@ -1,55 +1,55 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - + - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/assets/vec/empty.svg.vec b/assets/vec/empty.svg.vec index b60778f125e37e85d38e9f7d1cfbc091db75eb5f..3ce3d51da3b9bef626382763d145af5a19be01a0 100644 GIT binary patch literal 13666 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 literal 12318 zcmc(Fd014(()XDe)>#-fMH~TmWW|bxTHFM_7W|f+^Yi@2o1z0hUuGb zgT2cs5ElOizuemh%ckCji+4A{qAAxvt~V$Yf6GbkC%4OfkqMeVZh)nb3F{vfyr*0I zXcrvU-gr+}=HvE!CrmRf0J+|vPzq*j0(?el_Dd){y9b)w&cc&x`(du`9OSs~fxW+! zLr#nBu&d@N$n^#i0q?7%KUHhqH!OD;9B8=(nr_d4aMKMi_|0PI;Jq4Z9xsNY4y$3+ z&Bf5$WHn@to&mG|y&h@@41;?YQ^6%H972El7p(9y!k8mFp;wF%@^g2BW{wdei*~}! zP2u3sJ{@HG28D@W&NwO+j5%9;VZ+SD&?9RLtW<3RMbjEk_+)^?prx?KF#~quQrJoO zHQ|re8PKx(Qn;V95vF9UfeHSLVdA(gP!u@=wzt{|<*$3g>a+VG-C2a@oBLo|mmn+7SCn;~=Yau9E1z_{Nh!@OntVDRc_7}PNvybeXfuOZp+svsJA56p(;pHG3K zGzOWzL1Fgi{JHSkviWOF)%CBVX)TQZC=)8De+KFIkHUjCLt*8zvv3fH zLSx!l7(Znw%-nYtUaIH96B?t;*Pt-}U`?(Cra<TVWnnv@Q0*6xBQH}}A<=1uT0^)MWtwglSrJqr_7P5__Ui(vS10_-ro z1Qq!cz`^kn1f5(0<7g~0AA`c;Z|&xlg%K~kdH^F&4905BA;|iDKF$o%;hK(vv9_xR z%Jr`%O~whosBv!7B%BqY!yRFRur^DLt_KI<<1Q8`*Bca;f6GViC$~$<8-r&vE%D8y zF*w3U`=0K`@KNX-W%-`2%;#M3NIY^)gL1t=q5i-=2Pcij!fOh=p&W}7Je3$?9F3=r z*kSGuBXG_@JCy4U3e5-ld7?uE`qY+yby^f|Gr0$kyToF>T>*G|#bUBh05hFp(W>eW zl+265OW8$mRU3grca^~0bi~SyWhDFFxPECR4A=KYlhjIDgWj0*eI@KZiFl^C3}pHS zh4us9$wDla%qsvQP^|TU8pG=#d#U;kHP@~cVT_$5cKnV0NE)6&`ePQlYIMPOz8{o|2PaC zO&U3_b7+La(P8M~(FnHv`{L7(I*{ob6jmSbF2Hy^@o_Co*)|+!O?nCmUnSz+@CUH% z%S6u0ZGIx2ad`j>7Y#>m^QVy5B_3xzeGc~5qVdF~x6t8UAIy2Fz=x0f;KF7Fj;!c| z;buw{s-rR9s}W@S28I3u-is;*p_gw1*y1QG?pFg%-NvJRr>79=JsvY!KZRAU<2lcV z9-}a=`VUYS48r2PH*jipET-Hg9a|cSN#&-vW^E+;y)Z@djgk27jVbQ^Iu=KpD^aFz zP+0%1Jp@G^g@&t{(DU0`SWtUkJQmy*XILSGY*t`O+HH{Q=ihz_h2I{8Sx;-Aq;D1^ zO@0Ix3)jPv_;L_#tOL2;ps@K{K5{>~-MM)+F!k7W$ldS^I#1d8o^EtbIh-7q4&nQ& zp+0Ndd-^gzx!$0#m1OyseR0~vchHc&1@Z%$!FK01SaIhb7{AyHE~Z7`G>`VxKkE$& zyARf(uv(41cSV59V>Q~Z3jY! zQ#yP;dmJnbvBy6?{*-jt9@{j|q&?UkyXMaXhe92W$r=l@E}G($kpp1;(zo!bT7`yJY&o?qP4?*$WY5`UXXd4|orsu0qY6aj@bu4XQ59fuc7yDC8}H zRFy3{?3K`G$r5N>rNPz3v*E^46)vDLM7@3mU(y(M)s)k|848_$FNYxo5<*ibBwl|7 z@A?b`nZ7~M@&n#NTLm_6pF_UQ65q~ChDDiroHu?o1Rl}j#^BXZcUq5oDJIG2VTmDT z$uP%Hfiq|fDT8a_^EG3kvj1b4mmLoc!H*%@B!Odh?*#DaS_@2$GJS)>;RD_g+uy;8 ziOG;xV1~&yYr$=p4wa3Y;P-JlY?Z$W(*B{to#!`kJ?Kesf$zn4z{XH?yb6{dn+<-4 zACT-P!kKR$z%XA4!v;@;IVn}Z<|NZMC|XIp|DvZ2={ky%1;KWw_C2ouX_?5r%gE{t z3dcYDQV^xGWuJtQe0OYr#*VM`U$Jh(8@Q9ST->!;qLF=5LhIdav6#Ng{bV#KT7NLE zx`kGJJldtw_!zSBuog)$+x$}`Eh+9YOXylejNtk-R z?9-xe2GTy+8q3Z5gPDID9BS4dT<<#J$MJEn($odh4#Y#`QzzVibP$xjYJ;EU4S}Y( zHt0EU7{CJq#UI1r$VvllIXeQZ2OIF2-$*FwVZh+MBVn4Cf%ct|kmY2+F*pk9?F`s* z$|wj@{|B|7QCVle;~}G9T`L2I6^?{bAHo+S;Nl1a9&SAxe9sy1Eya+tCJ}$n!Engj z37f?P81#n|mcNRFZ&fa6<2C|%U2w)B-eaL?s1tV4PJ;9w4ftmLWG*|8U#8F=(i*?F zn@YZ;HGbY>D%4DL#O)Lp=O1f@M}|y-h%v3u)_ww7c_T=U<{_0J!wL?&Kg;#cwT{c}(BT^$d<7J1_K#qp4M+!LQp ziHBS3JaL>;JP5r#Y0r#3tic*SA>Lorn9P-4Hn0Tl; z=ZTKv<00*)Cw?<89?q3|qAY)d!bPxS3-aIVq*P5}pY!Xx!Kg~fK72gKD{-5dORGI-cG1+?hD&Y+Twt+7)adE4kNbr2dioB2uyAX9(bJO z;o#_r8%Yik+dc6S#>42xo_Lt_i20v@WAWU7nHR?sUoX64ngAQ8{RabGrE*b=1h_rc z3!R(eVMweO9(x%NQ4wA^rXn6T2YVsw&-@>w$NU?kznk>7GwJENEuI)OERN*kiK(9s zgsV{=_|FytVCxWfoU^naR4-_Ug~fegTA2%uo8Jf4IXK~+mI!r0t?@~7FqEBiz<=H7 z39p{Ez^dpTu&~)4Yij~%-1gYlA^_%|vBUZle{lR#k|#Th$m?QIwEbUp#!l`0Pc@P) zpOBj44H2$R*z*T}*hl(*+67@=OBbx__AxjfbVb9L5pZ^;EB3hD2WrQ-Vwia!Iw!bd zY;-7OA8w1oQbd?Ope>Fs4Cd=FWkC>~@mz3*OE0*T?Si4@Js@tU3;ATq%`A7pTeQAY z7P#QtY5wqPk_#$EcBfd-1&30;A-As!9$woGwBUl8U4Aeizy-UNc7?P~fLpg@QNp11hW`v=S z+TwZAs~d@~Xu6N~hK;UxD0=@ zf|hD`KA)2T?Vxs(GalXS1_ckD@L;Vwoa*L;ZBDi4>nh9Jpl}r&*aEy?5P4x3sur-S z|JQRai~1NMN?dX0roP}es~zo^(G+95VOmrS#j0-TVeAL$Ep8Zby&t$0xnbK)vCz}S z9cR4gQwN#pU}a$C6cYCQh3-^FJ z-3-k8cMDjh_!NJCWXG}Yv>oKVo{6qA>>$Z<28O(}hrPR}q2Z5~;21g;Up;L_zGX6& zoovnVMyZ4+EDaQ!OvPnCID$;ypzshZWqVX86{@zZAP7Is^1+Mh?_pn~5nYx!qKy6> z{CQlQ^AeHyaT#aUAs!pyjwa6$hmLngi`8K`F25blyA+NaHn+vhnSGG?h2i}M;oITI zA++yc{4VAY+-R483u^bmIKx1WGGBw>De&wtoipgPK<5Q#KCbfJPr)f53#{*6g-l;( z>@fT?-^W5W2cz#rPs~pPoO{L-YrMkIqNCgYnXmuH&*8U@-_u#E3dTEr58>J6aGG+l zGCzaDOW>Jz(ojAiJ|-!P-HS%%vaBQSdGpQxSzZ&K0M_jB!p8^wk?p(6Ub`ul_d@T9 z863Z!_)l*0KYq6rMtiiw9J^I8FE^WV+AASm{1LugvkuNK+zSU%zvg&BFhR%CJ^W04 z`SvE5UTcMWk~YBlL~DG~X+5~s*lIlNVnF>sAloOo%{wdY58` zHz3y=6dwsKnAXtF@?YDHLiGt(C&BARZ!8^b0EVHH+rSlth^GfQ(Oxg&yj&;9A1vb7 zYA1;NM8c$15(ZUBnCB1JX+s-esMi>vq&47pM{DrE1fd=Q?p~U??h2Rf&&d5kH?- zE*={RC~SNx#;)s)C7Lqv$lhQ)_TzK${71pK(@lVlx?nuNR{;n51mgoA6|nkkJ5=N+ zLU4$K3ElaG@b3p!gz$DD`5~NNlf8%q-Cl@n9*pn8vw$y;*Kxk1KYJ}!9zr^cy%pI! z-sqdf;?AM?L!JWmwF$-LmsEUyV{%M+Ubfe1bI1xpTv=xUCfPvpRCBqEtyTk*A1fRB ziFn&v4ac0Nazb@)lCv7JPWML3)f&p3^rrn+%h9I0j;{|}CxgQK17De%BVuf$2YA^4 zM~aov^nyG27{KG}++dXmnB2J?WW5uy?h{vVJt*P&L! zIi~&ozcIP9p3cKY%$s0M=VK!p(rxH`YNT=5!M0E%&h=>t$G$L9Zq5-*?ijJ5$_do| z-SJR~EA5%xQ8&|*Vg!F&RQM72PY%FZu`{H69*FZPuap&FhEJf-g9I9fNNsw};A|(b#y? zg<_g$yxP;5Vv`u`71Ih*cgA3Wtt}LN6N4j~G#pFIO?myb%w{pKAR7BmtrLB2M&U<2 z?u#3%B5`fxucF(@2(qp7qIO3g?6K*jxMWT^-dFxxWI6TluaAhk--eRUJ1p8C2&KK~ zuoyHY6ywiliA_kaY2o=vo7GPCmqKZ$rjGG4`s644ICe9&k{c zv@ryK^vDvgED6Th;YY*{3xZH{G+PuF_ri#?$HnuRJ+V3Kv}jcoh*P&-5Vw94KsK2t zPTS*;+v^L(+Mm1Qij0S%2d&$*h$=Diz7g#XzZAc{ZN%>uzY@n?G2*?**W&u0jM&Yl zUNrn@#5cYTV%a~9#J^FTwbDrZo5ZHsMxxg&hEAosr^fy&y7XXLVF_`g#5p=;(xcpgH%9TdqRPQd71C7Kb zCSBm+c&VIrErREivtNYc@}WJT&?=1h^@5;}5bJ-Ua~%27((+)gS4@9|b3qt6zZbk} z-wPj{34|s2J$V0^rGZ#^t}E1j8h}x|I{}kVVbDi(p6t%;x_)4HZof(8Mhs4J0-sGr zOdsh;c_bt5DsDk}BqL7Dx8?JTh_&JKYiwoB=XI#WisMxBIn3Ucm`M2F_9mB^Ju-Sx zyDd2GR!ivPYR=`!^pMFlHOqwapG&@$$$k0~1+aB^a7N&E`F41-$i`{8`klDrJ0m*$ z`>mLN%!mV1--waF8u6<+uSLt7M%0wN5-si;u`u%0`}MyU+#Or&uM+iFy5o?TM_gYj zI~Q^NIq7wS>(gqNTrpyMPpnyXR$TE}FRt&?KMlg``Nzbxe+1KBlr09%4&i#q_6(-q z6LyPS->;FcXXWm+S9$3Viy1?a+lB95Bt1GTT2vyp7q$mEmL3tkSA=3^=cA(XN+@o+ za#T!d6~^_P?$T-RIWE>r?1LT0pBAI$Mv!mM5rvFM{KDxP#pF?F&^-{qzRx4KZCAsX|`Tqxd)#w0TWr@`5V?yU-7dRH5Ye+%GYmK1a7jP@ zy$y5k+hRGzT?|jGD&XkA?k}&{qWwP#VdPd@R1f+MPE58%b{Dk6!xm%L6;bZr2Ak~f z0W7w`oH_S^@s;OmP;?Sn{wWjokmNsNpgcaSxmQX&x3Pa|UfUkv~?juVm2G`SBqLg%0 zkAvTo@_hWXJrC*LP>-8@9zpF4J$5_$2tN5-kFs10iq3S3p}+sc3$iXU@sr%8^Mmw% zDr+fBx=~5{Grb2mQwc8P)u{ZT5;FTsSkp(1L6^(H|9drN(f!oEQ)*=QRj$|7bXQzK zajzQJIaI(RwFc(~SHJ-;4OaHAfV3D5=6_xROXg@WcTEM|3v2LTRt3c6Xwc)A3J9vu z&>egQ#ZOvV>t|pcpv7{}XV5TGiz9nHgNMtscq{rD-9c(GV$3sWyrjibv!8)?nS>b) zTJ&A{jP81M9Cy$fviciz-@@7pBzs0@&S4$Sv3myPzvwu>k)#W39FC+LY+MXSkFVgm z#KzBbO6e`3tYf3cOFGK>F{C0z*5u7+LLbsUFJ*YWQ|N%z=YX;4^P1=>UnAIBtLl6QC&To5$a z)1?ZE3e}jasRH)igN-+5vl`{~H@WkK?&EFHB%z$!KU)`8PG0x=c3{5ziq z`HP~!8eV4eW$om8gQAPz#uSWv;a{zvIRg0~*GZ*n8*5hFuZi2d^<4?8do_W5wGQuo zC1KF&CT>d!U%lg4KTyK0j_R#=U&$?Lx8+;~vuc0q-Xg74RG*NEiQZZhVqN%f+v2QrvZ9l)^ za%8MOks_fF=L2W~xT&C+nxIuMF8Zm3;-$DLt-esX(@u)$CCqlh+XoC7!CY!t~Bc z+)ev_c!H92PLJiwmAroAekHOy*Sg=8$b5X7m5S!1$A(}Pr^DU>FuFp9gsD5tdD-i^ zgvWv{csq-=7M#x3LJLl}-p&%)USc0(iA*lOD=l#s`J=)EmbixeQOr-4w1-<^PQE2F zJz&W6HszQlGJW6uPfL0~q($XaOH>zV=#7{qE?lIcw`LZU^U~1UF$>Z~HTh8sdMBmE zJO>LjOlSLsIr>JZvG!AQJk?E&Wd?KFE7Z8{XEVH|Q=@vWgh?GFEGshQ_10;oynSGt zDev#p+LY5fQ*1&uti~PRnc!Y}zZNpb1fyP)9}6`ho6umOy$M=;Lhs5bS2JO^hT5no z1|ok*@=EKZMTaC6GW+f@Tt)A`v|O%iuh+IyA+y)tO;pJAe$sO#vRHww1H<{Zm0T`n z=asZyQ%phY#A1kool0Dhs>59yl)PW(g-T@pX3i`nGCMypSxLO;9l&TMr_a`##TX2k zzsP;2;PR`PC~!P@Q{dmH+!J^^hHM=evKWQcGx`h}-=1d$K91ZU1U|k2X#&}>j$#G@ zSm<7Gh)8TGHCKvXd$&2YRn`fxE1v39=Z)L&d&h(tENBu2xKEGJX#j*KK zSZ>becV?71GJlyLAYsE7CcIqsPZKVu8$X$F`bp&`Xx&POiPom1qguSs+Z2n}Ytd__ zDebl7|9>#$<7fKF^hcJHLFoEtj87gwb`11Jn#K56D|N_X`4g5_$YOhjEY=Tyr9&3` z+dkAGi;da)Bo-?V_*{o9cAii13yY;Y(|*rlYo?zp)~+!pd!yK!y%}OLIeYuW(8@(<>G!CWU+pBiUwKizmDvc@y(<-i=7P$$qv|Afz6Yh9oV|CvjpSI z&K6S^Xpx;YSeczYSUYwWVQ-t*8D%8JT@2;&`6+_KqrBf1bPYBDU15qNF`ed>?E+4poIi2C2)|SmB8N3J39*O z(Y$kO2@C>zIPcs>Dmh8uEP;yzZ6$D(pq { widgets: [ Row( mainAxisAlignment: MainAxisAlignment.center, + spacing: 21.w, children: [ - Wrap( - alignment: WrapAlignment.center, - spacing: 14.w, - children: [ - saleOrBuyItemCard( - title: 'خرید داخل استان', - iconPath: Assets.vec.cubeSvg.path, - color: AppColor.greenNormalActive, - onTap: () { - Get.toNamed(ChickenRoutes.buysInProvinceSteward, id: stewardFirstKey); - }, - ), - saleOrBuyItemCard( - title: 'خرید خارج استان', - iconPath: Assets.vec.truckFastSvg.path, - color: AppColor.greenNormalActive, - onTap: () { - Get.toNamed(ChickenRoutes.buysOutOfProvinceSteward, id: stewardFirstKey); - }, - ), - ], + GlassMorphismCardIcon( + title: 'خرید داخل استان', + vecIcon: Assets.vec.cubeSvg.path, + gradient: LinearGradient( + colors: [Color(0xFF00E096), Color(0xFF007D5E)], + stops: [0.0, 0.95], + begin: AlignmentGeometry.topLeft, + end: AlignmentGeometry.bottomRight, + ), + onTap: () { + Get.toNamed(ChickenRoutes.buysInProvinceSteward, id: stewardFirstKey); + }, + ), + GlassMorphismCardIcon( + title: 'خرید خارج استان', + vecIcon: Assets.vec.truckFastSvg.path, + gradient: LinearGradient( + colors: [Color(0xFF00E096), Color(0xFF007D5E)], + stops: [0.0, 0.95], + begin: AlignmentGeometry.topLeft, + end: AlignmentGeometry.bottomRight, + ), + onTap: () { + Get.toNamed(ChickenRoutes.buysOutOfProvinceSteward, id: stewardFirstKey); + }, ), ], ), diff --git a/packages/chicken/lib/presentation/pages/steward/home/view.dart b/packages/chicken/lib/presentation/pages/steward/home/view.dart index eaa222e..e714e47 100644 --- a/packages/chicken/lib/presentation/pages/steward/home/view.dart +++ b/packages/chicken/lib/presentation/pages/steward/home/view.dart @@ -17,140 +17,136 @@ class HomePage extends GetView { scrollable: true, isBase: true, widgets: [ - InkWell( - onTap: () { - controller.isExpanded.value = !controller.isExpanded.value; - }, - child: Card( - margin: EdgeInsetsGeometry.all(6), - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(8), - side: BorderSide(width: 0.50, color: const Color(0xFFA9A9A9)), - ), - - child: ObxValue((data) { - return AnimatedSize( - duration: Duration(milliseconds: 300), - child: data.value - ? Padding( - padding: const EdgeInsets.all(8.0), - child: Column( - mainAxisSize: MainAxisSize.min, - children: [ - Row( - spacing: 8, - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - Container( - width: 40, - height: 40, - decoration: ShapeDecoration( - image: DecorationImage( - image: AssetImage(Assets.images.chicken.path), - fit: BoxFit.cover, - ), - shape: RoundedRectangleBorder( - side: BorderSide(width: 0.25, color: const Color(0xFFB0B0B0)), - borderRadius: BorderRadius.circular(4), - ), - ), - ), - Text( - 'مرغ گرم', - textAlign: TextAlign.right, - style: AppFonts.yekan16.copyWith( - color: AppColor.darkGreyDarkActive, - ), - ), - Spacer(), - AnimatedRotation( - turns: 180, - duration: Duration(milliseconds: 3000), - child: Icon(CupertinoIcons.chevron_up, size: 18), - ), - ], - ), - SizedBox(height: 8), - _todayShipmentWidget(), - - _inventoryWidget(), - - Row( - children: [ - Text( - 'اطلاعات بارها', - textAlign: TextAlign.right, - style: AppFonts.yekan16, - ), - ], - ), - - _informationShipment(), - - Row( - children: [ - Text( - 'اطلاعات توزیع', - textAlign: TextAlign.right, - style: AppFonts.yekan16, - ), - ], - ), - - distributionInformationWidget(), - ], - ), - ) - : Padding( - padding: const EdgeInsets.all(8.0), - child: Column( - mainAxisSize: MainAxisSize.min, - children: [ - Row( - spacing: 8, - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - Container( - width: 40, - height: 40, - decoration: ShapeDecoration( - image: DecorationImage( - image: AssetImage(Assets.images.chicken.path), - fit: BoxFit.cover, - ), - shape: RoundedRectangleBorder( - side: BorderSide(width: 0.25, color: const Color(0xFFB0B0B0)), - borderRadius: BorderRadius.circular(4), - ), - ), - ), - Text( - 'مرغ گرم', - textAlign: TextAlign.right, - style: AppFonts.yekan16.copyWith( - color: AppColor.darkGreyDarkActive, - ), - ), - Spacer(), - Icon(CupertinoIcons.chevron_down, size: 18), - ], - ), - _todayShipmentWidget(), - _inventoryWidget(), - ], - ), - ), - ); - }, controller.isExpanded), - ), - ), - + SizedBox(height: 8.h), + mainInformation(), + SizedBox(height: 8.h), WidelyUsedWidget(), SizedBox(height: 20), ], ); } + InkWell mainInformation() { + return InkWell( + onTap: () { + controller.isExpanded.value = !controller.isExpanded.value; + }, + + child: Stack( + clipBehavior: Clip.none, + children: [ + Container( + margin: EdgeInsetsGeometry.all(6), + decoration: BoxDecoration( + color: Colors.white, + borderRadius: BorderRadius.circular(8), + border: Border.all(width: 0.50, color: const Color(0xFFA9A9A9)), + ), + + child: ObxValue((data) { + return AnimatedSize( + duration: Duration(milliseconds: 300), + child: data.value + ? Padding( + padding: const EdgeInsets.all(8.0), + child: Column( + mainAxisSize: MainAxisSize.min, + children: [ + Row( + spacing: 8, + mainAxisAlignment: MainAxisAlignment.end, + children: [ + AnimatedRotation( + turns: 180, + duration: Duration(milliseconds: 3000), + child: Icon(CupertinoIcons.chevron_up, size: 18), + ), + ], + ), + SizedBox(height: 8), + _todayShipmentWidget(), + + _inventoryWidget(), + + Row( + children: [ + Text( + 'اطلاعات بارها', + textAlign: TextAlign.right, + style: AppFonts.yekan16, + ), + ], + ), + + _informationShipment(), + + Row( + children: [ + Text( + 'اطلاعات توزیع', + textAlign: TextAlign.right, + style: AppFonts.yekan16, + ), + ], + ), + + distributionInformationWidget(), + ], + ), + ) + : Padding( + padding: const EdgeInsets.all(8.0), + child: Column( + mainAxisSize: MainAxisSize.min, + children: [ + Row( + spacing: 8, + mainAxisAlignment: MainAxisAlignment.end, + children: [ + Icon(CupertinoIcons.chevron_down, size: 18), + ], + ), + _todayShipmentWidget(), + _inventoryWidget(), + ], + ), + ), + ); + }, controller.isExpanded), + ), + Positioned( + top: -10, + right: 20, + child: Container( + height: 32.h, + decoration: BoxDecoration( + color: Colors.white, + borderRadius: BorderRadius.circular(8), + border: Border.all(width: 0.50, color: const Color(0xFFA9A9A9)), + ), + padding: EdgeInsets.symmetric(horizontal: 8), + child: Row( + spacing: 8, + children: [ + Assets.vec.chicken2Svg.svg( + width: 24.w, + height: 24.h, + colorFilter: ColorFilter.mode(AppColor.blueDark, BlendMode.srcIn), + ), + Text( + 'اطلاعات مرغ گرم', + textAlign: TextAlign.right, + style: AppFonts.yekan16Bold.copyWith(color: AppColor.iconColor), + ), + ], + ), + ), + ), + ], + ), + ); + } + Widget distributionInformationWidget() { return Padding( padding: const EdgeInsets.fromLTRB(0, 8, 0, 13), diff --git a/packages/chicken/lib/presentation/pages/steward/sale/view.dart b/packages/chicken/lib/presentation/pages/steward/sale/view.dart index 212680c..fd6f2e2 100644 --- a/packages/chicken/lib/presentation/pages/steward/sale/view.dart +++ b/packages/chicken/lib/presentation/pages/steward/sale/view.dart @@ -19,26 +19,22 @@ class SalePage extends GetView { widgets: [ Row( mainAxisAlignment: MainAxisAlignment.center, + spacing: 21, children: [ - Wrap( - alignment: WrapAlignment.center, - spacing: 14.w, - children: [ - saleOrBuyItemCard( - title: 'فروش داخل استان', - iconPath: Assets.vec.cubeSvg.path, - onTap: () { - Get.toNamed(ChickenRoutes.salesInProvinceSteward, id: stewardSecondKey); - }, - ), - saleOrBuyItemCard( - title: 'فروش خارج استان', - iconPath: Assets.vec.truckFastSvg.path, - onTap: () { - Get.toNamed(ChickenRoutes.salesOutOfProvinceSteward, id: stewardSecondKey); - }, - ), - ], + + GlassMorphismCardIcon( + title: 'فروش داخل استان', + vecIcon: Assets.vec.cubeSvg.path, + onTap: () { + Get.toNamed(ChickenRoutes.salesInProvinceSteward, id: stewardSecondKey); + }, + ), + GlassMorphismCardIcon( + title: 'فروش خارج استان', + vecIcon: Assets.vec.truckFastSvg.path, + onTap: () { + Get.toNamed(ChickenRoutes.salesOutOfProvinceSteward, id: stewardSecondKey); + }, ), ], ), diff --git a/packages/chicken/lib/presentation/widget/steward/widely_used/logic.dart b/packages/chicken/lib/presentation/widget/steward/widely_used/logic.dart index ca05ef0..40729eb 100644 --- a/packages/chicken/lib/presentation/widget/steward/widely_used/logic.dart +++ b/packages/chicken/lib/presentation/widget/steward/widely_used/logic.dart @@ -1,4 +1,4 @@ -import 'package:rasadyar_chicken/chicken.dart'; + import 'package:rasadyar_chicken/presentation/pages/steward/root/logic.dart'; import 'package:rasadyar_core/core.dart'; diff --git a/packages/chicken/lib/presentation/widget/steward/widely_used/view.dart b/packages/chicken/lib/presentation/widget/steward/widely_used/view.dart index 1933281..a6cd243 100644 --- a/packages/chicken/lib/presentation/widget/steward/widely_used/view.dart +++ b/packages/chicken/lib/presentation/widget/steward/widely_used/view.dart @@ -12,100 +12,94 @@ class WidelyUsedWidget extends StatelessWidget { Widget build(BuildContext context) { final WidelyUsedLogic controller = Get.put(WidelyUsedLogic()); - return Column( - children: [ - Padding( - padding: EdgeInsetsGeometry.all(6), - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - Text('پر کاربرد ها', textAlign: TextAlign.right, style: AppFonts.yekan16), - /* ObxValue((data) { - return GestureDetector( - onTap: () { - controller.toggleType(); + return Container( + height: 110.h, + margin: EdgeInsetsGeometry.all(6), + decoration: BoxDecoration( + color: Colors.white, + borderRadius: BorderRadius.circular(8), + border: Border.all(width: 0.50, color: const Color(0xFFA9A9A9)), + ), + child: Stack( + clipBehavior: Clip.none, + children: [ + Padding( + padding: EdgeInsets.fromLTRB(12.w, 24.h, 12.w, 16.h), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceEvenly, + children: [ + widelyUsed( + title: 'خرید خارج استان', + iconPath: Assets.vec.truckFastSvg.path, + isOnEdit: false, + + cardColor: AppColor.greenLightActive, + labelColor: AppColor.greenNormal, + textColor: AppColor.greenDarkHover, + onTap: () async { + controller.rootLogic.currentPage.value = 0; + controller.rootLogic.currentPage.refresh(); + await Future.delayed(Duration(milliseconds: 100)); + Get.toNamed(ChickenRoutes.buysOutOfProvinceSteward, id: 0); }, - child: controller.isOnEdit() - ? Assets.vec.checkSvg.svg( - width: 12.w, - height: 12.h, - colorFilter: ColorFilter.mode(AppColor.greenNormal, BlendMode.srcIn), - ) - : Assets.vec.editSvg.svg( - width: 16.w, - height: 16.h, - colorFilter: ColorFilter.mode(AppColor.blueNormal, BlendMode.srcIn), - ), - ); - }, controller.type)*/ - ], + ), + + widelyUsed( + title: 'خرید داخل استان', + iconPath: Assets.vec.cubeSvg.path, + cardColor: AppColor.greenLightActive, + labelColor: AppColor.greenNormal, + textColor: AppColor.greenDarkHover, + onTap: () async { + controller.rootLogic.currentPage.value = 0; + controller.rootLogic.currentPage.refresh(); + await Future.delayed(Duration(milliseconds: 100)); + Get.toNamed(ChickenRoutes.buysInProvinceSteward, id: 0); + }, + isOnEdit: false, + ), + + widelyUsed( + title: 'فروش خارج استان', + iconPath: Assets.vec.truckFastSvg.path, + isOnEdit: false, + onTap: () async { + controller.rootLogic.currentPage.value = 1; + controller.rootLogic.currentPage.refresh(); + await Future.delayed(Duration(milliseconds: 100)); + Get.toNamed(ChickenRoutes.salesOutOfProvinceSteward, id: 1); + }, + ), + + widelyUsed( + title: 'فروش داخل استان', + iconPath: Assets.vec.cubeSvg.path, + isOnEdit: false, + onTap: () async { + controller.rootLogic.currentPage.value = 1; + controller.rootLogic.currentPage.refresh(); + await Future.delayed(Duration(milliseconds: 100)); + Get.toNamed(ChickenRoutes.salesInProvinceSteward, id: 1); + }, + ), + ], + ) ), - ), - - Padding( - padding: const EdgeInsets.symmetric(horizontal: 2.0, vertical: 2), - child: Wrap( - spacing: 15, - runSpacing: 8, - children: [ - widelyUsed( - title: 'خرید خارج استان', - iconPath: Assets.vec.truckFastSvg.path, - isOnEdit: false, - - cardColor: AppColor.greenLightActive, - labelColor: AppColor.greenNormal, - textColor: AppColor.greenDarkHover, - onTap: () async { - controller.rootLogic.currentPage.value = 0; - controller.rootLogic.currentPage.refresh(); - await Future.delayed(Duration(milliseconds: 100)); - Get.toNamed(ChickenRoutes.buysOutOfProvinceSteward, id: 0); - }, + Positioned( + top: -17, + right: 11, + child: Container( + padding: EdgeInsets.all(4), + decoration: BoxDecoration( + color: Colors.white, + borderRadius: BorderRadius.circular(8), + border: Border.all(width: 0.50, color: const Color(0xFFA9A9A9)), ), - - widelyUsed( - title: 'خرید داخل استان', - iconPath: Assets.vec.cubeSvg.path, - cardColor: AppColor.greenLightActive, - labelColor: AppColor.greenNormal, - textColor: AppColor.greenDarkHover, - onTap: () async { - controller.rootLogic.currentPage.value = 0; - controller.rootLogic.currentPage.refresh(); - await Future.delayed(Duration(milliseconds: 100)); - Get.toNamed(ChickenRoutes.buysInProvinceSteward, id: 0); - }, - isOnEdit: false, - ), - - widelyUsed( - title: 'فروش خارج استان', - iconPath: Assets.vec.truckFastSvg.path, - isOnEdit: false, - onTap: () async { - controller.rootLogic.currentPage.value = 1; - controller.rootLogic.currentPage.refresh(); - await Future.delayed(Duration(milliseconds: 100)); - Get.toNamed(ChickenRoutes.salesOutOfProvinceSteward, id: 1); - }, - ), - - widelyUsed( - title: 'فروش داخل استان', - iconPath: Assets.vec.cubeSvg.path, - isOnEdit: false, - onTap: () async { - controller.rootLogic.currentPage.value = 1; - controller.rootLogic.currentPage.refresh(); - await Future.delayed(Duration(milliseconds: 100)); - Get.toNamed(ChickenRoutes.salesInProvinceSteward, id: 1); - }, - ), - ], + child: Text('پر کاربردها', textAlign: TextAlign.right, style: AppFonts.yekan16), + ), ), - ), - ], + ], + ), ); } diff --git a/packages/core/lib/presentation/widget/card/card_icon_widget.dart b/packages/core/lib/presentation/widget/card/card_icon_widget.dart index ecacd38..b198b49 100644 --- a/packages/core/lib/presentation/widget/card/card_icon_widget.dart +++ b/packages/core/lib/presentation/widget/card/card_icon_widget.dart @@ -113,6 +113,7 @@ class GlassMorphismCardIcon extends StatelessWidget { this.iconWidth = 48, this.iconHeight = 48, this.iconColor, + this.gradient, }) : assert((svgIcon != null) || (vecIcon != null), 'Either svgIcon or vecIcon must be provided'); final String title; @@ -123,6 +124,7 @@ class GlassMorphismCardIcon extends StatelessWidget { final VoidCallback? onTap; final Color titleColor; final TextStyle? titleStyle; + final Gradient? gradient; final Color borderColor; final Color backgroundColor; @@ -149,7 +151,6 @@ class GlassMorphismCardIcon extends StatelessWidget { onTap: onTap, child: Stack( children: [ - Positioned.fill( child: Container( width: width.w, @@ -159,14 +160,6 @@ class GlassMorphismCardIcon extends StatelessWidget { color: Colors.white54, border: Border.all(width: 1, color: Colors.white), borderRadius: BorderRadius.circular(borderRadius), - boxShadow: [ - BoxShadow( - color: Colors.black12, - blurRadius: 5, - offset: Offset(10, 12), - ), - ], - ), child: InkWell( onTap: onTap, @@ -180,7 +173,7 @@ class GlassMorphismCardIcon extends StatelessWidget { title, textAlign: TextAlign.center, style: - titleStyle ?? + titleStyle ?? AppFonts.yekan18Bold.copyWith(color: titleColor, height: 1.20), ), ), @@ -201,11 +194,13 @@ class GlassMorphismCardIcon extends StatelessWidget { topLeft: Radius.circular(borderRadius), topRight: Radius.circular(borderRadius), ), - gradient: LinearGradient( - colors: [Color(0xff00b6bc), Color(0xff003ae0)], - begin: Alignment.centerLeft, - end: Alignment.centerRight, - ), + gradient: + gradient ?? + LinearGradient( + colors: [Color(0xff00b6bc), Color(0xff003ae0)], + begin: Alignment.centerLeft, + end: Alignment.centerRight, + ), ), child: Center( child: svgIcon != null @@ -224,10 +219,6 @@ class GlassMorphismCardIcon extends StatelessWidget { ), ), ), - - - - ], ), ), diff --git a/packages/core/lib/presentation/widget/empty_widget.dart b/packages/core/lib/presentation/widget/empty_widget.dart index fe0e414..8a87f5d 100644 --- a/packages/core/lib/presentation/widget/empty_widget.dart +++ b/packages/core/lib/presentation/widget/empty_widget.dart @@ -9,18 +9,21 @@ class EmptyWidget extends StatelessWidget { @override Widget build(BuildContext context) { return RefreshIndicator( - onRefresh: onRefresh?? () async {}, + onRefresh: onRefresh ?? () async {}, child: SingleChildScrollView( physics: AlwaysScrollableScrollPhysics(), child: SizedBox( - height: MediaQuery.of(context).size.height/1.5, + height: MediaQuery.of(context).size.height / 1.5, child: Column( mainAxisAlignment: MainAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center, children: [ Row(), - Assets.vec.emptySvg.svg(width: 170.w, height: 170.h), - Text('داده ای یافت نشد!', style: AppFonts.yekan20.copyWith(color: AppColor.textColor)), + Assets.vec.emptySvg.svg(height: 190.h), + Text( + 'داده ای یافت نشد!', + style: AppFonts.yekan20.copyWith(color: AppColor.textColor), + ), ], ), ),