sainw/fcs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve conflit

Browse Source
This commit is contained in:
Thinzar Win
2020-10-14 21:46:35 +06:30
parent 4862f1123d 3a6fee3f43
commit 68ff930145
75 changed files with 2002 additions and 450 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/pages/box/box_editor.dart
View File

@@ -402,10 +402,10 @@ class _BoxEditorState extends State<BoxEditor> {
return InkWell(
onTap: () async {
Cargo cargo = await Navigator.push<Cargo>(
context,
BottomUpPageRoute(CargoTypeEditor(
cargo: c.value,
)));
context,
CupertinoPageRoute(
builder: (context) => CargoTypeEditor(cargo: c.value)),
);
_addCargo(cargo);
},
child: Container(
@@ -631,7 +631,11 @@ class _BoxEditorState extends State<BoxEditor> {
),
onPressed: () async {
Cargo cargo = await Navigator.push<Cargo>(
context, BottomUpPageRoute(CargoTypeEditor()));
context,
CupertinoPageRoute(
builder: (context) => CargoTypeEditor()),
);
_addCargo(cargo);
}),
),
@@ -652,9 +656,10 @@ class _BoxEditorState extends State<BoxEditor> {
onTap: () async {
DeliveryAddress d = await Navigator.push<DeliveryAddress>(
context,
BottomUpPageRoute(DeliveryAddressSelection(
deliveryAddress: _deliveryAddress,
)),
CupertinoPageRoute(
builder: (context) => DeliveryAddressSelection(
deliveryAddress: _deliveryAddress,
)),
);
if (d == null) return;
setState(() {