feat: new ui changes

2025-10-07 14:21:09 +03:30
parent d5729e04ff
commit 99d1111655
44 changed files with 506 additions and 460 deletions
--- a/packages/chicken/lib/presentation/pages/poultry_science/active_hatching/logic.dart
+++ b/packages/chicken/lib/presentation/pages/poultry_science/active_hatching/logic.dart
@@ -73,4 +73,11 @@ class ActiveHatchingLogic extends GetxController {
  void toggleExpanded(int index) {
    expandedIndex.value = expandedIndex.value == index ? -1 : index;
  }
+
+  Future<void> onRefresh() async {
+    currentPage.value = 1;
+    await getHatchingList();
+  }
+
+
 }
--- a/packages/chicken/lib/presentation/pages/poultry_science/active_hatching/view.dart
+++ b/packages/chicken/lib/presentation/pages/poultry_science/active_hatching/view.dart
@@ -50,10 +50,7 @@ class ActiveHatchingPage extends GetView<ActiveHatchingLogic> {
        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);
  }
--- a/packages/chicken/lib/presentation/pages/poultry_science/farm/logic.dart
+++ b/packages/chicken/lib/presentation/pages/poultry_science/farm/logic.dart
@@ -107,4 +107,10 @@ class FarmLogic extends GetxController {
  void toggleExpanded(int index) {
    expandedIndex.value = expandedIndex.value == index ? -1 : index;
  }
+
+  Future<void> onRefresh() async {
+    currentPage.value = 1;
+    farmList.value = Resource<PaginationModel<PoultryFarm>>.loading();
+    await getFarmList();
+  }
 }
--- a/packages/chicken/lib/presentation/pages/poultry_science/farm/view.dart
+++ b/packages/chicken/lib/presentation/pages/poultry_science/farm/view.dart
@@ -3,7 +3,6 @@ import 'package:rasadyar_chicken/data/models/response/poultry_farm/poultry_farm.
 import 'package:rasadyar_chicken/presentation/utils/nested_keys_utils.dart';
 import 'package:rasadyar_chicken/presentation/widget/base_page/view.dart';
 import 'package:rasadyar_chicken/presentation/widget/filter_bottom_sheet.dart';
-import 'package:rasadyar_chicken/presentation/widget/label_item.dart';
 import 'package:rasadyar_core/core.dart';

 import 'logic.dart';
@@ -16,6 +15,7 @@ class FarmPage extends GetView<FarmLogic> {
    return ChickenBasePage(
      hasFilter: false,
      hasSearch: true,
+      onRefresh: controller.onRefresh,
      onFilterTap: () {
        Get.bottomSheet(
          isScrollControlled: true,
@@ -29,7 +29,7 @@ class FarmPage extends GetView<FarmLogic> {
      },
      routes: controller.routes,
      backId: poultryFirstKey,
-      widgets: [firstTagInformation(), farmListWidget()],
+      child: Column(children: [firstTagInformation(), farmListWidget()]),
    );
  }

@@ -76,10 +76,7 @@ class FarmPage extends GetView<FarmLogic> {
          itemCount: data.value.data?.results?.length ?? 0,
          separatorBuilder: (context, index) => SizedBox(height: 8.h),
          onLoadMore: () async => controller.getFarmList(true),
-          onRefresh: () async {
-            controller.currentPage.value = 1;
-            await controller.getFarmList();
-          },
+
        );
      }, controller.farmList),
    );
