From 0fc82c8eb9d24f4103db59afb670aca4148cd479 Mon Sep 17 00:00:00 2001
From: "mr.mojtaba" <mr.mojtaba47@gmail.com>
Date: Sat, 20 Sep 2025 15:23:58 +0330
Subject: [PATCH] fix : some ui bug

---
 .../poultry_science/inspection/view.dart      | 22 +++++++-------
 .../date_picker_bottom_sheet.dart             |  3 +-
 .../lib/presentation/widget/empty_widget.dart | 29 +++++++++++++------
 .../widget/list_item/list_item2.dart          |  6 ++--
 .../list_view/r_paginated_list_view.dart      |  2 +-
 5 files changed, 37 insertions(+), 25 deletions(-)

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 3553f96..2790795 100644
--- a/packages/chicken/lib/presentation/pages/poultry_science/inspection/view.dart
+++ b/packages/chicken/lib/presentation/pages/poultry_science/inspection/view.dart
@@ -48,7 +48,9 @@ class InspectionPoultrySciencePage extends GetView<InspectionPoultryScienceLogic
                 child: itemListWidget(item),
                 secondChild: itemListExpandedWidget(item),
                 labelColor: AppColor.blueLight,
-                labelIcon: Assets.vec.checkSquareSvg.path,
+                labelIcon: item.reportInfo?.image == false
+                    ? Assets.vec.timerSvg.path
+                    : Assets.vec.checkSquareSvg.path,
               );
             }, controller.expandedIndex);
           },
@@ -340,7 +342,7 @@ class InspectionPoultrySciencePage extends GetView<InspectionPoultryScienceLogic
                 index: index,
                 child: itemListWidgetReport(item),
                 secondChild: itemListExpandedWidgetReport(item),
-                labelColor: AppColor.blueLight,
+                labelColor: AppColor.greenLight,
                 labelIcon: Assets.vec.checkSquareSvg.path,
               );
             }, controller.expandedIndex);
