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/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -1,70 +1,69 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">

-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-    <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
-    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
-    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
+    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
+    <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION"/>
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
+    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE"/>

    <uses-permission
-        android:name="android.permission.READ_EXTERNAL_STORAGE"
-        android:maxSdkVersion="32" />
+            android:name="android.permission.READ_EXTERNAL_STORAGE"
+            android:maxSdkVersion="32"/>
    <uses-permission
-        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
-        android:maxSdkVersion="28" />
+            android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+            android:maxSdkVersion="28"/>
+


    <application
-        android:largeHeap="true"
-        android:name="${applicationName}"
-        android:icon="@mipmap/launcher_icon"
-        android:label="رصــدیـار">
+            android:largeHeap="true"
+            android:name="${applicationName}"
+            android:icon="@mipmap/launcher_icon"
+            android:label="رصــدیـار">
        <activity
-            android:name=".MainActivity"
-            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
-            android:enableOnBackInvokedCallback="true"
-            android:exported="true"
-            android:hardwareAccelerated="true"
-            android:launchMode="singleTop"
-            android:requestLegacyExternalStorage="true"
-            android:taskAffinity=""
-            android:theme="@style/LaunchTheme"
-            android:windowSoftInputMode="adjustResize">
+                android:name=".MainActivity"
+                android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
+                android:enableOnBackInvokedCallback="true"
+                android:exported="true"
+                android:hardwareAccelerated="true"
+                android:launchMode="singleTop"
+                android:requestLegacyExternalStorage="true"
+                android:taskAffinity=""
+                android:theme="@style/LaunchTheme"
+                android:windowSoftInputMode="adjustResize">
            <!-- Specifies an Android theme to apply to this Activity as soon as
                 the Android process has started. This theme is visible to the user
                 while the Flutter UI initializes. After that, this theme continues
                 to determine the Window background behind the Flutter UI. -->
            <meta-data
-                android:name="io.flutter.embedding.android.NormalTheme"
-                android:resource="@style/NormalTheme" />
+                    android:name="io.flutter.embedding.android.NormalTheme"
+                    android:resource="@style/NormalTheme"/>
            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
            </intent-filter>
        </activity>

        <activity
-            android:name="com.yalantis.ucrop.UCropActivity"
-            android:screenOrientation="fullSensor"
-            android:theme="@style/Ucrop.CropTheme"/>
+                android:name="com.yalantis.ucrop.UCropActivity"
+                android:screenOrientation="fullSensor"
+                android:theme="@style/Ucrop.CropTheme"/>

        <!-- Don't delete the meta-data below.
             This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
        <meta-data
-            android:name="flutterEmbedding"
-            android:value="2" />
+                android:name="flutterEmbedding"
+                android:value="2"/>

        <provider
-            android:name="androidx.core.content.FileProvider"
-            android:authorities="${applicationId}.fileprovider"
-            android:exported="false"
-            android:grantUriPermissions="true">
+                android:name="androidx.core.content.FileProvider"
+                android:authorities="${applicationId}.fileprovider"
+                android:exported="false"
+                android:grantUriPermissions="true">
            <meta-data
-                android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/file_paths" />
+                    android:name="android.support.FILE_PROVIDER_PATHS"
+                    android:resource="@xml/file_paths"/>
        </provider>
    </application>
    <!-- Required to query activities that can process text, see:
@@ -74,8 +73,8 @@
         In particular, this is used by the Flutter engine in io.flutter.plugin.text.ProcessTextPlugin. -->
    <queries>
        <intent>
-            <action android:name="android.intent.action.PROCESS_TEXT" />
-            <data android:mimeType="text/plain" />
+            <action android:name="android.intent.action.PROCESS_TEXT"/>
+            <data android:mimeType="text/plain"/>
        </intent>
    </queries>
 </manifest>
--- a/android/local.properties
+++ b/android/local.properties
@@ -1,5 +1,5 @@
 sdk.dir=C:/Users/Housh11/AppData/Local/Android/Sdk
 flutter.sdk=C:\\src\\flutter
-flutter.buildMode=release
+flutter.buildMode=debug
 flutter.versionName=1.3.13
 flutter.versionCode=10
--- 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();
+              });
+            },
+          ))
+        ],
      ),
+
    );
  }