fix : ui changes pre release

packages/chicken/lib/presentation/pages/buy_in_province/view.dart

@@ -38,7 +38,7 @@ class BuyInProvincePage extends GetView<BuyInProvinceLogic> {
         children: [
           Expanded(
             child: RSegment(
-              children: ['در انتظار', 'همه'],
+              children: ['در انتظار', 'بایگانی'],
               selectedIndex: 0,
               borderColor: const Color(0xFFB4B4B4),
               selectedBorderColor: AppColor.blueNormal,

packages/chicken/lib/presentation/pages/buy_in_province_all/view.dart

@@ -248,9 +248,10 @@ class BuyInProvinceAllPage extends GetView<BuyInProvinceAllLogic> {
   Color getLabelColor(String? item) {
     switch (item) {
       case 'pending':
-        return AppColor.greenLightHover;
-      case 'accepted':
         return AppColor.blueLight;
+      case 'accepted':
+
+        return AppColor.greenLightHover;
       case 'rejected':
         return AppColor.redLightHover;
       default:

packages/chicken/lib/presentation/pages/buy_out_of_province/view.dart

@@ -60,7 +60,14 @@ class BuyOutOfProvincePage extends GetView<BuyOutOfProvinceLogic> {
       ],
       floatingActionButton: RFab.add(
         onPressed: () {
-          Get.bottomSheet(addPurchasedInformationBottomSheet(), isScrollControlled: true);
+          Get.bottomSheet(
+            addPurchasedInformationBottomSheet(),
+            isScrollControlled: true,
+            ignoreSafeArea: false,
+          ).whenComplete(() {
+            controller.resetSubmitForm();
+
+          },);
         },
       ),
       floatingActionButtonLocation: FloatingActionButtonLocation.startFloat,
@@ -190,6 +197,7 @@ class BuyOutOfProvincePage extends GetView<BuyOutOfProvinceLogic> {
                     addPurchasedInformationBottomSheet(true),
                     isScrollControlled: true,
                   ).whenComplete(() {
+
                     controller.resetSubmitForm();
                   });
                 },
@@ -292,7 +300,6 @@ class BuyOutOfProvincePage extends GetView<BuyOutOfProvinceLogic> {
 
   Widget addPurchasedInformationBottomSheet([bool isOnEdit = false]) {
     return BaseBottomSheet(
-      child: SingleChildScrollView(
       child: Form(
         key: controller.formKey,
         child: Column(
@@ -374,7 +381,6 @@ class BuyOutOfProvincePage extends GetView<BuyOutOfProvinceLogic> {
           ],
         ),
       ),
-      ),
     );
   }
 

packages/chicken/lib/presentation/pages/sales_in_province/view.dart

@@ -78,7 +78,9 @@ class SalesInProvincePage extends GetView<SalesInProvinceLogic> {
                   addOrEditBottomSheet(),
                   isScrollControlled: true,
                   backgroundColor: Colors.transparent,
-                );
+                ).whenComplete(() {
+                  controller.clearForm();
+                });
               },
             ),
 
@@ -326,7 +328,9 @@ class SalesInProvincePage extends GetView<SalesInProvinceLogic> {
                       addOrEditBottomSheet(true),
                       isScrollControlled: true,
                       backgroundColor: Colors.transparent,
-                    );
+                    ).whenComplete(() {
+                      controller.clearForm();
+                    });
                   },
                   textStyle: AppFonts.yekan20.copyWith(color: Colors.white),
                   backgroundColor: AppColor.greenNormal,

packages/chicken/lib/presentation/pages/segmentation/view.dart

@@ -55,7 +55,13 @@ class SegmentationPage extends GetView<SegmentationLogic> {
       floatingActionButtonLocation: FloatingActionButtonLocation.startFloat,
       floatingActionButton: RFab.add(
         onPressed: () {
-          Get.bottomSheet(addOrEditBottomSheet(), isScrollControlled: true);
+          Get.bottomSheet(
+            addOrEditBottomSheet(),
+            isScrollControlled: true,
+            ignoreSafeArea: false,
+          ).whenComplete(() {
+            controller.clearForm();
+          });
         },
       ),
     );
@@ -189,6 +195,7 @@ class SegmentationPage extends GetView<SegmentationLogic> {
                   Get.bottomSheet(
                     addOrEditBottomSheet(true),
                     isScrollControlled: true,
+                    ignoreSafeArea: false,
                   ).whenComplete(() {
                     controller.clearForm();
                   });
@@ -221,7 +228,7 @@ class SegmentationPage extends GetView<SegmentationLogic> {
 
   Widget addOrEditBottomSheet([bool isOnEdit = false]) {
     return BaseBottomSheet(
-      height: 300.h,
+      height: 340.h,
       child: SingleChildScrollView(
         child: Form(
           key: controller.formKey,

packages/core/lib/presentation/widget/bottom_sheet/base_bottom_sheet.dart

@@ -11,8 +11,9 @@ class BaseBottomSheet extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return Container(
+    return SafeArea(
-      height: height ?? MediaQuery.of(context).size.height * 0.85,
+      child: Container(
+        height: height ?? MediaQuery.of(context).size.height * 0.80,
         padding: EdgeInsets.symmetric(vertical: 15, horizontal: 10),
         decoration: BoxDecoration(
           color: bgColor ?? Colors.white,
@@ -21,11 +22,7 @@ class BaseBottomSheet extends StatelessWidget {
             topRight: Radius.circular(25),
           ),
         ),
-      child: SingleChildScrollView(
         child: Column(
-          mainAxisSize: MainAxisSize.min,
-          crossAxisAlignment: CrossAxisAlignment.center,
-          spacing: 8,
           children: [
             SizedBox(
               width: MediaQuery.of(context).size.width,
@@ -54,10 +51,8 @@ class BaseBottomSheet extends StatelessWidget {
                 ],
               ),
             ),
-
             SizedBox(height: 2),
-
+            Expanded(child: SingleChildScrollView(child: child)),
-            child,
           ],
         ),
       ),