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

@@ -6,6 +6,7 @@ import 'package:fcs/pages/main/util.dart';
import 'package:fcs/pages/widgets/input_text.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:flutter_icons/flutter_icons.dart';
import 'package:provider/provider.dart';
@@ -58,7 +59,7 @@ class _PaymentMethodEditorState extends State<PaymentMethodEditor> {
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(),
),
title: LocalText(

View File

@@ -9,6 +9,7 @@ import 'package:fcs/pages/widgets/bottom_up_page_route.dart';
import 'package:fcs/pages/widgets/display_text.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:flutter/services.dart';
import 'package:flutter_icons/flutter_icons.dart';
@@ -35,7 +36,7 @@ class _PaymentMethodPageState extends State<PaymentMethodPage> {
appBar: AppBar(
leading: new IconButton(
icon: new Icon(
Icons.close,
CupertinoIcons.back,
color: primaryColor,
),
onPressed: () => Navigator.of(context).pop(),
@@ -69,7 +70,8 @@ class _PaymentMethodPageState extends State<PaymentMethodPage> {
onPressed: () {
Navigator.push(
context,
BottomUpPageRoute(PaymentMethodEditor()),
CupertinoPageRoute(
builder: (context) => PaymentMethodEditor()),
);
},
icon: Icon(Icons.add),
@@ -95,9 +97,10 @@ class _PaymentMethodPageState extends State<PaymentMethodPage> {
? () {
Navigator.push(
context,
BottomUpPageRoute(PaymentMethodEditor(
paymentMethod: method,
)),
CupertinoPageRoute(
builder: (context) => PaymentMethodEditor(
paymentMethod: method,
)),
);
}
: null,