@@ -153,7 +150,7 @@ class FarmPage extends GetView<FarmLogic> {
          buildRow(
            title: 'جوجه ریزی فعال (تعداد دوره) ',
            value:
-            '${(item.hatchingInfo?.activeHatching ?? false) ? 'دارد' : 'ندارد'} (${item.hatchingInfo?.period ?? 0})',
+                '${(item.hatchingInfo?.activeHatching ?? false) ? 'دارد' : 'ندارد'} (${item.hatchingInfo?.period ?? 0})',
          ),

          /*          buildRow(
--- a/packages/chicken/lib/presentation/pages/poultry_science/genocide/logic.dart
+++ b/packages/chicken/lib/presentation/pages/poultry_science/genocide/logic.dart
@@ -133,4 +133,11 @@ class GenocideLogic extends GetxController {
      return 'تایید شده';
    }
  }
+
+
+  Future<void> onRefresh() async {
+    currentPage.value = 1;
+    await getPoultryOrderList();
+
+  }
 }
--- a/packages/chicken/lib/presentation/pages/poultry_science/genocide/view.dart
+++ b/packages/chicken/lib/presentation/pages/poultry_science/genocide/view.dart
@@ -17,6 +17,7 @@ class GenocidePage extends GetView<GenocideLogic> {
      routes: controller.routesName,
      hasSearch: true,
      hasFilter: true,
+      onRefresh: controller.onRefresh,
      onSearchChanged: (data) {
        controller.searchedValue.value = data;
        controller.getPoultryOrderList();
@@ -79,10 +80,7 @@ class GenocidePage extends GetView<GenocideLogic> {
        itemCount: data.value.data?.results?.length ?? 0,
        separatorBuilder: (context, index) => SizedBox(height: 8.h),
        onLoadMore: () async => controller.getPoultryOrderList(true),
-        onRefresh: () async {
-          controller.currentPage.value = 1;
-          await controller.getPoultryOrderList();
-        },
+
      );
    }, controller.poultryOrderList);
  }
--- a/packages/chicken/lib/presentation/pages/poultry_science/home/view.dart
+++ b/packages/chicken/lib/presentation/pages/poultry_science/home/view.dart
@@ -19,65 +19,67 @@ class PoultryScienceHomePage extends GetView<PoultryScienceHomeLogic> {
      hasNews: true,
      scrollable: true,

-      widgets: [
-        SizedBox(height: 8.h),
-        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 ? mainItemWidget() : mainItemWidgetExpanded(),
-                  );
-                }, controller.isExpanded),
-              ),
-              Positioned(
-                top: -10,
-                right: 20,
-                child: Container(
-                  height: 32.h,
+      child: Column(
+        children: [
+          SizedBox(height: 8.h),
+          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)),
                  ),
-                  padding: EdgeInsets.symmetric(horizontal: 8),
-                  child: Row(
-                    spacing: 8,
-                    children: [
-                      Assets.vec.chicken2Svg.svg(
-                        width: 16.w,
-                        height: 16.h,
-                        colorFilter: ColorFilter.mode(AppColor.blueDark, BlendMode.srcIn),
-                      ),
-                      Text(
-                        'اطلاعات فارم‌ها',
-                        textAlign: TextAlign.right,
-                        style: AppFonts.yekan16Bold.copyWith(color: AppColor.iconColor),
-                      ),
-                    ],
+
+                  child: ObxValue((data) {
+                    return AnimatedSize(
+                      duration: Duration(milliseconds: 300),
+                      child: data.value ? mainItemWidget() : mainItemWidgetExpanded(),
+                    );
+                  }, 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: 16.w,
+                          height: 16.h,
+                          colorFilter: ColorFilter.mode(AppColor.blueDark, BlendMode.srcIn),
+                        ),
+                        Text(
+                          'اطلاعات فارم‌ها',
+                          textAlign: TextAlign.right,
+                          style: AppFonts.yekan16Bold.copyWith(color: AppColor.iconColor),
+                        ),
+                      ],
+                    ),
                  ),
                ),
-              ),
-            ],
+              ],
+            ),
          ),
-        ),
-        SizedBox(height: 10),
-        widelyWidget(),
-        SizedBox(height: 20),
-      ],
+          SizedBox(height: 10),
+          widelyWidget(),
+          SizedBox(height: 20),
+        ],
+      ),
    );
  }

--- a/packages/chicken/lib/presentation/pages/poultry_science/inspection/logic.dart
+++ b/packages/chicken/lib/presentation/pages/poultry_science/inspection/logic.dart
@@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
 import 'package:rasadyar_chicken/data/models/response/hatching/hatching_models.dart';
 import 'package:rasadyar_chicken/data/models/response/hatching_report/hatching_report.dart';
 import 'package:rasadyar_chicken/presentation/pages/poultry_science/root/logic.dart';
-import 'package:rasadyar_chicken/presentation/utils/utils.dart';
 import 'package:rasadyar_core/core.dart';

 class InspectionPoultryScienceLogic extends GetxController {
@@ -43,8 +42,6 @@ class InspectionPoultryScienceLogic extends GetxController {
      routesName.removeLast();
      routesName.add(callback == 0 ? 'بازرسی' : 'بایگانی');
    });
-
-
  }

  @override
@@ -71,7 +68,6 @@ class InspectionPoultryScienceLogic extends GetxController {
    baseLogic.clearSearch();
  }

-
  Future<void> getHatchingList([bool isLoadingMore = false]) async {
    if (isLoadingMore) {
      isLoadingMoreAllocationsMade.value = true;
@@ -261,5 +257,10 @@ class InspectionPoultryScienceLogic extends GetxController {
      getHatchingList();
    }
  }
-}

+  Future<void> onRefresh() async {
+    currentPage.value = 1;
+
+    await Future.wait([getHatchingList(), getHatchingReport()]);
+  }
+}
--- a/packages/chicken/lib/presentation/pages/poultry_science/inspection/view.dart
+++ b/packages/chicken/lib/presentation/pages/poultry_science/inspection/view.dart
@@ -21,15 +21,18 @@ class InspectionPoultrySciencePage extends GetView<InspectionPoultryScienceLogic
      onFilterTap: () {
        Get.bottomSheet(filterBottomSheet());
      },
+      onRefresh: controller.onRefresh,
      onSearchChanged: (data) => controller.setSearchValue(data),
      backId: poultryFirstKey,
      routesWidget: ContainerBreadcrumb(rxRoutes: controller.routesName),
-      widgets: [
-        SizedBox(height: 50, child: segmentWidget()),
-        ObxValue((data) {
-          return data.value == 0 ? hatchingWidget() : reportWidget();
-        }, controller.selectedSegmentIndex),
-      ],
+      child: Column(
+        children: [
+          SizedBox(height: 50, child: segmentWidget()),
+          ObxValue((data) {
+            return data.value == 0 ? hatchingWidget() : reportWidget();
+          }, controller.selectedSegmentIndex),
+        ],
+      ),
    );
  }

@@ -60,10 +63,6 @@ class InspectionPoultrySciencePage extends GetView<InspectionPoultryScienceLogic
          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.hatchingList),
    );
@@ -356,10 +355,6 @@ class InspectionPoultrySciencePage extends GetView<InspectionPoultryScienceLogic
          itemCount: data.value.data?.results?.length ?? 0,
          separatorBuilder: (context, index) => SizedBox(height: 8.h),
          onLoadMore: () async => controller.getHatchingReport(true),
-          onRefresh: () async {
-            controller.currentPage.value = 1;
-            await controller.getHatchingReport();
-          },
        );
      }, controller.hatchingReportList),
    );
@@ -518,7 +513,8 @@ class InspectionPoultrySciencePage extends GetView<InspectionPoultryScienceLogic
                  item.image?[index] ?? '',
                  loadingBuilder: (context, child, loadingProgress) {
                    if (loadingProgress == null) return child;
-                    return Padding(padding: EdgeInsetsGeometry.all(80),
+                    return Padding(
+                      padding: EdgeInsetsGeometry.all(80),

                      child: CircularProgressIndicator(
                        color: AppColor.blueDark,