change page navigation

lib/pages/invoice/box_addition.dart

@@ -3,6 +3,7 @@ import 'package:fcs/helpers/theme.dart';
 import 'package:fcs/localization/app_translations.dart';
 import 'package:fcs/pages/box/model/box_model.dart';
 import 'package:fcs/pages/widgets/progress.dart';
+import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 
@@ -40,7 +41,7 @@ class _BoxAdditionState extends State<BoxAddition> {
         appBar: AppBar(
           centerTitle: true,
           leading: new IconButton(
-            icon: new Icon(Icons.close),
+            icon: new Icon(CupertinoIcons.back),
             onPressed: () => Navigator.of(context).pop(),
           ),
           backgroundColor: primaryColor,

lib/pages/invoice/invoce_list.dart

@@ -92,7 +92,8 @@ class _InvoiceListState extends State<InvoiceList> {
   }
 
   _newInvoice() {
-    Navigator.of(context).push(BottomUpPageRoute(InvoiceEditor()));
+    Navigator.of(context)
+        .push(CupertinoPageRoute(builder: (context) => InvoiceEditor()));
   }
 
   Widget _pending() {

lib/pages/invoice/invoice_editor.dart

@@ -22,6 +22,7 @@ import 'package:fcs/pages/widgets/multi_img_controller.dart';
 import 'package:fcs/pages/widgets/multi_img_file.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:font_awesome_flutter/font_awesome_flutter.dart';
@@ -188,7 +189,7 @@ class _InvoiceEditorState extends State<InvoiceEditor> {
         appBar: AppBar(
           centerTitle: true,
           leading: new IconButton(
-            icon: new Icon(Icons.close, color: primaryColor),
+            icon: new Icon(CupertinoIcons.back, color: primaryColor),
             onPressed: () => Navigator.of(context).pop(),
           ),
           backgroundColor: Colors.white,

lib/pages/invoice/invoice_list_row.dart

@@ -78,12 +78,13 @@ class _InvoiceListRowState extends State<InvoiceListRow> {
               child: InkWell(
                 onTap: () {
                   owner
-                      ? Navigator.of(context).push(
-                          BottomUpPageRoute(InvoiceEditor(invoice: _invoice)))
-                      : Navigator.of(context)
-                          .push(BottomUpPageRoute(PaymentPDFScreen(
-                          path: pdfPath,
-                        )));
+                      ? Navigator.of(context).push(CupertinoPageRoute(
+                          builder: (context) =>
+                              InvoiceEditor(invoice: _invoice)))
+                      : Navigator.of(context).push(CupertinoPageRoute(
+                          builder: (context) => PaymentPDFScreen(
+                                path: pdfPath,
+                              )));
                 },
                 child: new Row(
                   children: <Widget>[
@@ -147,8 +148,9 @@ class _InvoiceListRowState extends State<InvoiceListRow> {
                       ],
                     ),
                     onPressed: () {
-                      Navigator.of(context).push(
-                          BottomUpPageRoute(PaymentPage(invoice: _invoice)));
+                      Navigator.of(context).push(CupertinoPageRoute(
+                          builder: (context) =>
+                              PaymentPage(invoice: _invoice)));
                     },
                   )),
                 )

lib/pages/invoice/payment_page.dart

@@ -8,6 +8,7 @@ import 'package:fcs/pages/widgets/multi_img_file.dart';
 import 'package:fcs/pages/widgets/my_data_table.dart';
 import 'package:fcs/pages/widgets/number_cell.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:font_awesome_flutter/font_awesome_flutter.dart';
@@ -66,7 +67,7 @@ class _PaymentPageState extends State<PaymentPage> {
         appBar: AppBar(
           centerTitle: true,
           leading: new IconButton(
-            icon: new Icon(Icons.close),
+            icon: new Icon(CupertinoIcons.back),
             onPressed: () => Navigator.of(context).pop(),
           ),
           backgroundColor: primaryColor,

lib/pages/invoice/payment_pdf_screen.dart

@@ -30,6 +30,11 @@ class _PaymentPDFScreenState extends State<PaymentPDFScreen>
       appBar: AppBar(
         backgroundColor: primaryColor,
         title: Text("Invoice File"),
+        leading: new IconButton(
+            icon: new Icon(CupertinoIcons.back),
+            onPressed: () {
+              Navigator.of(context).pop();
+            }),
         actions: <Widget>[
           IconButton(
             icon: Icon(Icons.share),