fix : ui bug`
This commit is contained in:
@@ -77,7 +77,7 @@ class BuyInProvinceWaitingPage extends GetView<BuyInProvinceWaitingLogic> {
|
|||||||
spacing: 3,
|
spacing: 3,
|
||||||
children: [
|
children: [
|
||||||
Text(
|
Text(
|
||||||
item.steward?.user?.fullname ?? 'N/A',
|
item.toSteward?.user?.fullname ?? 'N/A',
|
||||||
textAlign: TextAlign.start,
|
textAlign: TextAlign.start,
|
||||||
style: AppFonts.yekan12.copyWith(color: AppColor.blueNormal),
|
style: AppFonts.yekan12.copyWith(color: AppColor.blueNormal),
|
||||||
),
|
),
|
||||||
@@ -118,7 +118,7 @@ class BuyInProvinceWaitingPage extends GetView<BuyInProvinceWaitingLogic> {
|
|||||||
),
|
),
|
||||||
|
|
||||||
Text(
|
Text(
|
||||||
item.steward?.guildsName ?? 'N/A',
|
item?.toSteward?.guildsName ?? 'N/A',
|
||||||
textAlign: TextAlign.start,
|
textAlign: TextAlign.start,
|
||||||
style: AppFonts.yekan12.copyWith(color: AppColor.bgDark),
|
style: AppFonts.yekan12.copyWith(color: AppColor.bgDark),
|
||||||
),
|
),
|
||||||
|
|||||||
@@ -25,52 +25,61 @@ class BuyOutOfProvincePage extends GetView<BuyOutOfProvinceLogic> {
|
|||||||
onFilterTap: () {
|
onFilterTap: () {
|
||||||
Get.bottomSheet(filterBottomSheet());
|
Get.bottomSheet(filterBottomSheet());
|
||||||
},
|
},
|
||||||
widgets: [
|
|
||||||
inventoryWidget(controller.rootLogic),
|
child: Stack(
|
||||||
Expanded(
|
children: [
|
||||||
child: ObxValue((data) {
|
Positioned.fill(child:Column(
|
||||||
return RPaginatedListView(
|
children: [
|
||||||
listType: ListType.separated,
|
inventoryWidget(controller.rootLogic),
|
||||||
resource: data.value,
|
ObxValue((data) {
|
||||||
hasMore: data.value.data?.next != null,
|
return RPaginatedListView(
|
||||||
padding: EdgeInsets.fromLTRB(8, 8, 8, 80),
|
listType: ListType.separated,
|
||||||
itemBuilder: (context, index) {
|
resource: data.value,
|
||||||
var item = data.value.data!.results![index];
|
hasMore: data.value.data?.next != null,
|
||||||
return ObxValue((val) {
|
padding: EdgeInsets.fromLTRB(8, 8, 8, 80),
|
||||||
return ExpandableListItem2(
|
itemBuilder: (context, index) {
|
||||||
selected: val.contains(index),
|
var item = data.value.data!.results![index];
|
||||||
onTap: () => controller.isExpandedList.toggle(index),
|
return ObxValue((val) {
|
||||||
index: index,
|
return ExpandableListItem2(
|
||||||
child: itemListWidget(item),
|
selected: val.contains(index),
|
||||||
secondChild: itemListExpandedWidget(item),
|
onTap: () => controller.isExpandedList.toggle(index),
|
||||||
labelColor: AppColor.blueLight,
|
index: index,
|
||||||
labelIcon: Assets.vec.truckFastOutlinedSvg.path,
|
child: itemListWidget(item),
|
||||||
);
|
secondChild: itemListExpandedWidget(item),
|
||||||
}, controller.isExpandedList);
|
labelColor: AppColor.blueLight,
|
||||||
},
|
labelIcon: Assets.vec.truckFastOutlinedSvg.path,
|
||||||
itemCount: data.value.data?.results?.length ?? 0,
|
);
|
||||||
separatorBuilder: (context, index) => SizedBox(height: 8.h),
|
}, controller.isExpandedList);
|
||||||
onLoadMore: () async => controller.getStewardPurchaseOutOfProvince(true),
|
},
|
||||||
onRefresh: () async {
|
itemCount: data.value.data?.results?.length ?? 0,
|
||||||
controller.currentPage.value = 1;
|
separatorBuilder: (context, index) => SizedBox(height: 8.h),
|
||||||
await controller.getStewardPurchaseOutOfProvince();
|
onLoadMore: () async => controller.getStewardPurchaseOutOfProvince(true),
|
||||||
},
|
onRefresh: () async {
|
||||||
);
|
controller.currentPage.value = 1;
|
||||||
}, controller.purchaseOutOfProvinceList),
|
await controller.getStewardPurchaseOutOfProvince();
|
||||||
),
|
},
|
||||||
],
|
);
|
||||||
floatingActionButton: RFab.add(
|
}, controller.purchaseOutOfProvinceList)
|
||||||
onPressed: () {
|
],
|
||||||
Get.bottomSheet(
|
)),
|
||||||
addPurchasedInformationBottomSheet(),
|
Positioned(
|
||||||
isScrollControlled: true,
|
right: 5,
|
||||||
ignoreSafeArea: false,
|
bottom: 95,
|
||||||
).whenComplete(() {
|
child: RFab.add(
|
||||||
controller.resetSubmitForm();
|
onPressed: () {
|
||||||
});
|
Get.bottomSheet(
|
||||||
},
|
addPurchasedInformationBottomSheet(),
|
||||||
|
isScrollControlled: true,
|
||||||
|
ignoreSafeArea: false,
|
||||||
|
).whenComplete(() {
|
||||||
|
controller.resetSubmitForm();
|
||||||
|
});
|
||||||
|
},
|
||||||
|
))
|
||||||
|
|
||||||
|
],
|
||||||
),
|
),
|
||||||
floatingActionButtonLocation: FloatingActionButtonLocation.startFloat,
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -65,7 +65,7 @@ class HomePage extends GetView<HomeLogic> {
|
|||||||
),
|
),
|
||||||
SizedBox(height: 8),
|
SizedBox(height: 8),
|
||||||
_todayShipmentWidget(),
|
_todayShipmentWidget(),
|
||||||
_todayShipmentWidget2(),
|
//_todayShipmentWidget2(),
|
||||||
_inventoryWidget(),
|
_inventoryWidget(),
|
||||||
|
|
||||||
Row(
|
Row(
|
||||||
@@ -105,7 +105,7 @@ class HomePage extends GetView<HomeLogic> {
|
|||||||
children: [Icon(CupertinoIcons.chevron_down, size: 18)],
|
children: [Icon(CupertinoIcons.chevron_down, size: 18)],
|
||||||
),
|
),
|
||||||
_todayShipmentWidget(),
|
_todayShipmentWidget(),
|
||||||
_todayShipmentWidget2(),
|
// _todayShipmentWidget2(),
|
||||||
_inventoryWidget(),
|
_inventoryWidget(),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
|
|||||||
@@ -74,7 +74,7 @@ class SalesInProvincePage extends GetView<SalesInProvinceLogic> {
|
|||||||
),
|
),
|
||||||
Positioned(
|
Positioned(
|
||||||
right: 5,
|
right: 5,
|
||||||
bottom: 15,
|
bottom: 95,
|
||||||
child: SizedBox(
|
child: SizedBox(
|
||||||
width: Get.width - 30,
|
width: Get.width - 30,
|
||||||
child: Row(
|
child: Row(
|
||||||
|
|||||||
Reference in New Issue
Block a user