From e8a32d56483db23796188b998da90da50a3f35b9 Mon Sep 17 00:00:00 2001 From: "mr.mojtaba" Date: Mon, 29 Sep 2025 15:00:31 +0330 Subject: [PATCH] fix: ui changes steward --- assets/icons/buy_out_province.svg | 16 +++ assets/icons/map_1.svg | 29 ++++ assets/icons/map_2.svg | 42 ++++++ assets/icons/sale_out_province.svg | 26 ++++ assets/vec/buy_out_province.svg.vec | Bin 0 -> 2198 bytes assets/vec/map_1.svg.vec | Bin 0 -> 5042 bytes assets/vec/map_2.svg.vec | Bin 0 -> 6830 bytes assets/vec/sale_out_province.svg.vec | Bin 0 -> 3419 bytes .../active_hatching/logic.dart | 5 +- .../poultry_science/active_hatching/view.dart | 60 ++++---- .../pages/poultry_science/farm/logic.dart | 6 +- .../pages/poultry_science/farm/view.dart | 129 ++++++++++-------- .../pages/poultry_science/genocide/logic.dart | 5 +- .../poultry_science/inspection/logic.dart | 5 +- .../poultry_science/inspection/view.dart | 2 +- .../presentation/pages/steward/buy/view.dart | 4 +- .../presentation/pages/steward/sale/view.dart | 4 +- .../lib/presentation/widget/label_item.dart | 79 +++++------ .../widget/steward/widely_used/view.dart | 37 +++-- .../lib/presentation/common/assets.gen.dart | 32 +++++ .../base_page/widgets/search_widget.dart | 2 +- .../widget/buttons/core_button.dart | 2 +- 22 files changed, 319 insertions(+), 166 deletions(-) create mode 100644 assets/icons/buy_out_province.svg create mode 100644 assets/icons/map_1.svg create mode 100644 assets/icons/map_2.svg create mode 100644 assets/icons/sale_out_province.svg create mode 100644 assets/vec/buy_out_province.svg.vec create mode 100644 assets/vec/map_1.svg.vec create mode 100644 assets/vec/map_2.svg.vec create mode 100644 assets/vec/sale_out_province.svg.vec diff --git a/assets/icons/buy_out_province.svg b/assets/icons/buy_out_province.svg new file mode 100644 index 0000000..8029c43 --- /dev/null +++ b/assets/icons/buy_out_province.svg @@ -0,0 +1,16 @@ + + + + + + + + + diff --git a/assets/icons/map_1.svg b/assets/icons/map_1.svg new file mode 100644 index 0000000..612dd26 --- /dev/null +++ b/assets/icons/map_1.svg @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + diff --git a/assets/icons/map_2.svg b/assets/icons/map_2.svg new file mode 100644 index 0000000..3740a20 --- /dev/null +++ b/assets/icons/map_2.svg @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/icons/sale_out_province.svg b/assets/icons/sale_out_province.svg new file mode 100644 index 0000000..742f5b7 --- /dev/null +++ b/assets/icons/sale_out_province.svg @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + diff --git a/assets/vec/buy_out_province.svg.vec b/assets/vec/buy_out_province.svg.vec new file mode 100644 index 0000000000000000000000000000000000000000..86930de6a24138dfd9bcb21f6ace130bcdf70a54 GIT binary patch literal 2198 zcmZ{m4NO&K7{}jpFCsBP48h@r8(;H_kh|1Ehu-r%t`8d}n>eu46q{Donnqg9*o|yM zB{M%JQJH`@ZKr z=iIW~Dq{^d#%7$Uy>hsX>FrHJ%d(^$u#MU8w;t;Y_+8THv5YA&a#$|QC5L4R*_Bmh?Uv_zcFrQ{=A!#Bj8_G+)3*;T=Pd=Jx{Y&POw`O&MA$lv(5W$;uGfhNu74? zGZ(12;I#c)TZgWnvyP=>kJF8=lXgW~we7HW)LBBmL-c?C^GM#ip)cn(j^WP^yZKU{@uC%&ilvNK<(4#FQCxGGxpW8-=V`vgQhh6y@FVS;{GAN2m^>4v0L^kr)0T;z8tt?&SAamg$G*^*_(wXxJuQ_Em!H z!*r^d@dV%daE#bdVizgvmc0|P1FFkDjra$svObx^dTPW!H4+ayU3Dk_?WTO9Tm2a< zc{-6B5+~B1hm$l8Ect7?+S^{8r#c9KFlSFc)hp8Q+!PUrco6xZJNZ49>wo4M&%eyX zJmc96h~+^kiR``~#i!<`D65*EQf@kttvU#QaK)}ZjE_4PHi(ap zE2`HkeaCU%eZ0DLhWa5d;y|a)l8hYn2W#u=$yYs;8@BFL9URbY)CL>(lv2!3Pd;Mo zThqvsm&IWB`k~5+xjCHq?tB7KAH;Z^Ivx{cVlh$u_TclA4NHzow(M!DU*VN8Cy;O7 zcrt(2(CXF+6!>u?mG34heC`|S>3*J$JlsTS`7e|I=w>>*YN*m3%wu>3ZB2 z<+ac@?O(ERyZZH8vqR%*f7qpY4h(D5ytkVgwGP&D(Skzye&h(H$MiAL7?wVJgVB;> zyNoSFsq=R!jcJnhVQDwXxnJ3_c3(sfiVgoDb*$Z@ly8Bw_er}>PWabpd{_^O9nSBO z%8%E^vmK(bXG@jF%!<^WB{p)+(%fMkwc#J6W5e;ygKbA@+tP-=t?^+UwZr*+Ud*$% a*K3903Pb)|pfk$gzlFDt!QTmQwBjEn55_wH literal 0 HcmV?d00001 diff --git a/assets/vec/map_1.svg.vec b/assets/vec/map_1.svg.vec new file mode 100644 index 0000000000000000000000000000000000000000..fcd3f8eea14fdae37e9f68832f5094bc61e3988a GIT binary patch literal 5042 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 WMWEjc26XF2lv)yZY4(OP4E=98rn0*L literal 0 HcmV?d00001 diff --git a/assets/vec/map_2.svg.vec b/assets/vec/map_2.svg.vec new file mode 100644 index 0000000000000000000000000000000000000000..e1bfc89681946649b0387effa159ff8194efd33d GIT binary patch literal 6830 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 YBwiwQG?pB!Wa-@;M3U-sojP^;ACRlCBLDyZ literal 0 HcmV?d00001 diff --git a/assets/vec/sale_out_province.svg.vec b/assets/vec/sale_out_province.svg.vec new file mode 100644 index 0000000000000000000000000000000000000000..37c37cb9e84e33ef653e5bf684fa39d76dc85207 GIT binary patch literal 3419 zcmbW3c~n)`6~^yl1_L64h)+RB(MCixRt=y{%yK}Gh*OLs zh%N-d28W_1I4m5ZCRMw%P6@%7TBE_@5EQjVT}z?o+s{YR)&AA{)_cEq&bNoN_dR!* z+&#~*L>Pvt`0dcF4@bjjZVuuWm1{Hfmv_xslgJN@_q z-+kOi{o#U}8a+5#MNIHiU8Y2h}0Px7=jk zk<636z*{l?xod&KuKmM=CErGhPBIV4IMf-J_9XpD#-nbJZ?#yAS9rbt;`)oxL+?AG zI5*2%k-i}w$}+4MUbs4|+MJQX(^b=jAsrWrPST#tJCh;ldLl!&|k663sbGayvh*a*1vWUouoa{=#eiit8p>r*ld> z#ro(+mV6K_3~A^jI!Swybx>zrv?rSq+6fttx;?&C-(B1Ce7?Npw%l#y#@m~Uu__=; zCG9hj5N6}2agl1?B~#x=qSdJD$-?M!S;B=Y^M$uEc3@D?NL|k%(4RDnr}}HBiItlJ z^t_FX|I0i(%61`oWw;{ehjde0wrvwK{($b?l%34Wap>=7pfNvOc}yD*YgCxf?Wj)+ zD-I;0O{1agWL(xmS`8;Ylyna)F2v~_hjDRCDT*HK!`K%~F+P7I_8(lM?VR;TAKd%x z`NuHab}z-=oR4vFU>3~I%kk5wIhZ&k2M<$bVp7Chtm>MK_;EwA-~T=Qb3rhgzF7gw z2`_|f-HHxwO{VI90Pl|X#qp$Ln9(f`v0*3ie)kb@x1PjXZ>OMZ(=l|oH%I4oF&voC z;>2J52rY!yh~6N7ih5P+uK%T%P0AKMyf|I!ZiW~A(~-88;FG8XNRpThSZi}iZT(U4n+!Y6w$q4i$mL@kHa;_yc}Xsatx-&a^?BKkIL6T5Y><)Gic`s_r8j#JTd zKP-O_LSf)R3=Z`Xay^`{-*m>LU1n~TNk0d#3iHB0wh0-RW9A|GUP3#rgMM7s$f&z! z{2wz>z2UZLjmkv$@E^^|CF#gsal?#^orM=$Yfb0U8Tg>G&dhi=P3!l~;I`AW{bRGH zbUNze420|J*xnzj;c2vzeZvcpd&RLUhi<#$@b!_+NZr{-*zdJoxba~j$n}i{LaXPh z|9c$=C&%Mtz%t!ypl0nd9Zw;D(Q;wRq7}ko_f10P^{a@Nb=cPx9n4iWHwRm6;Qd;U i_-N5^GAx9%4K6mg+Tdn`yA2*T2ev>v@NG-OQ}AyH*RwGI literal 0 HcmV?d00001 diff --git a/packages/chicken/lib/presentation/pages/poultry_science/active_hatching/logic.dart b/packages/chicken/lib/presentation/pages/poultry_science/active_hatching/logic.dart index 4264a02..78a3a2a 100644 --- a/packages/chicken/lib/presentation/pages/poultry_science/active_hatching/logic.dart +++ b/packages/chicken/lib/presentation/pages/poultry_science/active_hatching/logic.dart @@ -26,11 +26,10 @@ class ActiveHatchingLogic extends GetxController { @override void onClose() { super.onClose(); - baseLogic.searchValue.value = null; - baseLogic.isSearchSelected.value = false; - baseLogic.textEditingController.clear(); + baseLogic.clearSearch(); } + Future getHatchingList([bool isLoadingMore = false]) async { if (isLoadingMore) { isLoadingMoreList.value = true; diff --git a/packages/chicken/lib/presentation/pages/poultry_science/active_hatching/view.dart b/packages/chicken/lib/presentation/pages/poultry_science/active_hatching/view.dart index 672dc6a..288efd4 100644 --- a/packages/chicken/lib/presentation/pages/poultry_science/active_hatching/view.dart +++ b/packages/chicken/lib/presentation/pages/poultry_science/active_hatching/view.dart @@ -27,37 +27,35 @@ class ActiveHatchingPage extends GetView { } Widget hatchingWidget() { - return Expanded( - child: ObxValue((data) { - return RPaginatedListView( - listType: ListType.separated, - resource: data.value, - hasMore: data.value.data?.next != null, - padding: EdgeInsets.fromLTRB(8, 8, 8, 80), - itemBuilder: (context, index) { - var item = data.value.data!.results![index]; - return ObxValue((val) { - return ExpandableListItem2( - selected: val.value.isEqual(index), - onTap: () => controller.toggleExpanded(index), - index: index, - child: itemListWidget(item), - secondChild: itemListExpandedWidget(item), - labelColor: AppColor.blueLight, - labelIcon: Assets.vec.checkSquareSvg.path, - ); - }, controller.expandedIndex); - }, - itemCount: data.value.data?.results?.length ?? 0, - separatorBuilder: (context, index) => SizedBox(height: 8.h), - onLoadMore: () async => controller.getHatchingList(true), - onRefresh: () async { - controller.currentPage.value = 1; - await controller.getHatchingList(); - }, - ); - }, controller.activeHatchingList), - ); + return ObxValue((data) { + return RPaginatedListView( + listType: ListType.separated, + resource: data.value, + hasMore: data.value.data?.next != null, + padding: EdgeInsets.fromLTRB(8, 8, 8, 80), + itemBuilder: (context, index) { + var item = data.value.data!.results![index]; + return ObxValue((val) { + return ExpandableListItem2( + selected: val.value.isEqual(index), + onTap: () => controller.toggleExpanded(index), + index: index, + child: itemListWidget(item), + secondChild: itemListExpandedWidget(item), + labelColor: AppColor.blueLight, + labelIcon: Assets.vec.activeFramSvg.path, + ); + }, controller.expandedIndex); + }, + itemCount: data.value.data?.results?.length ?? 0, + separatorBuilder: (context, index) => SizedBox(height: 8.h), + onLoadMore: () async => controller.getHatchingList(true), + onRefresh: () async { + controller.currentPage.value = 1; + await controller.getHatchingList(); + }, + ); + }, controller.activeHatchingList); } Container itemListExpandedWidget(HatchingModel item) { diff --git a/packages/chicken/lib/presentation/pages/poultry_science/farm/logic.dart b/packages/chicken/lib/presentation/pages/poultry_science/farm/logic.dart index b248f9c..380ba5d 100644 --- a/packages/chicken/lib/presentation/pages/poultry_science/farm/logic.dart +++ b/packages/chicken/lib/presentation/pages/poultry_science/farm/logic.dart @@ -7,7 +7,7 @@ import 'package:rasadyar_core/core.dart'; class FarmLogic extends GetxController { List routes = ['اقدام', 'فارم ها']; PoultryScienceRootLogic rootLogic = Get.find(); - BaseLogic baseLogic = Get.find(); + BasePageLogic baseLogic = Get.find(); final PoultryScienceHomeLogic _homeLogic = Get.find(); RxList tagInfo = [ InformationTagData( @@ -65,9 +65,7 @@ class FarmLogic extends GetxController { @override void onClose() { super.onClose(); - baseLogic.searchValue.value = null; - baseLogic.isSearchSelected.value = false; - baseLogic.textEditingController.clear(); + baseLogic.clearSearch(); } Future getFarmList([bool isLoadingMore = false]) async { diff --git a/packages/chicken/lib/presentation/pages/poultry_science/farm/view.dart b/packages/chicken/lib/presentation/pages/poultry_science/farm/view.dart index d7883fd..05b5660 100644 --- a/packages/chicken/lib/presentation/pages/poultry_science/farm/view.dart +++ b/packages/chicken/lib/presentation/pages/poultry_science/farm/view.dart @@ -67,7 +67,7 @@ class FarmPage extends GetView { onTap: () => controller.toggleExpanded(index), index: index, child: itemListWidget(item), - secondChild: itemListExpandedWidget2(item), + secondChild: itemListExpandedWidget(item), labelColor: AppColor.blueLight, labelIcon: Assets.vec.cubeScanSvg.path, ); @@ -85,7 +85,7 @@ class FarmPage extends GetView { ); } - Container itemListExpandedWidget2(PoultryFarm item) { + Container itemListExpandedWidget(PoultryFarm item) { return Container( padding: EdgeInsets.symmetric(horizontal: 8), decoration: BoxDecoration(color: Colors.white, borderRadius: BorderRadius.circular(8)), @@ -93,13 +93,14 @@ class FarmPage extends GetView { spacing: 8, children: [ Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, + mainAxisAlignment: MainAxisAlignment.start, children: [ Text( item.unitName ?? 'N/A', textAlign: TextAlign.center, style: AppFonts.yekan16.copyWith(color: AppColor.greenDark), ), + Spacer(), Visibility( child: Text( @@ -108,63 +109,77 @@ class FarmPage extends GetView { style: AppFonts.yekan14.copyWith(color: AppColor.blueNormal), ), ), - - GestureDetector( - onTap: () { - Get.bottomSheet(BaseBottomSheet( - child: Container( - color: AppColor.blueDark, - ), - )); - }, - child: Row( - children: [ - Text( - 'جزئیات', - style: AppFonts.yekan10.copyWith(color: AppColor.iconColor), - ), - SizedBox(width: 4.w), - Assets.vec.arrowLeftSvg.svg( - width: 10.w, - height: 10.h, - colorFilter: ColorFilter.mode(AppColor.iconColor, BlendMode.srcIn), - ), - ], + ], + ), + Container( + height: 32, + padding: EdgeInsets.symmetric(horizontal: 8), + decoration: ShapeDecoration( + color: AppColor.blueLight, + shape: RoundedRectangleBorder( + side: BorderSide(width: 1, color: AppColor.blueLightHover), + borderRadius: BorderRadius.circular(8), + ), + ), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Text( + 'تعاونی : ${item.cityOperator ?? 'ندارد'}', + style: AppFonts.yekan14.copyWith(color: AppColor.textColor), ), - ), - ], - ), - Wrap( - spacing: 8, - runSpacing: 8, - children: [ - labelItem(label: 'تعاونی', value: item.cityOperator ?? 'ندارد'), - labelItem(label: 'تعداد سالن ', value: item.numberOfHalls?.toString() ?? 'ندارد'), - labelItem( - label: 'مالک/ تلفن', - value: '${item.user?.fullname} (${item.user?.mobile})', - ), - labelItem(label: 'شناسه یکتا', value: item.breedingUniqueId ?? 'N/A'), - labelItem(label: 'کد اپیدمیولوژیک', value: item.epidemiologicalCode ?? 'N/A'), - labelItem(label: 'کد بهداشتی', value: item.healthCertificateNumber ?? 'N/A'), - labelItem( - label: 'دامپزشک فارم', - value: '${item.vetFarm?.fullName} (${item.vetFarm?.mobile ?? '-'})', - ), - - labelItem( - label: 'ظرفیت فارم', - value: item.totalCapacity.separatedByCommaFa, - unit: 'قطعه', - ), - labelItem( - label: 'جوجه ریزی فعال (تعداد دوره)', - value: - '${(item.hatchingInfo?.activeHatching ?? false) ? 'دارد' : 'ندارد'} (${item.hatchingInfo?.period ?? 0})', - ), - ], + Text( + ' تعداد سالن : ${item.numberOfHalls}', + style: AppFonts.yekan14.copyWith(color: AppColor.textColor), + ), + ], + ), ), + + buildRow(title: 'مالک/ تلفن', value: '${item.user?.fullname} (${item.user?.mobile})'), + buildRow(title: 'شناسه یکتا', value: item.breedingUniqueId ?? 'N/A'), + buildRow(title: 'کد اپیدمیولوژیک', value: item.epidemiologicalCode ?? 'N/A'), + buildRow(title: 'کد بهداشتی', value: item.healthCertificateNumber ?? 'N/A'), + buildRow( + title: 'دامپزشک فارم', + value: '${item.vetFarm?.fullName} (${item.vetFarm?.mobile ?? '-'})', + ), + buildUnitRow( + title: 'ظرفیت فارم', + value: item.totalCapacity.separatedByCommaFa, + unit: '(قطعه)', + ), + buildRow( + title: 'جوجه ریزی فعال (تعداد دوره) ', + value: + '${(item.hatchingInfo?.activeHatching ?? false) ? 'دارد' : 'ندارد'} (${item.hatchingInfo?.period ?? 0})', + ), + + /* buildRow( + title: 'شرح بازرسی', + value: item.reportInfo?.image == false ? 'ارسال تصویر جوجه ریزی فارم ' : 'تکمیل شده', + titleStyle: AppFonts.yekan14.copyWith( + color: (item.reportInfo?.image ?? false) ? AppColor.greenNormal : AppColor.redDark, + ), + valueStyle: AppFonts.yekan14.copyWith( + color: (item.reportInfo?.image ?? false) ? AppColor.greenNormal : AppColor.redDark, + ), + ),*/ + /* Visibility( + visible: (item.reportInfo?.image == false), + child: RElevated( + text: 'ثبت بازرسی', + isFullWidth: true, + width: 150.w, + height: 40.h, + onPressed: () { + cameraBottomSheet(item.id!); + }, + textStyle: AppFonts.yekan20.copyWith(color: Colors.white), + backgroundColor: AppColor.greenNormal, + ), + ),*/ ], ), ); diff --git a/packages/chicken/lib/presentation/pages/poultry_science/genocide/logic.dart b/packages/chicken/lib/presentation/pages/poultry_science/genocide/logic.dart index 36e0170..2f26a81 100644 --- a/packages/chicken/lib/presentation/pages/poultry_science/genocide/logic.dart +++ b/packages/chicken/lib/presentation/pages/poultry_science/genocide/logic.dart @@ -36,11 +36,8 @@ class GenocideLogic extends GetxController { @override void onClose() { - // TODO: implement onClose super.onClose(); - baseLogic.searchValue.value = null; - baseLogic.isSearchSelected.value = false; - baseLogic.textEditingController.clear(); + baseLogic.clearSearch(); } Future getPoultryOrderList([bool loadingMore = false]) async { diff --git a/packages/chicken/lib/presentation/pages/poultry_science/inspection/logic.dart b/packages/chicken/lib/presentation/pages/poultry_science/inspection/logic.dart index 5f7bd0a..0c375fe 100644 --- a/packages/chicken/lib/presentation/pages/poultry_science/inspection/logic.dart +++ b/packages/chicken/lib/presentation/pages/poultry_science/inspection/logic.dart @@ -67,12 +67,11 @@ class InspectionPoultryScienceLogic extends GetxController { @override void onClose() { - baseLogic.isSearchSelected.value=false; - baseLogic.textEditingController.clear(); - baseLogic.searchValue.value=null; super.onClose(); + baseLogic.clearSearch(); } + Future getHatchingList([bool isLoadingMore = false]) async { if (isLoadingMore) { isLoadingMoreAllocationsMade.value = true; diff --git a/packages/chicken/lib/presentation/pages/poultry_science/inspection/view.dart b/packages/chicken/lib/presentation/pages/poultry_science/inspection/view.dart index 39a23d1..19bcba4 100644 --- a/packages/chicken/lib/presentation/pages/poultry_science/inspection/view.dart +++ b/packages/chicken/lib/presentation/pages/poultry_science/inspection/view.dart @@ -349,7 +349,7 @@ class InspectionPoultrySciencePage extends GetView { children: [ GlassMorphismCardIcon( title: 'خرید داخل استان', - vecIcon: Assets.vec.cubeSvg.path, + vecIcon: Assets.vec.map1Svg.path, gradient: LinearGradient( colors: [Color(0xFF00E096), Color(0xFF007D5E)], stops: [0.0, 0.95], @@ -34,7 +34,7 @@ class BuyPage extends GetView { ), GlassMorphismCardIcon( title: 'خرید خارج استان', - vecIcon: Assets.vec.truckFastSvg.path, + vecIcon: Assets.vec.buyOutProvinceSvg.path, gradient: LinearGradient( colors: [Color(0xFF00E096), Color(0xFF007D5E)], stops: [0.0, 0.95], diff --git a/packages/chicken/lib/presentation/pages/steward/sale/view.dart b/packages/chicken/lib/presentation/pages/steward/sale/view.dart index fd6f2e2..1e351d6 100644 --- a/packages/chicken/lib/presentation/pages/steward/sale/view.dart +++ b/packages/chicken/lib/presentation/pages/steward/sale/view.dart @@ -24,14 +24,14 @@ class SalePage extends GetView { GlassMorphismCardIcon( title: 'فروش داخل استان', - vecIcon: Assets.vec.cubeSvg.path, + vecIcon: Assets.vec.map2Svg.path, onTap: () { Get.toNamed(ChickenRoutes.salesInProvinceSteward, id: stewardSecondKey); }, ), GlassMorphismCardIcon( title: 'فروش خارج استان', - vecIcon: Assets.vec.truckFastSvg.path, + vecIcon: Assets.vec.saleOutProvinceSvg.path, onTap: () { Get.toNamed(ChickenRoutes.salesOutOfProvinceSteward, id: stewardSecondKey); }, diff --git a/packages/chicken/lib/presentation/widget/label_item.dart b/packages/chicken/lib/presentation/widget/label_item.dart index a915146..e46a730 100644 --- a/packages/chicken/lib/presentation/widget/label_item.dart +++ b/packages/chicken/lib/presentation/widget/label_item.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:rasadyar_core/core.dart'; -Widget labelItem({required String label, String? value, String? unit}) { +Widget labelItem({required String label, String? value, String? unit, VoidCallback? onTap}) { String getLabelText(String? value, String? unit) { if (value != null && unit != null) { return '$value ($unit)'; @@ -12,44 +12,47 @@ Widget labelItem({required String label, String? value, String? unit}) { } } - return Container( - height: 49.h, - clipBehavior: Clip.antiAlias, - padding: EdgeInsets.fromLTRB(8.w, 7.h, 8.w, 7.h), - decoration: BoxDecoration( - color: Colors.white, - borderRadius: BorderRadius.circular(8), - border: Border.all(width: 1, color: const Color(0xFFB9B9B9)), - ), - child: Column( - spacing: 6, - mainAxisSize: MainAxisSize.min, - mainAxisAlignment: MainAxisAlignment.center, - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Row( - mainAxisSize: MainAxisSize.min, - spacing: 4, - children: [ - Text( - label, - textAlign: TextAlign.right, - style: AppFonts.yekan10.copyWith(color: AppColor.unselectTextColor), - ), + return GestureDetector( + onTap: onTap, + child: Container( + height: 49.h, + clipBehavior: Clip.antiAlias, + padding: EdgeInsets.fromLTRB(8.w, 7.h, 8.w, 7.h), + decoration: BoxDecoration( + color: Colors.white, + borderRadius: BorderRadius.circular(8), + border: Border.all(width: 1, color: const Color(0xFFB9B9B9)), + ), + child: Column( + spacing: 6, + mainAxisSize: MainAxisSize.min, + mainAxisAlignment: MainAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + mainAxisSize: MainAxisSize.min, + spacing: 4, + children: [ + Text( + label, + textAlign: TextAlign.right, + style: AppFonts.yekan10.copyWith(color: AppColor.unselectTextColor), + ), - Assets.vec.arrowLeftSvg.svg( - width: 10.w, - height: 10.h, - colorFilter: ColorFilter.mode(AppColor.unselectTextColor, BlendMode.srcIn), - ), - ], - ), - Text( - getLabelText(value, unit), - textAlign: TextAlign.right, - style: AppFonts.yekan10.copyWith(color: AppColor.iconColor), - ), - ], + Assets.vec.arrowLeftSvg.svg( + width: 10.w, + height: 10.h, + colorFilter: ColorFilter.mode(AppColor.unselectTextColor, BlendMode.srcIn), + ), + ], + ), + Text( + getLabelText(value, unit), + textAlign: TextAlign.right, + style: AppFonts.yekan10.copyWith(color: AppColor.iconColor), + ), + ], + ), ), ); } 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 a6cd243..6f623cb 100644 --- a/packages/chicken/lib/presentation/widget/steward/widely_used/view.dart +++ b/packages/chicken/lib/presentation/widget/steward/widely_used/view.dart @@ -1,6 +1,7 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:rasadyar_chicken/presentation/routes/routes.dart'; +import 'package:rasadyar_chicken/presentation/utils/nested_keys_utils.dart'; import 'package:rasadyar_core/core.dart'; import 'logic.dart'; @@ -30,60 +31,57 @@ class WidelyUsedWidget extends StatelessWidget { children: [ widelyUsed( title: 'خرید خارج استان', - iconPath: Assets.vec.truckFastSvg.path, + iconPath: Assets.vec.map1Svg.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); + Get.toNamed(ChickenRoutes.buysOutOfProvinceSteward, id: stewardFirstKey); }, ), widelyUsed( title: 'خرید داخل استان', - iconPath: Assets.vec.cubeSvg.path, + iconPath: Assets.vec.buyOutProvinceSvg.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); + Get.toNamed(ChickenRoutes.buysInProvinceSteward, id: stewardFirstKey); }, isOnEdit: false, ), widelyUsed( title: 'فروش خارج استان', - iconPath: Assets.vec.truckFastSvg.path, + iconPath: Assets.vec.map2Svg.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); + Get.toNamed(ChickenRoutes.salesOutOfProvinceSteward, id: stewardSecondKey); }, ), widelyUsed( title: 'فروش داخل استان', - iconPath: Assets.vec.cubeSvg.path, + iconPath: Assets.vec.saleOutProvinceSvg.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); + Get.toNamed(ChickenRoutes.salesInProvinceSteward, id: stewardSecondKey); }, ), ], - ) + ), ), Positioned( top: -17, @@ -123,23 +121,24 @@ class WidelyUsedWidget extends StatelessWidget { clipBehavior: Clip.none, children: [ Container( - width: 48, - height: 48, + width: 48.w, + height: 48.h, padding: EdgeInsets.all(4), decoration: ShapeDecoration( color: cardColor ?? Color(0xFFBECDFF), shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(8)), ), child: Container( - width: 40, - height: 40, + width: 40.w, + height: 40.h, decoration: ShapeDecoration( color: labelColor ?? AppColor.blueNormal, shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(8)), ), + padding: EdgeInsets.all(4), child: SvgGenImage.vec(iconPath).svg( - width: 24, - height: 24, + width: 24.w, + height: 24.h, colorFilter: ColorFilter.mode(Colors.white, BlendMode.srcIn), fit: BoxFit.cover, ), @@ -184,7 +183,7 @@ class WidelyUsedWidget extends StatelessWidget { ), ], ), - Text(title, style: AppFonts.yekan10.copyWith(color: textColor ?? AppColor.blueNormal)), + Text(title, style: AppFonts.yekan10.copyWith(color: textColor ?? AppColor.textColor)), ], ), ); diff --git a/packages/core/lib/presentation/common/assets.gen.dart b/packages/core/lib/presentation/common/assets.gen.dart index 93f3921..d8270ce 100644 --- a/packages/core/lib/presentation/common/assets.gen.dart +++ b/packages/core/lib/presentation/common/assets.gen.dart @@ -62,6 +62,9 @@ class $AssetsIconsGen { /// File path: assets/icons/buy.svg SvgGenImage get buy => const SvgGenImage('assets/icons/buy.svg'); + /// File path: assets/icons/buy_out_province.svg + SvgGenImage get buyOutProvince => const SvgGenImage('assets/icons/buy_out_province.svg'); + /// File path: assets/icons/calendar.svg SvgGenImage get calendar => const SvgGenImage('assets/icons/calendar.svg'); @@ -224,6 +227,12 @@ class $AssetsIconsGen { /// File path: assets/icons/map.svg SvgGenImage get map => const SvgGenImage('assets/icons/map.svg'); + /// File path: assets/icons/map_1.svg + SvgGenImage get map1 => const SvgGenImage('assets/icons/map_1.svg'); + + /// File path: assets/icons/map_2.svg + SvgGenImage get map2 => const SvgGenImage('assets/icons/map_2.svg'); + /// File path: assets/icons/map_marker.svg SvgGenImage get mapMarker => const SvgGenImage('assets/icons/map_marker.svg'); @@ -287,6 +296,9 @@ class $AssetsIconsGen { /// File path: assets/icons/sale.svg SvgGenImage get sale => const SvgGenImage('assets/icons/sale.svg'); + /// File path: assets/icons/sale_out_province.svg + SvgGenImage get saleOutProvince => const SvgGenImage('assets/icons/sale_out_province.svg'); + /// File path: assets/icons/scan.svg SvgGenImage get scan => const SvgGenImage('assets/icons/scan.svg'); @@ -359,6 +371,7 @@ class $AssetsIconsGen { boxRemove, boxTick, buy, + buyOutProvince, calendar, calendarSearch, calendarSearchOutline, @@ -413,6 +426,8 @@ class $AssetsIconsGen { lock, logout, map, + map1, + map2, mapMarker, messageAdd, noteRemove, @@ -434,6 +449,7 @@ class $AssetsIconsGen { receiptDiscount, registerKill, sale, + saleOutProvince, scan, scanBarcode, search, @@ -532,6 +548,9 @@ class $AssetsVecGen { /// File path: assets/vec/buy.svg.vec SvgGenImage get buySvg => const SvgGenImage.vec('assets/vec/buy.svg.vec'); + /// File path: assets/vec/buy_out_province.svg.vec + SvgGenImage get buyOutProvinceSvg => const SvgGenImage.vec('assets/vec/buy_out_province.svg.vec'); + /// File path: assets/vec/calendar.svg.vec SvgGenImage get calendarSvg => const SvgGenImage.vec('assets/vec/calendar.svg.vec'); @@ -694,6 +713,12 @@ class $AssetsVecGen { /// File path: assets/vec/map.svg.vec SvgGenImage get mapSvg => const SvgGenImage.vec('assets/vec/map.svg.vec'); + /// File path: assets/vec/map_1.svg.vec + SvgGenImage get map1Svg => const SvgGenImage.vec('assets/vec/map_1.svg.vec'); + + /// File path: assets/vec/map_2.svg.vec + SvgGenImage get map2Svg => const SvgGenImage.vec('assets/vec/map_2.svg.vec'); + /// File path: assets/vec/map_marker.svg.vec SvgGenImage get mapMarkerSvg => const SvgGenImage.vec('assets/vec/map_marker.svg.vec'); @@ -757,6 +782,9 @@ class $AssetsVecGen { /// File path: assets/vec/sale.svg.vec SvgGenImage get saleSvg => const SvgGenImage.vec('assets/vec/sale.svg.vec'); + /// File path: assets/vec/sale_out_province.svg.vec + SvgGenImage get saleOutProvinceSvg => const SvgGenImage.vec('assets/vec/sale_out_province.svg.vec'); + /// File path: assets/vec/scan.svg.vec SvgGenImage get scanSvg => const SvgGenImage.vec('assets/vec/scan.svg.vec'); @@ -829,6 +857,7 @@ class $AssetsVecGen { boxRemoveSvg, boxTickSvg, buySvg, + buyOutProvinceSvg, calendarSvg, calendarSearchSvg, calendarSearchOutlineSvg, @@ -883,6 +912,8 @@ class $AssetsVecGen { lockSvg, logoutSvg, mapSvg, + map1Svg, + map2Svg, mapMarkerSvg, messageAddSvg, noteRemoveSvg, @@ -904,6 +935,7 @@ class $AssetsVecGen { receiptDiscountSvg, registerKillSvg, saleSvg, + saleOutProvinceSvg, scanSvg, scanBarcodeSvg, searchSvg, diff --git a/packages/core/lib/presentation/widget/base_page/widgets/search_widget.dart b/packages/core/lib/presentation/widget/base_page/widgets/search_widget.dart index edb9c2e..a369a22 100644 --- a/packages/core/lib/presentation/widget/base_page/widgets/search_widget.dart +++ b/packages/core/lib/presentation/widget/base_page/widgets/search_widget.dart @@ -49,7 +49,7 @@ class SearchWidget extends GetView { hintStyle: AppFonts.yekan16.copyWith(color: AppColor.blueNormal), filledColor: Colors.white, filled: true, - controller: controller.textEditingController, + controller: controller.searchTextController, onChanged: (val) => controller.searchValue.value = val, ), ), diff --git a/packages/core/lib/presentation/widget/buttons/core_button.dart b/packages/core/lib/presentation/widget/buttons/core_button.dart index a8c8693..b7f97b6 100644 --- a/packages/core/lib/presentation/widget/buttons/core_button.dart +++ b/packages/core/lib/presentation/widget/buttons/core_button.dart @@ -239,7 +239,7 @@ class CoreButton extends StatelessWidget { ); case CoreButtonVariant.secondary: return _ButtonTheme( - backgroundColor: backgroundColor ?? AppColor.greyNormal, + backgroundColor: backgroundColor ?? AppColor.darkGreyNormal, foregroundColor: foregroundColor ?? AppColor.textColor, borderColor: null, );