change page navigation

2020-10-14 13:54:42 +06:30
parent 8f5542c4fb
commit 4007d20fd2
66 changed files with 249 additions and 160 deletions
--- a/lib/pages/rates/cargo_editor.dart
+++ b/lib/pages/rates/cargo_editor.dart
@@ -4,6 +4,7 @@ import 'package:fcs/localization/app_translations.dart';
 import 'package:fcs/pages/main/util.dart';
 import 'package:fcs/pages/widgets/input_text.dart';
 import 'package:fcs/pages/widgets/progress.dart';
+import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';

 class CargoEditor extends StatefulWidget {
@@ -52,9 +53,7 @@ class _CargoEditorState extends State<CargoEditor> {
        appBar: AppBar(
          centerTitle: true,
          leading: new IconButton(
-            icon: new Icon(
-              Icons.close,
-            ),
+            icon: new Icon(CupertinoIcons.back),
            onPressed: () => Navigator.of(context).pop(),
          ),
          backgroundColor: primaryColor,
--- a/lib/pages/rates/custom_editor.dart
+++ b/lib/pages/rates/custom_editor.dart
@@ -4,6 +4,7 @@ import 'package:fcs/localization/app_translations.dart';
 import 'package:fcs/pages/main/util.dart';
 import 'package:fcs/pages/widgets/input_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';

@@ -54,7 +55,7 @@ class _CustomEditorState extends State<CustomEditor> {
          centerTitle: true,
          leading: new IconButton(
            icon: new Icon(
-              Icons.close,
+              CupertinoIcons.back,
            ),
            onPressed: () => Navigator.of(context).pop(),
          ),
--- a/lib/pages/rates/discount_by_weight_editor.dart
+++ b/lib/pages/rates/discount_by_weight_editor.dart
@@ -4,6 +4,7 @@ import 'package:fcs/localization/app_translations.dart';
 import 'package:fcs/pages/main/util.dart';
 import 'package:fcs/pages/widgets/input_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';

@@ -39,8 +40,7 @@ class _DiscountByWeightEditorState extends State<DiscountByWeightEditor> {

  @override
  Widget build(BuildContext context) {
-
-     final weightBox = InputText(
+    final weightBox = InputText(
        labelTextKey: 'rate.discount.weight',
        iconData: FontAwesomeIcons.weightHanging,
        controller: _weightController);
@@ -55,9 +55,7 @@ class _DiscountByWeightEditorState extends State<DiscountByWeightEditor> {
        appBar: AppBar(
          centerTitle: true,
          leading: new IconButton(
-            icon: new Icon(
-              Icons.close,
-            ),
+            icon: new Icon(CupertinoIcons.back),
            onPressed: () => Navigator.of(context).pop(),
          ),
          backgroundColor: primaryColor,
--- a/lib/pages/rates/shipment_rates.dart
+++ b/lib/pages/rates/shipment_rates.dart
@@ -7,6 +7,7 @@ import 'package:fcs/pages/rates/model/shipment_rate_model.dart';
 import 'package:fcs/pages/widgets/bottom_up_page_route.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:provider/provider.dart';

@@ -44,9 +45,7 @@ class _ShipmentRatesState extends State<ShipmentRates> {
        appBar: AppBar(
          centerTitle: true,
          leading: new IconButton(
-            icon: new Icon(
-              Icons.close,
-            ),
+            icon: new Icon(CupertinoIcons.back),
            onPressed: () => Navigator.of(context).pop(),
          ),
          backgroundColor: primaryColor,
@@ -129,12 +128,12 @@ class _ShipmentRatesState extends State<ShipmentRates> {
              //       .push(MaterialPageRoute(builder: (_) => Term()));
              // }),
              fcsButton(context, "Estimate shipping cost", callack: () {
-                Navigator.of(context)
-                    .push(BottomUpPageRoute(ShipmentRatesCal()));
+                Navigator.of(context).push(CupertinoPageRoute(
+                    builder: (context) => ShipmentRatesCal()));
              }),
              fcsButton(context, "Edit", callack: () {
-                Navigator.of(context)
-                    .push(BottomUpPageRoute(ShipmentRatesEdit()));
+                Navigator.of(context).push(CupertinoPageRoute(
+                    builder: (context) => ShipmentRatesEdit()));
              }),
              SizedBox(height: 10)
            ],
--- a/lib/pages/rates/shipment_rates_calculate.dart
+++ b/lib/pages/rates/shipment_rates_calculate.dart
@@ -2,6 +2,7 @@ import 'package:fcs/helpers/theme.dart';
 import 'package:fcs/localization/app_translations.dart';
 import 'package:fcs/pages/rates/model/shipment_rate_model.dart';
 import 'package:fcs/pages/widgets/progress.dart';
+import 'package:flutter/cupertino.dart';
 import 'package:provider/provider.dart';

 import 'package:flutter/material.dart';
@@ -37,9 +38,7 @@ class _ShipmentRatesCalState extends State<ShipmentRatesCal> {
        appBar: AppBar(
          centerTitle: true,
          leading: new IconButton(
-            icon: new Icon(
-              Icons.close,
-            ),
+            icon: new Icon(CupertinoIcons.back),
            onPressed: () => Navigator.of(context).pop(),
          ),
          backgroundColor: primaryColor,
--- a/lib/pages/rates/shipment_rates_edit.dart
+++ b/lib/pages/rates/shipment_rates_edit.dart
@@ -9,6 +9,7 @@ import 'package:fcs/pages/widgets/bottom_up_page_route.dart';
 import 'package:fcs/pages/widgets/input_text.dart';
 import 'package:fcs/pages/widgets/my_data_table.dart';
 import 'package:fcs/pages/widgets/progress.dart';
+import 'package:flutter/cupertino.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:provider/provider.dart';

@@ -69,7 +70,7 @@ class _ShipmentRatesEditState extends State<ShipmentRatesEdit> {
          centerTitle: true,
          leading: new IconButton(
            icon: new Icon(
-              Icons.close,
+              CupertinoIcons.back,
            ),
            onPressed: () => Navigator.of(context).pop(),
          ),
@@ -136,7 +137,8 @@ class _ShipmentRatesEditState extends State<ShipmentRatesEdit> {
                                onPressed: () {
                                  Navigator.push(
                                    context,
-                                    BottomUpPageRoute(CargoEditor()),
+                                    CupertinoPageRoute(
+                                        builder: (context) => CargoEditor()),
                                  );
                                },
                                label: Text(
@@ -199,7 +201,8 @@ class _ShipmentRatesEditState extends State<ShipmentRatesEdit> {
                                onPressed: () {
                                  Navigator.push(
                                    context,
-                                    BottomUpPageRoute(CustomEditor()),
+                                    CupertinoPageRoute(
+                                        builder: (context) => CustomEditor()),
                                  );
                                },
                                label: Text(
@@ -263,7 +266,9 @@ class _ShipmentRatesEditState extends State<ShipmentRatesEdit> {
                                onPressed: () {
                                  Navigator.push(
                                    context,
-                                    BottomUpPageRoute(DiscountByWeightEditor()),
+                                    CupertinoPageRoute(
+                                        builder: (context) =>
+                                            DiscountByWeightEditor()),
                                  );
                                },
                                label: Text(
@@ -297,7 +302,7 @@ class _ShipmentRatesEditState extends State<ShipmentRatesEdit> {
        onSelectChanged: (selected) {
          Navigator.push(
            context,
-            BottomUpPageRoute(CargoEditor(rate: r)),
+            CupertinoPageRoute(builder: (context) => CargoEditor(rate: r)),
          );
        },
        cells: [
@@ -325,7 +330,7 @@ class _ShipmentRatesEditState extends State<ShipmentRatesEdit> {
        onSelectChanged: (selected) {
          Navigator.push(
            context,
-            BottomUpPageRoute(CustomEditor(custom: c)),
+            CupertinoPageRoute(builder: (context) => CustomEditor(custom: c)),
          );
        },
        cells: [
@@ -353,7 +358,7 @@ class _ShipmentRatesEditState extends State<ShipmentRatesEdit> {
        onSelectChanged: (selected) {
          // Navigator.push(
          //   context,
-          //   BottomUpPageRoute(CargoEditor(rate: r)),
+          //  CupertinoPageRoute(builder: (context) => CargoEditor(rate: r)),
          // );
        },
        cells: [