resolve conflit

lib/pages/shipment/shipment_box_editor.dart

@@ -15,6 +15,7 @@ import 'package:fcs/pages/widgets/local_text.dart';
 import 'package:fcs/pages/widgets/local_title.dart';
 import 'package:fcs/pages/widgets/my_data_table.dart';
 import 'package:fcs/pages/widgets/progress.dart';
+import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_icons/flutter_icons.dart';
 import 'package:provider/provider.dart';
@@ -118,7 +119,7 @@ class _ShipmentBoxEditorState extends State<ShipmentBoxEditor> {
           centerTitle: true,
           leading: new IconButton(
             icon: new Icon(
-              Icons.close,
+              CupertinoIcons.back,
               color: primaryColor,
             ),
             onPressed: () => Navigator.of(context).pop(),
@@ -145,7 +146,9 @@ class _ShipmentBoxEditorState extends State<ShipmentBoxEditor> {
                     ),
                     onPressed: () async {
                       Cargo cargo = await Navigator.push<Cargo>(
-                          context, BottomUpPageRoute(CargoTypeEditor()));
+                          context,
+                          CupertinoPageRoute(
+                              builder: (context) => CargoTypeEditor()));
                       _addCargo(cargo);
                     }),
               ),
@@ -182,9 +185,10 @@ class _ShipmentBoxEditorState extends State<ShipmentBoxEditor> {
                   onTap: () async {
                     DeliveryAddress d = await Navigator.push<DeliveryAddress>(
                       context,
-                      BottomUpPageRoute(DeliveryAddressSelection(
-                        deliveryAddress: _deliveryAddress,
-                      )),
+                      CupertinoPageRoute(
+                          builder: (context) => DeliveryAddressSelection(
+                                deliveryAddress: _deliveryAddress,
+                              )),
                     );
                     if (d == null) return;
                     setState(() {
@@ -210,9 +214,10 @@ class _ShipmentBoxEditorState extends State<ShipmentBoxEditor> {
         onSelectChanged: (bool selected) async {
           Cargo cargo = await Navigator.push<Cargo>(
               context,
-              BottomUpPageRoute(CargoTypeEditor(
-                cargo: c,
-              )));
+              CupertinoPageRoute(
+                  builder: (context) => CargoTypeEditor(
+                        cargo: c,
+                      )));
           _addCargo(cargo);
         },
         cells: [