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 onDateSelected, Jalali? initialDate}) { - return Container( height: 250, color: Colors.white, @@ -92,7 +91,7 @@ Container modalDatePicker({required ValueChanged 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 extends StatelessWidget { } if (resource.isEmpty || resource.data?.results?.isEmpty == true) { - return emptyWidget ?? const EmptyWidget(); + return emptyWidget ?? EmptyWidget(onRefresh: onRefresh); } final controller = scrollController ?? ScrollController();