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

@@ -5,6 +5,7 @@ import 'package:fcs/pages/main/util.dart';
import 'package:fcs/pages/widgets/display_text.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:flutter_icons/flutter_icons.dart';
import 'package:font_awesome_flutter/font_awesome_flutter.dart';
@@ -72,7 +73,7 @@ class _DiscountEditorState extends State<DiscountEditor> {
AppTranslations.of(context).text("discount.form"),
),
leading: new IconButton(
icon: new Icon(Icons.close),
icon: new Icon(CupertinoIcons.back),
onPressed: () => Navigator.of(context).pop(),
),
backgroundColor: primaryColor,

View File

@@ -52,9 +52,10 @@ class _DiscountListState extends State<DiscountList> {
onTap: () {
Navigator.push(
context,
BottomUpPageRoute(DiscountEditor(
discount: discount,
)),
CupertinoPageRoute(
builder: (context) => DiscountEditor(
discount: discount,
)),
);
},
child: Padding(
@@ -119,7 +120,7 @@ class _DiscountListState extends State<DiscountList> {
onPressed: () {
Navigator.push(
context,
BottomUpPageRoute(DiscountEditor()),
CupertinoPageRoute(builder: (context) => DiscountEditor()),
);
},
icon: Icon(Icons.add),