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: [

lib/pages/shipment/shipment_editor.dart

@@ -22,6 +22,7 @@ import 'package:fcs/pages/widgets/local_title.dart';
 import 'package:fcs/pages/widgets/multi_img_controller.dart';
 import 'package:fcs/pages/widgets/progress.dart';
 import 'package:fcs/pages/widgets/title_with_add_button.dart';
+import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_icons/flutter_icons.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
@@ -154,9 +155,10 @@ class _ShipmentEditorState extends State<ShipmentEditor> {
       onTap: () async {
         DeliveryAddress d = await Navigator.push<DeliveryAddress>(
           context,
-          BottomUpPageRoute(DeliveryAddressSelection(
-            deliveryAddress: _pickupAddress,
-          )),
+          CupertinoPageRoute(
+              builder: (context) => DeliveryAddressSelection(
+                    deliveryAddress: _pickupAddress,
+                  )),
         );
         if (d == null) return;
         setState(() {
@@ -187,7 +189,7 @@ class _ShipmentEditorState extends State<ShipmentEditor> {
           centerTitle: true,
           leading: new IconButton(
             icon: new Icon(
-              Icons.close,
+              CupertinoIcons.back,
               color: primaryColor,
             ),
             onPressed: () => Navigator.of(context).pop(),
@@ -234,7 +236,8 @@ class _ShipmentEditorState extends State<ShipmentEditor> {
                   onPressed: () {
                     Navigator.push(
                       context,
-                      BottomUpPageRoute(ShipmentBoxEditor()),
+                      CupertinoPageRoute(
+                          builder: (context) => ShipmentBoxEditor()),
                     );
                   },
                 ),
@@ -256,8 +259,8 @@ class _ShipmentEditorState extends State<ShipmentEditor> {
     return boxes.asMap().entries.map((_box) {
       return InkWell(
         onTap: () {
-          Navigator.of(context)
-              .push(BottomUpPageRoute(ShipmentBoxEditor(box: _box.value)));
+          Navigator.of(context).push(CupertinoPageRoute(
+              builder: (context) => ShipmentBoxEditor(box: _box.value)));
         },
         child: BoxRow(box: _box.value),
       );

lib/pages/shipment/shipment_list.dart

@@ -83,6 +83,7 @@ class _ShipmentListState extends State<ShipmentList> {
   }
 
   _newPickup() {
-    Navigator.of(context).push(BottomUpPageRoute(ShipmentEditor()));
+    Navigator.of(context)
+        .push(CupertinoPageRoute(builder: (context) => ShipmentEditor()));
   }
 }

lib/pages/shipment/shipment_list_row.dart

@@ -1,6 +1,7 @@
 import 'package:fcs/domain/entities/pickup.dart';
 import 'package:fcs/helpers/theme.dart';
 import 'package:fcs/pages/widgets/bottom_up_page_route.dart';
+import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_icons/flutter_icons.dart';
 
@@ -41,7 +42,7 @@ class _ShipmentListRowState extends State<ShipmentListRow> {
       child: InkWell(
         onTap: () {
           Navigator.of(context)
-              .push(BottomUpPageRoute(ShipmentEditor(shipment: _pickUp)));
+              .push(CupertinoPageRoute(builder: (context) => ShipmentEditor(shipment: _pickUp)));
         },
         child: Row(
           children: <Widget>[