@@ -484,7 +486,7 @@ class InspectionPoultrySciencePage extends GetView<InspectionPoultryScienceLogic
           child: Column(
             mainAxisAlignment: MainAxisAlignment.center,
             crossAxisAlignment: CrossAxisAlignment.start,
-            spacing: 3,
+            spacing: 5,
             children: [
               Text(
                 item.poultry?.user?.fullname ?? 'N/A',
@@ -502,19 +504,19 @@ class InspectionPoultrySciencePage extends GetView<InspectionPoultryScienceLogic
         Expanded(
           flex: 3,
           child: Column(
-            spacing: 3,
+            spacing: 5,
             mainAxisAlignment: MainAxisAlignment.center,
             crossAxisAlignment: CrossAxisAlignment.center,
             children: [
               Text(
                 item.poultry?.unitName ?? 'N/Aaq',
                 textAlign: TextAlign.start,
-                style: AppFonts.yekan12.copyWith(color: AppColor.bgDark),
+                style: AppFonts.yekan12.copyWith(color: AppColor.blueNormal),
               ),
               Text(
                 item.poultry?.licenceNumber ?? 'N/A',
                 textAlign: TextAlign.left,
-                style: AppFonts.yekan12.copyWith(color: AppColor.blueNormal),
+                style: AppFonts.yekan12.copyWith(color: AppColor.bgDark),
               ),
             ],
           ),
@@ -541,7 +543,7 @@ class InspectionPoultrySciencePage extends GetView<InspectionPoultryScienceLogic
           child: Column(
             mainAxisAlignment: MainAxisAlignment.center,
             crossAxisAlignment: CrossAxisAlignment.start,
-            spacing: 3,
+            spacing: 5,
             children: [
               Text(
                 item.hatching?.poultry?.fullname ?? 'N/A',
@@ -559,19 +561,19 @@ class InspectionPoultrySciencePage extends GetView<InspectionPoultryScienceLogic
         Expanded(
           flex: 3,
           child: Column(
-            spacing: 3,
+            spacing: 5,
             mainAxisAlignment: MainAxisAlignment.center,
             crossAxisAlignment: CrossAxisAlignment.center,
             children: [
               Text(
                 item.hatching?.poultry?.unitName ?? 'N/Aaq',
                 textAlign: TextAlign.start,
-                style: AppFonts.yekan12.copyWith(color: AppColor.bgDark),
+                style: AppFonts.yekan12.copyWith(color: AppColor.blueNormal),
               ),
               Text(
                 item.hatching?.licenceNumber ?? 'N/A',
                 textAlign: TextAlign.left,
-                style: AppFonts.yekan12.copyWith(color: AppColor.blueNormal),
+                style: AppFonts.yekan12.copyWith(color: AppColor.bgDark),
               ),
             ],
           ),
diff --git a/packages/core/lib/presentation/widget/bottom_sheet/date_picker_bottom_sheet.dart b/packages/core/lib/presentation/widget/bottom_sheet/date_picker_bottom_sheet.dart
index 2137d12..cbfaf27 100644
--- a/packages/core/lib/presentation/widget/bottom_sheet/date_picker_bottom_sheet.dart
+++ b/packages/core/lib/presentation/widget/bottom_sheet/date_picker_bottom_sheet.dart
@@ -51,7 +51,6 @@ GestureDetector dateFilterWidget({
 }
 
 Container modalDatePicker({required ValueChanged<Jalali> onDateSelected, Jalali? initialDate}) {
-
   return Container(
     height: 250,
     color: Colors.white,
@@ -92,7 +91,7 @@ Container modalDatePicker({required ValueChanged<Jalali> onDateSelected, Jalali?
             initialDateTime: initialDate ?? Jalali.now(),
             mode: PersianCupertinoDatePickerMode.date,
             onDateTimeChanged: (dateTime) {
-             initialDate = dateTime;
+              initialDate = dateTime;
             },
           ),
         ),
diff --git a/packages/core/lib/presentation/widget/empty_widget.dart b/packages/core/lib/presentation/widget/empty_widget.dart
index f07c421..fe0e414 100644
--- a/packages/core/lib/presentation/widget/empty_widget.dart
+++ b/packages/core/lib/presentation/widget/empty_widget.dart
@@ -2,18 +2,29 @@ import 'package:flutter/material.dart';
 import 'package:rasadyar_core/core.dart';
 
 class EmptyWidget extends StatelessWidget {
-  const EmptyWidget({super.key});
+  const EmptyWidget({super.key, this.onRefresh});
+
+  final RefreshCallback? onRefresh;
 
   @override
   Widget build(BuildContext context) {
-    return Column(
-      mainAxisAlignment: MainAxisAlignment.center,
-      crossAxisAlignment: CrossAxisAlignment.center,
-      children: [
-        Row(),
-        Assets.vec.emptySvg.svg(width: 170.w,height: 170.h),
-        Text('داده ای یافت نشد!', style: AppFonts.yekan20.copyWith(color: AppColor.textColor)),
-      ],
+    return RefreshIndicator(
+      onRefresh: onRefresh?? () async {},
+      child: SingleChildScrollView(
+        physics: AlwaysScrollableScrollPhysics(),
+        child: SizedBox(
+          height: MediaQuery.of(context).size.height/1.5,
+          child: Column(
+            mainAxisAlignment: MainAxisAlignment.center,
+            crossAxisAlignment: CrossAxisAlignment.center,
+            children: [
+              Row(),
+              Assets.vec.emptySvg.svg(width: 170.w, height: 170.h),
+              Text('داده ای یافت نشد!', style: AppFonts.yekan20.copyWith(color: AppColor.textColor)),
+            ],
+          ),
+        ),
+      ),
     );
   }
 }
diff --git a/packages/core/lib/presentation/widget/list_item/list_item2.dart b/packages/core/lib/presentation/widget/list_item/list_item2.dart
index bfcc0c8..ce03b59 100644
--- a/packages/core/lib/presentation/widget/list_item/list_item2.dart
+++ b/packages/core/lib/presentation/widget/list_item/list_item2.dart
@@ -49,7 +49,7 @@ class ExpandableListItem2 extends StatelessWidget {
                   children: [
                     Expanded(
                       child: Container(
-                        height: 75,
+                        height: 50.h,
                         decoration: BoxDecoration(
                           color: Colors.white,
                           borderRadius: BorderRadius.only(
@@ -63,8 +63,8 @@ class ExpandableListItem2 extends StatelessWidget {
                         child: child,
                       ),
                     ),
-                    Container(
-                      width: 20,
+                    SizedBox(
+                      width: 20.w,
                       child: Center(
                         child: SvgGenImage.vec(labelIcon).svg(
                           width: 16.w,
diff --git a/packages/core/lib/presentation/widget/list_view/r_paginated_list_view.dart b/packages/core/lib/presentation/widget/list_view/r_paginated_list_view.dart
index 45a2df4..25a6262 100644
--- a/packages/core/lib/presentation/widget/list_view/r_paginated_list_view.dart
+++ b/packages/core/lib/presentation/widget/list_view/r_paginated_list_view.dart
@@ -55,7 +55,7 @@ class RPaginatedListView<T> extends StatelessWidget {
     }
 
     if (resource.isEmpty || resource.data?.results?.isEmpty == true) {
-      return emptyWidget ?? const EmptyWidget();
+      return emptyWidget ?? EmptyWidget(onRefresh: onRefresh);
     }
 
     final controller = scrollController ?? ScrollController();