fix : ui changes

2025-10-01 11:07:47 +03:30
parent b4cf253143
commit 20a4a59c2e
5 changed files with 169 additions and 157 deletions
--- a/packages/chicken/lib/presentation/pages/steward/sales_out_of_province/view.dart
+++ b/packages/chicken/lib/presentation/pages/steward/sales_out_of_province/view.dart
@@ -9,8 +9,6 @@ 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/steward/inventory_widget.dart';
-
-import 'package:rasadyar_chicken/presentation/widget/page_route.dart';
 import 'package:rasadyar_core/core.dart';

 import 'logic.dart';
@@ -27,59 +25,69 @@ class SalesOutOfProvincePage extends GetView<SalesOutOfProvinceLogic> {
      onFilterTap: () {
        Get.bottomSheet(filterBottomSheet());
      },
-      widgets: [
-        inventoryWidget(controller.rootLogic),
-        Expanded(
-          child: ObxValue((data) {
-            return RPaginatedListView(
-              onLoadMore: () async => controller.getOutProvinceSales(true),
-              onRefresh: () async {
-                controller.currentPage.value = 1;
-                await controller.getOutProvinceSales();
-              },
-              hasMore: data.value.data?.next != null,
-              listType: ListType.separated,
-              resource: data.value,
-              padding: EdgeInsets.fromLTRB(8, 8, 8, 80),
-              itemBuilder: (context, index) {
-                var item = data.value.data!.results![index];
-                return ObxValue((val) {
-                  return ExpandableListItem2(
-                    selected: val.contains(index),
-                    onTap: () => controller.isExpandedList.toggle(index),
-                    index: index,
-                    child: itemListWidget(item),
-                    secondChild: itemListExpandedWidget(item, index),
-                    labelColor: AppColor.blueLight,
-                    labelIcon: Assets.vec.timerSvg.path,
-                  );
-                }, controller.isExpandedList);
-              },
-              itemCount: data.value.data?.results?.length ?? 0,
-              separatorBuilder: (context, index) => SizedBox(height: 8.h),
-            );
-          }, controller.salesList),
-        ),
-      ],
-      floatingActionButton: Row(
+      child: Stack(
        children: [
-          RFab.add(
-            onPressed: () {
-              Get.bottomSheet(addOrEditSaleBottomSheet(), isScrollControlled: true);
-            },
+          Positioned.fill(
+            child: Column(
+              children: [
+                inventoryWidget(controller.rootLogic),
+                ObxValue((data) {
+                  return RPaginatedListView(
+                    onLoadMore: () async => controller.getOutProvinceSales(true),
+                    onRefresh: () async {
+                      controller.currentPage.value = 1;
+                      await controller.getOutProvinceSales();
+                    },
+                    hasMore: data.value.data?.next != null,
+                    listType: ListType.separated,
+                    resource: data.value,
+                    padding: EdgeInsets.fromLTRB(8, 8, 8, 80),
+                    itemBuilder: (context, index) {
+                      var item = data.value.data!.results![index];
+                      return ObxValue((val) {
+                        return ExpandableListItem2(
+                          selected: val.contains(index),
+                          onTap: () => controller.isExpandedList.toggle(index),
+                          index: index,
+                          child: itemListWidget(item),
+                          secondChild: itemListExpandedWidget(item, index),
+                          labelColor: AppColor.blueLight,
+                          labelIcon: Assets.vec.timerSvg.path,
+                        );
+                      }, controller.isExpandedList);
+                    },
+                    itemCount: data.value.data?.results?.length ?? 0,
+                    separatorBuilder: (context, index) => SizedBox(height: 8.h),
+                  );
+                }, controller.salesList),
+              ],
+            ),
          ),
-          Spacer(),
-          RFab(
-            icon: Icon(CupertinoIcons.person_add_solid, color: Colors.white, size: 35.w),
-            backgroundColor: AppColor.blueNormal,
-            onPressed: () {
-              Get.toNamed(ChickenRoutes.salesOutOfProvinceBuyerSteward, id: 1);
-            },
+          Positioned(
+            right: 5,
+            left: 0,
+            bottom: 95,
+            child: Row(
+              children: [
+                RFab.add(
+                  onPressed: () {
+                    Get.bottomSheet(addOrEditSaleBottomSheet(), isScrollControlled: true);
+                  },
+                ),
+                Spacer(),
+                RFab(
+                  icon: Icon(CupertinoIcons.person_add_solid, color: Colors.white, size: 35.w),
+                  backgroundColor: AppColor.blueNormal,
+                  onPressed: () {
+                    Get.toNamed(ChickenRoutes.salesOutOfProvinceBuyerSteward, id: stewardSecondKey);
+                  },
+                ),
+                SizedBox(width: 25),
+              ],
+            ),
          ),
-          SizedBox(width: 25),
        ],
      ),
-      floatingActionButtonLocation: FloatingActionButtonLocation.startFloat,
    );
  }

--- a/packages/chicken/lib/presentation/pages/steward/sales_out_of_province_buyers/view.dart
+++ b/packages/chicken/lib/presentation/pages/steward/sales_out_of_province_buyers/view.dart
@@ -1,11 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:rasadyar_chicken/data/models/response/iran_province_city/iran_province_city_model.dart';
 import 'package:rasadyar_chicken/data/models/response/out_province_carcasses_buyer/out_province_carcasses_buyer.dart';
+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/page_route.dart';
 import 'package:rasadyar_core/core.dart';

 import 'logic.dart';
@@ -17,52 +15,56 @@ class SalesOutOfProvinceBuyersPage extends GetView<SalesOutOfProvinceBuyersLogic
  Widget build(BuildContext context) {
    return ChickenBasePage(
      routes: controller.routesName,
-      backId:  1,
+      backId: stewardSecondKey,
      onSearchChanged: (data) => controller.setSearchValue(data),
      filteringWidget: filterBottomSheet(),
-      widgets: [
-        Expanded(
-          child: ObxValue((data) {
-            return RPaginatedListView(
-              onLoadMore: () async => controller.getOutProvinceCarcassesBuyer(true),
-              onRefresh: () async {
-                controller.currentPage.value = 1;
-                await controller.getOutProvinceCarcassesBuyer();
+      child: Stack(
+        children: [
+          Positioned.fill(
+            child: ObxValue((data) {
+              return RPaginatedListView(
+                onLoadMore: () async => controller.getOutProvinceCarcassesBuyer(true),
+                onRefresh: () async {
+                  controller.currentPage.value = 1;
+                  await controller.getOutProvinceCarcassesBuyer();
+                },
+                hasMore: data.value.data?.next != null,
+                listType: ListType.separated,
+                resource: data.value,
+                padding: EdgeInsets.fromLTRB(8, 8, 8, 80),
+                itemBuilder: (context, index) {
+                  var item = data.value.data!.results![index];
+                  return ObxValue((val) {
+                    return ExpandableListItem2(
+                      selected: val.contains(index),
+                      onTap: () => controller.isExpandedList.toggle(index),
+                      index: index,
+                      child: itemListWidget(item),
+                      secondChild: itemListExpandedWidget(item),
+                      labelColor: AppColor.blueLight,
+                      labelIcon: Assets.vec.userRaduisSvg.path,
+                    );
+                  }, controller.isExpandedList);
+                },
+                itemCount: data.value.data?.results?.length ?? 0,
+                separatorBuilder: (context, index) => SizedBox(height: 8.h),
+              );
+            }, controller.buyerList),
+          ),
+          Positioned(
+            bottom: 100,
+            child: RFab.add(
+              onPressed: () {
+                Get.bottomSheet(
+                  addOrEditBuyerBottomSheet(),
+                  isScrollControlled: true,
+                  ignoreSafeArea: false,
+                ).whenComplete(() => controller.resetSubmitForm());
              },
-              hasMore: data.value.data?.next != null,
-              listType: ListType.separated,
-              resource: data.value,
-              padding: EdgeInsets.fromLTRB(8, 8, 8, 80),
-              itemBuilder: (context, index) {
-                var item = data.value.data!.results![index];
-                return ObxValue((val) {
-                  return ExpandableListItem2(
-                    selected: val.contains(index),
-                    onTap: () => controller.isExpandedList.toggle(index),
-                    index: index,
-                    child: itemListWidget(item),
-                    secondChild: itemListExpandedWidget(item),
-                    labelColor: AppColor.blueLight,
-                    labelIcon: Assets.vec.userRaduisSvg.path,
-                  );
-                }, controller.isExpandedList);
-              },
-              itemCount: data.value.data?.results?.length ?? 0,
-              separatorBuilder: (context, index) => SizedBox(height: 8.h),
-            );
-          }, controller.buyerList),
-        ),
-      ],
-      floatingActionButton: RFab.add(
-        onPressed: () {
-          Get.bottomSheet(
-            addOrEditBuyerBottomSheet(),
-            isScrollControlled: true,
-            ignoreSafeArea: false,
-          ).whenComplete(() => controller.resetSubmitForm());
-        },
+            ),
+          ),
+        ],
      ),
-      floatingActionButtonLocation: FloatingActionButtonLocation.startFloat,
    );
  }

@@ -206,7 +208,7 @@ class SalesOutOfProvinceBuyersPage extends GetView<SalesOutOfProvinceBuyersLogic
    }, controller.cites);
  }

-  itemListWidget(OutProvinceCarcassesBuyer item) {
+  Padding itemListWidget(OutProvinceCarcassesBuyer item) {
    return Padding(
      padding: const EdgeInsets.only(right: 8),
      child: Row(
--- a/packages/chicken/lib/presentation/pages/steward/segmentation/view.dart
+++ b/packages/chicken/lib/presentation/pages/steward/segmentation/view.dart
@@ -21,9 +21,9 @@ class SegmentationPage extends GetView<SegmentationLogic> {
        Get.bottomSheet(filterBottomSheet());
      },
      hasBack: false,
-      widgets: [
-        Expanded(
-          child: ObxValue((data) {
+      child: Stack(
+        children: [
+          Positioned.fill(child: ObxValue((data) {
            return RPaginatedListView(
              onLoadMore: () async => controller.getAllSegmentation(true),
              onRefresh: () async {
@@ -52,21 +52,24 @@ class SegmentationPage extends GetView<SegmentationLogic> {
              itemCount: data.value.data?.results?.length ?? 0,
              separatorBuilder: (context, index) => SizedBox(height: 8.h),
            );
-          }, controller.segmentationList),
-        ),
-      ],
-      floatingActionButtonLocation: FloatingActionButtonLocation.startFloat,
-      floatingActionButton: RFab.add(
-        onPressed: () {
-          Get.bottomSheet(
-            addOrEditBottomSheet(),
-            isScrollControlled: true,
-            ignoreSafeArea: false,
-          ).whenComplete(() {
-            controller.clearForm();
-          });
-        },
+          }, controller.segmentationList)),
+          Positioned(
+              right: 10,
+              bottom: 90.h,
+              child: RFab.add(
+            onPressed: () {
+              Get.bottomSheet(
+                addOrEditBottomSheet(),
+                isScrollControlled: true,
+                ignoreSafeArea: false,
+              ).whenComplete(() {
+                controller.clearForm();
+              });
+            },
+          ))
+        ],
      ),
+
    );
  }