Merge branch with resolved conflicts - restructured features and added new modules

packages/chicken/lib/features/poultry_science/home/logic.dart

@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
-import 'package:rasadyar_chicken/data/models/response/poultry_science/home_poultry_science/home_poultry_science_model.dart';
-import 'package:rasadyar_chicken/features/poultry_science/root/logic.dart';
+=
+import 'package:rasadyar_chicken/features/poultry_science/data/model/response/home_poultry_science/home_poultry_science_model.dart';
+import 'package:rasadyar_chicken/features/poultry_science/presentation/pages/root/logic.dart';
 import 'package:rasadyar_core/core.dart';
 import 'package:rasadyar_core/presentation/widget/custom/information_card_widget.dart';
 
@@ -158,7 +159,8 @@ class PoultryScienceHomeLogic extends GetxController {
                 );
               case 'حجم کشتار شده':
                 return tag.copyWith(
-                  value: result.hatchingKilledQuantity?.separatedByCommaFa ?? '0',
+                  value:
+                      result.hatchingKilledQuantity?.separatedByCommaFa ?? '0',
                   isLoading: false,
                 );
               default:

packages/chicken/lib/features/poultry_science/home/view.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/cupertino.dart' hide LinearGradient;
 import 'package:flutter/material.dart';
-import 'package:rasadyar_chicken/presentation/routes/routes.dart';
+import 'package:rasadyar_chicken/features/poultry_science/presentation/routes/routes.dart';
 import 'package:rasadyar_chicken/presentation/utils/nested_keys_utils.dart';
 import 'package:rasadyar_chicken/presentation/widget/base_page/view.dart';
 import 'package:rasadyar_core/core.dart';
@@ -34,13 +34,18 @@ class PoultryScienceHomePage extends GetView<PoultryScienceHomeLogic> {
                   decoration: BoxDecoration(
                     color: Colors.white,
                     borderRadius: BorderRadius.circular(8),
-                    border: Border.all(width: 0.50, color: const Color(0xFFA9A9A9)),
+                    border: Border.all(
+                      width: 0.50,
+                      color: const Color(0xFFA9A9A9),
+                    ),
                   ),
 
                   child: ObxValue((data) {
                     return AnimatedSize(
                       duration: Duration(milliseconds: 300),
-                      child: data.value ? mainItemWidget() : mainItemWidgetExpanded(),
+                      child: data.value
+                          ? mainItemWidget()
+                          : mainItemWidgetExpanded(),
                     );
                   }, controller.isExpanded),
                 ),
@@ -52,7 +57,10 @@ class PoultryScienceHomePage extends GetView<PoultryScienceHomeLogic> {
                     decoration: BoxDecoration(
                       color: Colors.white,
                       borderRadius: BorderRadius.circular(8),
-                      border: Border.all(width: 0.50, color: const Color(0xFFA9A9A9)),
+                      border: Border.all(
+                        width: 0.50,
+                        color: const Color(0xFFA9A9A9),
+                      ),
                     ),
                     padding: EdgeInsets.symmetric(horizontal: 8),
                     child: Row(
@@ -61,12 +69,17 @@ class PoultryScienceHomePage extends GetView<PoultryScienceHomeLogic> {
                         Assets.vec.chicken2Svg.svg(
                           width: 16.w,
                           height: 16.h,
-                          colorFilter: ColorFilter.mode(AppColor.blueDark, BlendMode.srcIn),
+                          colorFilter: ColorFilter.mode(
+                            AppColor.blueDark,
+                            BlendMode.srcIn,
+                          ),
                         ),
                         Text(
                           'اطلاعات فارم‌ها',
                           textAlign: TextAlign.right,
-                          style: AppFonts.yekan16Bold.copyWith(color: AppColor.iconColor),
+                          style: AppFonts.yekan16Bold.copyWith(
+                            color: AppColor.iconColor,
+                          ),
                         ),
                       ],
                     ),
@@ -88,7 +101,11 @@ class PoultryScienceHomePage extends GetView<PoultryScienceHomeLogic> {
       padding: const EdgeInsets.all(8.0),
       child: Column(
         mainAxisSize: MainAxisSize.min,
-        children: [SizedBox(height: 8), firstTagInformation(), secondTagInformation()],
+        children: [
+          SizedBox(height: 8),
+          firstTagInformation(),
+          secondTagInformation(),
+        ],
       ),
     );
   }
