fix : ui changes pre release

2025-07-20 15:34:13 +03:30
parent cb264c3234
commit e27da8da69
6 changed files with 113 additions and 100 deletions
--- a/packages/chicken/lib/presentation/pages/buy_in_province/view.dart
+++ b/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,
--- a/packages/chicken/lib/presentation/pages/buy_in_province_all/view.dart
+++ b/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:
--- a/packages/chicken/lib/presentation/pages/buy_out_of_province/view.dart
+++ b/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,87 +300,85 @@ class BuyOutOfProvincePage extends GetView<BuyOutOfProvinceLogic> {

  Widget addPurchasedInformationBottomSheet([bool isOnEdit = false]) {
    return BaseBottomSheet(
-      child: SingleChildScrollView(
-        child: Form(
-          key: controller.formKey,
-          child: Column(
-            spacing: 8,
-            children: [
-              Text(
-                isOnEdit ? 'ویرایش اطلاعات خرید' : 'ثبت اطلاعات خرید',
-                style: AppFonts.yekan16Bold.copyWith(color: AppColor.blueNormal),
-              ),
-              _productDropDown(),
+      child: Form(
+        key: controller.formKey,
+        child: Column(
+          spacing: 8,
+          children: [
+            Text(
+              isOnEdit ? 'ویرایش اطلاعات خرید' : 'ثبت اطلاعات خرید',
+              style: AppFonts.yekan16Bold.copyWith(color: AppColor.blueNormal),
+            ),
+            _productDropDown(),

-              Container(
-                padding: EdgeInsets.all(8),
-                decoration: BoxDecoration(
-                  color: Colors.white,
-                  borderRadius: BorderRadius.circular(8),
-                  border: Border.all(color: AppColor.darkGreyLight, width: 1),
-                ),
-
-                child: Column(spacing: 12, children: [_provinceWidget(), _cityWidget()]),
+            Container(
+              padding: EdgeInsets.all(8),
+              decoration: BoxDecoration(
+                color: Colors.white,
+                borderRadius: BorderRadius.circular(8),
+                border: Border.all(color: AppColor.darkGreyLight, width: 1),
              ),

-              Container(
-                padding: EdgeInsets.all(8),
-                decoration: BoxDecoration(
-                  color: Colors.white,
-                  borderRadius: BorderRadius.circular(8),
-                  border: Border.all(color: AppColor.darkGreyLight, width: 1),
-                ),
+              child: Column(spacing: 12, children: [_provinceWidget(), _cityWidget()]),
+            ),

-                child: Column(
-                  spacing: 12,
-                  children: [
-                    RTextField(
-                      controller: controller.sellerNameController,
-                      label: 'نام فروشنده',
-                      borderColor: AppColor.darkGreyLight,
-                      filled: true,
-                      filledColor: AppColor.bgLight,
-                    ),
-                    RTextField(
-                      controller: controller.sellerPhoneController,
-                      label: 'تلفن فروشنده',
-                      keyboardType: TextInputType.phone,
-                      borderColor: AppColor.darkGreyLight,
-                      maxLength: 11,
-                      filled: true,
-                      filledColor: AppColor.bgLight,
-                      validator: (value) {
-                        if (value == null || value.isEmpty) {
-                          return 'لطفاً شماره موبایل را وارد کنید';
-                        }
-                        String cleaned = value.replaceAll(',', '');
-                        if (cleaned.length != 11) {
-                          return 'شماره موبایل باید ۱۱ رقم باشد';
-                        }
-                        if (!cleaned.startsWith('09')) {
-                          return 'شماره موبایل باید با 09 شروع شود';
-                        }
-                        return null;
-                      },
-                    ),
-
-                    UnitTextField(
-                      controller: controller.carcassWeightController,
-                      hint: 'وزن',
-                      unit: 'کیلوگرم',
-                      inputFormatters: [
-                        FilteringTextInputFormatter.digitsOnly,
-                        SeparatorInputFormatter(),
-                      ],
-                    ),
-                  ],
-                ),
+            Container(
+              padding: EdgeInsets.all(8),
+              decoration: BoxDecoration(
+                color: Colors.white,
+                borderRadius: BorderRadius.circular(8),
+                border: Border.all(color: AppColor.darkGreyLight, width: 1),
              ),
-              _imageCarcasesWidget(isOnEdit),
-              submitButtonWidget(isOnEdit),
-              SizedBox(),
-            ],
-          ),
+
+              child: Column(
+                spacing: 12,
+                children: [
+                  RTextField(
+                    controller: controller.sellerNameController,
+                    label: 'نام فروشنده',
+                    borderColor: AppColor.darkGreyLight,
+                    filled: true,
+                    filledColor: AppColor.bgLight,
+                  ),
+                  RTextField(
+                    controller: controller.sellerPhoneController,
+                    label: 'تلفن فروشنده',
+                    keyboardType: TextInputType.phone,
+                    borderColor: AppColor.darkGreyLight,
+                    maxLength: 11,
+                    filled: true,
+                    filledColor: AppColor.bgLight,
+                    validator: (value) {
+                      if (value == null || value.isEmpty) {
+                        return 'لطفاً شماره موبایل را وارد کنید';
+                      }
+                      String cleaned = value.replaceAll(',', '');
+                      if (cleaned.length != 11) {
+                        return 'شماره موبایل باید ۱۱ رقم باشد';
+                      }
+                      if (!cleaned.startsWith('09')) {
+                        return 'شماره موبایل باید با 09 شروع شود';
+                      }
+                      return null;
+                    },
+                  ),
+
+                  UnitTextField(
+                    controller: controller.carcassWeightController,
+                    hint: 'وزن',
+                    unit: 'کیلوگرم',
+                    inputFormatters: [
+                      FilteringTextInputFormatter.digitsOnly,
+                      SeparatorInputFormatter(),
+                    ],
+                  ),
+                ],
+              ),
+            ),
+            _imageCarcasesWidget(isOnEdit),
+            submitButtonWidget(isOnEdit),
+            SizedBox(),
+          ],
        ),
      ),
    );
--- a/packages/chicken/lib/presentation/pages/sales_in_province/view.dart
+++ b/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,
--- a/packages/chicken/lib/presentation/pages/segmentation/view.dart
+++ b/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,
--- a/packages/core/lib/presentation/widget/bottom_sheet/base_bottom_sheet.dart
+++ b/packages/core/lib/presentation/widget/bottom_sheet/base_bottom_sheet.dart
@@ -11,21 +11,18 @@ class BaseBottomSheet extends StatelessWidget {

  @override
  Widget build(BuildContext context) {
-    return Container(
-      height: height ?? MediaQuery.of(context).size.height * 0.85,
-      padding: EdgeInsets.symmetric(vertical: 15, horizontal: 10),
-      decoration: BoxDecoration(
-        color: bgColor ?? Colors.white,
-        borderRadius: BorderRadius.only(
-          topLeft: Radius.circular(25),
-          topRight: Radius.circular(25),
+    return SafeArea(
+      child: Container(
+        height: height ?? MediaQuery.of(context).size.height * 0.80,
+        padding: EdgeInsets.symmetric(vertical: 15, horizontal: 10),
+        decoration: BoxDecoration(
+          color: bgColor ?? Colors.white,
+          borderRadius: BorderRadius.only(
+            topLeft: Radius.circular(25),
+            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),
-
-            child,
+            Expanded(child: SingleChildScrollView(child: child)),
          ],
        ),
      ),