resolve conflit

lib/pages/box/box_editor.dart

@@ -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(() {

lib/pages/box/box_info.dart

@@ -545,7 +545,7 @@ class _BoxInfoState extends State<BoxInfo> {
   _gotoEditor() async {
     Navigator.push(
       context,
-      BottomUpPageRoute(BoxEditor(box: widget.box)),
+      CupertinoPageRoute(builder: (context) => BoxEditor(box: widget.box)),
     );
   }
 }

lib/pages/box/box_list.dart

@@ -86,7 +86,7 @@ class _BoxListState extends State<BoxList> {
   _newPickup() {
     Navigator.push(
       context,
-      BottomUpPageRoute(BoxEditor()),
+      CupertinoPageRoute(builder: (context) => BoxEditor()),
     );
   }
 

lib/pages/box/box_list_row.dart

@@ -1,10 +1,8 @@
 import 'package:fcs/domain/entities/box.dart';
 import 'package:fcs/pages/main/util.dart';
-import 'package:fcs/pages/widgets/bottom_up_page_route.dart';
+import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
-
-import 'box_editor.dart';
 import 'box_info.dart';
 
 class BoxListRow extends StatefulWidget {
@@ -35,7 +33,7 @@ class _BoxListRowState extends State<BoxListRow> {
         onTap: () {
           Navigator.push(
             context,
-            BottomUpPageRoute(BoxInfo(box: _box)),
+            CupertinoPageRoute(builder: (context) => BoxInfo(box: _box)),
           );
         },
         child: Row(

lib/pages/box/cargo_type_editor.dart

@@ -6,6 +6,7 @@ import 'package:fcs/pages/widgets/input_text.dart';
 import 'package:fcs/pages/widgets/local_dropdown.dart';
 import 'package:fcs/pages/widgets/local_text.dart';
 import 'package:fcs/pages/widgets/progress.dart';
+import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:provider/provider.dart';
@@ -81,7 +82,8 @@ class _CargoTypeEditorState extends State<CargoTypeEditor> {
         appBar: AppBar(
             centerTitle: true,
             leading: new IconButton(
-              icon: new Icon(Icons.close, color: primaryColor, size: 30),
+              icon:
+                  new Icon(CupertinoIcons.back, color: primaryColor, size: 30),
               onPressed: () => Navigator.of(context).pop(),
             ),
             shadowColor: Colors.transparent,