@@ -136,7 +153,11 @@ class PoultryScienceHomePage extends GetView<PoultryScienceHomeLogic> {
           firstTagInformation(),
           Row(
             children: [
-              Text('اطلاعات جوجه‌ریزی', textAlign: TextAlign.right, style: AppFonts.yekan16),
+              Text(
+                'اطلاعات جوجه‌ریزی',
+                textAlign: TextAlign.right,
+                style: AppFonts.yekan16,
+              ),
             ],
           ),
           secondTagInformation(),
@@ -237,7 +258,10 @@ class PoultryScienceHomePage extends GetView<PoultryScienceHomeLogic> {
                   onTap: () async {
                     controller.rootLogic.currentPage.value = 0;
 
-                    Get.toNamed(ChickenRoutes.inspectionPoultryScience, id: poultryFirstKey);
+                    Get.toNamed(
+                      PoultryScienceRoutes.inspectionPoultryScience,
+                      id: poultryFirstKey,
+                    );
                   },
                 ),
 
@@ -250,7 +274,10 @@ class PoultryScienceHomePage extends GetView<PoultryScienceHomeLogic> {
                   textColor: AppColor.textColor,
                   onTap: () async {
                     controller.rootLogic.currentPage.value = 0;
-                    Get.toNamed(ChickenRoutes.genocidePoultryScience, id: poultryFirstKey);
+                    Get.toNamed(
+                      PoultryScienceRoutes.genocidePoultryScience,
+                      id: poultryFirstKey,
+                    );
                   },
                 ),
                 widelyUsed(
@@ -262,7 +289,10 @@ class PoultryScienceHomePage extends GetView<PoultryScienceHomeLogic> {
                   isOnEdit: false,
                   onTap: () async {
                     controller.rootLogic.currentPage.value = 0;
-                    Get.toNamed(ChickenRoutes.farmPoultryScience, id: poultryFirstKey);
+                    Get.toNamed(
+                      PoultryScienceRoutes.farmPoultryScience,
+                      id: poultryFirstKey,
+                    );
                   },
                 ),
 
@@ -275,7 +305,10 @@ class PoultryScienceHomePage extends GetView<PoultryScienceHomeLogic> {
                   textColor: AppColor.textColor,
                   onTap: () async {
                     controller.rootLogic.currentPage.value = 0;
-                    Get.toNamed(ChickenRoutes.activeHatchingPoultryScience, id: poultryFirstKey);
+                    Get.toNamed(
+                      PoultryScienceRoutes.activeHatchingPoultryScience,
+                      id: poultryFirstKey,
+                    );
                   },
                 ),
               ],
@@ -291,7 +324,11 @@ class PoultryScienceHomePage extends GetView<PoultryScienceHomeLogic> {
                 borderRadius: BorderRadius.circular(8),
                 border: Border.all(width: 0.50, color: const Color(0xFFA9A9A9)),
               ),
-              child: Text('پر کاربردها', textAlign: TextAlign.right, style: AppFonts.yekan16),
+              child: Text(
+                'پر کاربردها',
+                textAlign: TextAlign.right,
+                style: AppFonts.yekan16,
+              ),
             ),
           ),
         ],
@@ -324,19 +361,26 @@ class PoultryScienceHomePage extends GetView<PoultryScienceHomeLogic> {
                 padding: EdgeInsets.all(4),
                 decoration: ShapeDecoration(
                   color: cardColor ?? Color(0xFFBECDFF),
-                  shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(8)),
+                  shape: RoundedRectangleBorder(
+                    borderRadius: BorderRadius.circular(8),
+                  ),
                 ),
                 child: Container(
                   width: 40,
                   height: 40,
                   decoration: ShapeDecoration(
                     color: labelColor ?? AppColor.blueNormal,
-                    shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(8)),
+                    shape: RoundedRectangleBorder(
+                      borderRadius: BorderRadius.circular(8),
+                    ),
                   ),
                   child: SvgGenImage.vec(iconPath).svg(
                     width: 24,
                     height: 24,
-                    colorFilter: ColorFilter.mode(Colors.white, BlendMode.srcIn),
+                    colorFilter: ColorFilter.mode(
+                      Colors.white,
+                      BlendMode.srcIn,
+                    ),
                     fit: BoxFit.cover,
                   ),
                 ),
@@ -349,7 +393,9 @@ class PoultryScienceHomePage extends GetView<PoultryScienceHomeLogic> {
                   padding: EdgeInsets.all(4),
                   decoration: ShapeDecoration(
                     color: Colors.white60,
-                    shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(8)),
+                    shape: RoundedRectangleBorder(
+                      borderRadius: BorderRadius.circular(8),
+                    ),
                   ),
                 ),
               ),
@@ -369,9 +415,16 @@ class PoultryScienceHomePage extends GetView<PoultryScienceHomeLogic> {
                         child: Container(
                           width: 16,
                           height: 16,
-                          decoration: BoxDecoration(shape: BoxShape.circle, color: Colors.white),
+                          decoration: BoxDecoration(
+                            shape: BoxShape.circle,
+                            color: Colors.white,
+                          ),
                           alignment: Alignment.center,
-                          child: Icon(CupertinoIcons.minus, color: AppColor.error, size: 15),
+                          child: Icon(
+                            CupertinoIcons.minus,
+                            color: AppColor.error,
+                            size: 15,
+                          ),
                         ),
                       ),
                     ),
@@ -382,7 +435,9 @@ class PoultryScienceHomePage extends GetView<PoultryScienceHomeLogic> {
           ),
           Text(
             title,
-            style: AppFonts.yekan10Bold.copyWith(color: textColor ?? AppColor.blueNormal),
+            style: AppFonts.yekan10Bold.copyWith(
+              color: textColor ?? AppColor.blueNormal,
+            ),
           ),
         ],
       ),