change page navigation

This commit is contained in:
PhyoThandar
2020-10-14 13:54:42 +06:30
parent 8f5542c4fb
commit 4007d20fd2
66 changed files with 249 additions and 160 deletions

View File

@@ -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()),
);
},
),
@@ -257,8 +260,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),
);