mr.mojtaba/rasadyar_application
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix : ui changes

Browse Source
This commit is contained in:
mr.mojtaba
2025-10-01 11:07:47 +03:30
parent b4cf253143
commit 20a4a59c2e
5 changed files with 169 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
android/app/src/main/AndroidManifest.xml
View File

@@ -1,20 +1,19 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"> <manifest xmlns:android="http://schemas.android.com/apk/res/android">
<uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" /> <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
<uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" /> <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_FINE_LOCATION"/>
<uses-permission android:name="android.permission.ACCESS_COARSE_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.MANAGE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
<uses-permission <uses-permission
android:name="android.permission.READ_EXTERNAL_STORAGE" android:name="android.permission.READ_EXTERNAL_STORAGE"
android:maxSdkVersion="32" /> android:maxSdkVersion="32"/>
<uses-permission <uses-permission
android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:name="android.permission.WRITE_EXTERNAL_STORAGE"
android:maxSdkVersion="28" /> android:maxSdkVersion="28"/>
<application <application
@@ -39,10 +38,10 @@
to determine the Window background behind the Flutter UI. --> to determine the Window background behind the Flutter UI. -->
<meta-data <meta-data
android:name="io.flutter.embedding.android.NormalTheme" android:name="io.flutter.embedding.android.NormalTheme"
android:resource="@style/NormalTheme" /> android:resource="@style/NormalTheme"/>
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER" /> <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter> </intent-filter>
</activity> </activity>
@@ -55,7 +54,7 @@
This is used by the Flutter tool to generate GeneratedPluginRegistrant.java --> This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
<meta-data <meta-data
android:name="flutterEmbedding" android:name="flutterEmbedding"
android:value="2" /> android:value="2"/>
<provider <provider
android:name="androidx.core.content.FileProvider" android:name="androidx.core.content.FileProvider"
@@ -64,7 +63,7 @@
android:grantUriPermissions="true"> android:grantUriPermissions="true">
<meta-data <meta-data
android:name="android.support.FILE_PROVIDER_PATHS" android:name="android.support.FILE_PROVIDER_PATHS"
android:resource="@xml/file_paths" /> android:resource="@xml/file_paths"/>
</provider> </provider>
</application> </application>
<!-- Required to query activities that can process text, see: <!-- 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. --> In particular, this is used by the Flutter engine in io.flutter.plugin.text.ProcessTextPlugin. -->
<queries> <queries>
<intent> <intent>
<action android:name="android.intent.action.PROCESS_TEXT" /> <action android:name="android.intent.action.PROCESS_TEXT"/>
<data android:mimeType="text/plain" /> <data android:mimeType="text/plain"/>
</intent> </intent>
</queries> </queries>
</manifest> </manifest>

2
android/local.properties
View File

@@ -1,5 +1,5 @@
sdk.dir=C:/Users/Housh11/AppData/Local/Android/Sdk sdk.dir=C:/Users/Housh11/AppData/Local/Android/Sdk
flutter.sdk=C:\\src\\flutter flutter.sdk=C:\\src\\flutter
flutter.buildMode=release flutter.buildMode=debug
flutter.versionName=1.3.13 flutter.versionName=1.3.13
flutter.versionCode=10 flutter.versionCode=10

26
packages/chicken/lib/presentation/pages/steward/sales_out_of_province/view.dart
View File

