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 0000000..86930de Binary files /dev/null and b/assets/vec/buy_out_province.svg.vec differ diff --git a/assets/vec/map_1.svg.vec b/assets/vec/map_1.svg.vec new file mode 100644 index 0000000..fcd3f8e Binary files /dev/null and b/assets/vec/map_1.svg.vec differ diff --git a/assets/vec/map_2.svg.vec b/assets/vec/map_2.svg.vec new file mode 100644 index 0000000..e1bfc89 Binary files /dev/null and b/assets/vec/map_2.svg.vec differ diff --git a/assets/vec/sale_out_province.svg.vec b/assets/vec/sale_out_province.svg.vec new file mode 100644 index 0000000..37c37cb Binary files /dev/null and b/assets/vec/sale_out_province.svg.vec differ 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, );