fix : ui changes
This commit is contained in:
@@ -5,9 +5,7 @@
|
|||||||
<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"
|
||||||
@@ -17,6 +15,7 @@
|
|||||||
android:maxSdkVersion="28"/>
|
android:maxSdkVersion="28"/>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<application
|
<application
|
||||||
android:largeHeap="true"
|
android:largeHeap="true"
|
||||||
android:name="${applicationName}"
|
android:name="${applicationName}"
|
||||||
|
|||||||
@@ -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
|
||||||
@@ -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,
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -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(
|
||||||
|
|||||||
@@ -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();
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
))
|
||||||
|
],
|
||||||
),
|
),
|
||||||
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user