diff --git a/assets/images/live_chicken.jpg b/assets/images/live_chicken.jpg new file mode 100644 index 0000000..d88a231 Binary files /dev/null and b/assets/images/live_chicken.jpg differ diff --git a/packages/chicken/lib/presentation/pages/poultry_science/home/logic.dart b/packages/chicken/lib/presentation/pages/poultry_science/home/logic.dart index f07e1cf..b508a24 100644 --- a/packages/chicken/lib/presentation/pages/poultry_science/home/logic.dart +++ b/packages/chicken/lib/presentation/pages/poultry_science/home/logic.dart @@ -14,7 +14,8 @@ class PoultryScienceHomeLogic extends GetxController { labelTitle: 'کل فارم ها', isLoading: true, labelVecIcon: Assets.vec.cubeScanSvg.path, - blendMode: BlendMode.dst, + iconColor: AppColor.blueFlashing, + blendMode: BlendMode.srcOut, valueBgColor: Colors.white, labelGradient: LinearGradient( begin: Alignment.topCenter, diff --git a/packages/chicken/lib/presentation/pages/poultry_science/home/view.dart b/packages/chicken/lib/presentation/pages/poultry_science/home/view.dart index 913465b..b242cc1 100644 --- a/packages/chicken/lib/presentation/pages/poultry_science/home/view.dart +++ b/packages/chicken/lib/presentation/pages/poultry_science/home/view.dart @@ -42,16 +42,12 @@ class PoultryScienceHomePage extends GetView { widelyWidget(), SizedBox(height: 20), - - ], ), ), ); } - - Padding mainItemWidget() { return Padding( padding: const EdgeInsets.all(8.0), @@ -106,18 +102,19 @@ class PoultryScienceHomePage extends GetView { 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), ), ), + child: Assets.images.liveChicken.image( + width: 40.w, + height: 40.h, + fit: BoxFit.cover, + ), ), Text( - 'مرغ گرم', + 'فارم ها', textAlign: TextAlign.right, style: AppFonts.yekan16.copyWith(color: AppColor.darkGreyDarkActive), ), diff --git a/packages/core/lib/presentation/common/assets.gen.dart b/packages/core/lib/presentation/common/assets.gen.dart index 100ab2b..7fa3542 100644 --- a/packages/core/lib/presentation/common/assets.gen.dart +++ b/packages/core/lib/presentation/common/assets.gen.dart @@ -430,6 +430,9 @@ class $AssetsImagesGen { /// File path: assets/images/inner_splash.webp AssetGenImage get innerSplash => const AssetGenImage('assets/images/inner_splash.webp'); + /// File path: assets/images/live_chicken.jpg + AssetGenImage get liveChicken => const AssetGenImage('assets/images/live_chicken.jpg'); + /// File path: assets/images/outter_splash.webp AssetGenImage get outterSplash => const AssetGenImage('assets/images/outter_splash.webp'); @@ -443,7 +446,15 @@ class $AssetsImagesGen { AssetGenImage get selectRole => const AssetGenImage('assets/images/select_role.webp'); /// List of all assets - List get values => [chicken, innerSplash, outterSplash, placeHolder, poultryAction, selectRole]; + List get values => [ + chicken, + innerSplash, + liveChicken, + outterSplash, + placeHolder, + poultryAction, + selectRole, + ]; } class $AssetsLogosGen { diff --git a/packages/core/lib/presentation/widget/custom/information_tag_widget.dart b/packages/core/lib/presentation/widget/custom/information_tag_widget.dart index b4b14ea..0bd2be1 100644 --- a/packages/core/lib/presentation/widget/custom/information_tag_widget.dart +++ b/packages/core/lib/presentation/widget/custom/information_tag_widget.dart @@ -54,7 +54,7 @@ class InformationTagData { this.height, this.heightIcon, this.widthIcon, - this.blendMode + this.blendMode, }) : assert( (labelVecIcon != null) ^ (labelSvgIcon != null), 'Either labelVecIcon or labelSvgIcon must be provided, but not both.', @@ -92,7 +92,7 @@ class InformationTagData { Color? unitColor, int? width, int? height, - BlendMode? blendMode + BlendMode? blendMode, }) { return InformationTagData( labelVecIcon: labelVecIcon ?? this.labelVecIcon, @@ -150,12 +150,15 @@ class InformationTag extends StatelessWidget { spacing: 4, children: [ data.labelVecIcon != null - ? SvgGenImage.vec(data.labelVecIcon!).svg( - width: (data.widthIcon ?? 24).w, - height: (data.heightIcon ?? 24).h, - colorFilter: ColorFilter.mode( - data.iconColor ?? AppColor.mediumGreyDarkActive, - data.blendMode?? BlendMode.srcIn, + ? ClipRRect( + borderRadius: BorderRadius.circular(8), + child: SvgGenImage.vec(data.labelVecIcon!).svg( + width: (data.widthIcon ?? 24).w, + height: (data.heightIcon ?? 24).h, + colorFilter: ColorFilter.mode( + data.iconColor ?? AppColor.mediumGreyDarkActive, + data.blendMode ?? BlendMode.srcIn, + ), ), ) : SvgGenImage(data.labelSvgIcon!).svg( @@ -163,7 +166,7 @@ class InformationTag extends StatelessWidget { height: (data.heightIcon ?? 24).h, colorFilter: ColorFilter.mode( data.iconColor ?? AppColor.mediumGreyDarkActive, - data.blendMode?? BlendMode.srcIn, + data.blendMode ?? BlendMode.srcIn, ), ), Visibility(