change page navigation

lib/pages/box/box_editor.dart

@@ -23,6 +23,7 @@ import 'package:fcs/pages/widgets/local_text.dart';
 import 'package:fcs/pages/widgets/my_data_table.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';
@@ -336,7 +337,8 @@ class _BoxEditorState extends State<BoxEditor> {
           onTap: () {
             Navigator.push(
               context,
-              BottomUpPageRoute(CargoTypeEditor(cargo: c.value)),
+              CupertinoPageRoute(
+                  builder: (context) => CargoTypeEditor(cargo: c.value)),
             );
           },
           child: Container(
@@ -475,7 +477,7 @@ class _BoxEditorState extends State<BoxEditor> {
         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,
@@ -552,7 +554,9 @@ class _BoxEditorState extends State<BoxEditor> {
                   titleKey: "box.cargo_type",
                   onTap: () async {
                     Cargo cargo = await Navigator.push<Cargo>(
-                        context, BottomUpPageRoute(CargoTypeEditor()));
+                        context,
+                        CupertinoPageRoute(
+                            builder: (context) => CargoTypeEditor()));
                     if (cargo != null) {
                       setState(() {
                         _box.cargoTypes.add(cargo);
@@ -599,9 +603,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_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,6 +1,7 @@
 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';
 
@@ -35,12 +36,12 @@ class _BoxListRowState extends State<BoxListRow> {
           if (widget.isReadOnly) {
             // Navigator.push(
             //   context,
-            //   BottomUpPageRoute(PackageInfo(package: _box)),
+            // CupertinoPageRoute(builder: (context) => PackageInfo(package: _box)),
             // );
           } else {
             Navigator.push(
               context,
-              BottomUpPageRoute(BoxEditor(box: _box)),
+              CupertinoPageRoute(builder: (context) => BoxEditor(box: _box)),
             );
           }
         },

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,