@@ -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/base_page/view.dart';
import 'package:rasadyar_chicken/presentation/widget/filter_bottom_sheet.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/steward/inventory_widget.dart';
import 'package:rasadyar_chicken/presentation/widget/page_route.dart';
import 'package:rasadyar_core/core.dart'; import 'package:rasadyar_core/core.dart';
import 'logic.dart'; import 'logic.dart';
@@ -27,10 +25,13 @@ class SalesOutOfProvincePage extends GetView<SalesOutOfProvinceLogic> {
onFilterTap: () { onFilterTap: () {
Get.bottomSheet(filterBottomSheet()); Get.bottomSheet(filterBottomSheet());
}, },
widgets: [ child: Stack(
children: [
Positioned.fill(
child: Column(
children: [
inventoryWidget(controller.rootLogic), inventoryWidget(controller.rootLogic),
Expanded( ObxValue((data) {
child: ObxValue((data) {
return RPaginatedListView( return RPaginatedListView(
onLoadMore: () async => controller.getOutProvinceSales(true), onLoadMore: () async => controller.getOutProvinceSales(true),
onRefresh: () async { onRefresh: () async {
@@ -59,9 +60,14 @@ class SalesOutOfProvincePage extends GetView<SalesOutOfProvinceLogic> {
separatorBuilder: (context, index) => SizedBox(height: 8.h), separatorBuilder: (context, index) => SizedBox(height: 8.h),
); );
}, controller.salesList), }, controller.salesList),
),
], ],
floatingActionButton: Row( ),
),
Positioned(
right: 5,
left: 0,
bottom: 95,
child: Row(
children: [ children: [
RFab.add( RFab.add(
onPressed: () { onPressed: () {
@@ -73,13 +79,15 @@ class SalesOutOfProvincePage extends GetView<SalesOutOfProvinceLogic> {
icon: Icon(CupertinoIcons.person_add_solid, color: Colors.white, size: 35.w), icon: Icon(CupertinoIcons.person_add_solid, color: Colors.white, size: 35.w),
backgroundColor: AppColor.blueNormal, backgroundColor: AppColor.blueNormal,
onPressed: () { onPressed: () {
Get.toNamed(ChickenRoutes.salesOutOfProvinceBuyerSteward, id: 1); Get.toNamed(ChickenRoutes.salesOutOfProvinceBuyerSteward, id: stewardSecondKey);
}, },
), ),
SizedBox(width: 25), SizedBox(width: 25),
], ],
), ),
floatingActionButtonLocation: FloatingActionButtonLocation.startFloat, ),
],
),
); );
} }

22
packages/chicken/lib/presentation/pages/steward/sales_out_of_province_buyers/view.dart
View File

@@ -1,11 +1,9 @@
import 'package:flutter/material.dart'; 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/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/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/base_page/view.dart';
import 'package:rasadyar_chicken/presentation/widget/filter_bottom_sheet.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 'package:rasadyar_core/core.dart';
import 'logic.dart'; import 'logic.dart';
@@ -17,11 +15,12 @@ class SalesOutOfProvinceBuyersPage extends GetView<SalesOutOfProvinceBuyersLogic
Widget build(BuildContext context) { Widget build(BuildContext context) {
return ChickenBasePage( return ChickenBasePage(
routes: controller.routesName, routes: controller.routesName,
backId: 1, backId: stewardSecondKey,
onSearchChanged: (data) => controller.setSearchValue(data), onSearchChanged: (data) => controller.setSearchValue(data),
filteringWidget: filterBottomSheet(), filteringWidget: filterBottomSheet(),
widgets: [ child: Stack(
Expanded( children: [
Positioned.fill(
child: ObxValue((data) { child: ObxValue((data) {
return RPaginatedListView( return RPaginatedListView(
onLoadMore: () async => controller.getOutProvinceCarcassesBuyer(true), onLoadMore: () async => controller.getOutProvinceCarcassesBuyer(true),
@@ -52,8 +51,9 @@ class SalesOutOfProvinceBuyersPage extends GetView<SalesOutOfProvinceBuyersLogic
); );
}, controller.buyerList), }, controller.buyerList),
), ),
], Positioned(
floatingActionButton: RFab.add( bottom: 100,
child: RFab.add(
onPressed: () { onPressed: () {
Get.bottomSheet( Get.bottomSheet(
addOrEditBuyerBottomSheet(), addOrEditBuyerBottomSheet(),
@@ -62,7 +62,9 @@ class SalesOutOfProvinceBuyersPage extends GetView<SalesOutOfProvinceBuyersLogic
).whenComplete(() => controller.resetSubmitForm()); ).whenComplete(() => controller.resetSubmitForm());
}, },
), ),
floatingActionButtonLocation: FloatingActionButtonLocation.startFloat, ),
],
),
); );
} }
@@ -206,7 +208,7 @@ class SalesOutOfProvinceBuyersPage extends GetView<SalesOutOfProvinceBuyersLogic
}, controller.cites); }, controller.cites);
} }
itemListWidget(OutProvinceCarcassesBuyer item) { Padding itemListWidget(OutProvinceCarcassesBuyer item) {
return Padding( return Padding(
padding: const EdgeInsets.only(right: 8), padding: const EdgeInsets.only(right: 8),
child: Row( child: Row(

19
packages/chicken/lib/presentation/pages/steward/segmentation/view.dart
View File

@@ -21,9 +21,9 @@ class SegmentationPage extends GetView<SegmentationLogic> {
Get.bottomSheet(filterBottomSheet()); Get.bottomSheet(filterBottomSheet());
}, },
hasBack: false, hasBack: false,
widgets: [ child: Stack(
Expanded( children: [
child: ObxValue((data) { Positioned.fill(child: ObxValue((data) {
return RPaginatedListView( return RPaginatedListView(
onLoadMore: () async => controller.getAllSegmentation(true), onLoadMore: () async => controller.getAllSegmentation(true),
onRefresh: () async { onRefresh: () async {
@@ -52,11 +52,11 @@ class SegmentationPage extends GetView<SegmentationLogic> {
itemCount: data.value.data?.results?.length ?? 0, itemCount: data.value.data?.results?.length ?? 0,
separatorBuilder: (context, index) => SizedBox(height: 8.h), separatorBuilder: (context, index) => SizedBox(height: 8.h),
); );
}, controller.segmentationList), }, controller.segmentationList)),
), Positioned(
], right: 10,
floatingActionButtonLocation: FloatingActionButtonLocation.startFloat, bottom: 90.h,
floatingActionButton: RFab.add( child: RFab.add(
onPressed: () { onPressed: () {
Get.bottomSheet( Get.bottomSheet(
addOrEditBottomSheet(), addOrEditBottomSheet(),
@@ -66,7 +66,10 @@ class SegmentationPage extends GetView<SegmentationLogic> {
controller.clearForm(); controller.clearForm();
}); });
}, },
))
],
), ),
); );
} }