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/fcs_id_icon.dart';
import 'package:fcs/pages/widgets/progress.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
@@ -51,7 +52,7 @@ class _CustomerEditorState extends State<CustomerEditor> {
centerTitle: true,
leading: new IconButton(
icon: new Icon(
Icons.close,
CupertinoIcons.back,
color: primaryColor,
size: 30,
),

View File

@@ -59,7 +59,7 @@ class _CustomerListState extends State<CustomerList> {
),
floatingActionButton: FloatingActionButton.extended(
onPressed: () {
Navigator.of(context).push(BottomUpPageRoute(InvitationCreate()));
Navigator.of(context).push(CupertinoPageRoute(builder: (context) => InvitationCreate()));
},
icon: Icon(Icons.add),
label: LocalText(context, "invitation.new", color: Colors.white),
@@ -204,7 +204,7 @@ class _CustomerListState extends State<CustomerList> {
_select(User customer) {
Navigator.of(context)
.push(BottomUpPageRoute(CustomerEditor(customer: customer)));
.push(CupertinoPageRoute(builder: (context) => CustomerEditor(customer: customer)));
}
_gotoMsg(User customer) {
@@ -212,7 +212,7 @@ class _CustomerListState extends State<CustomerList> {
Provider.of<MessageModel>(context, listen: false);
messageModel.initQuery(customer.id);
Navigator.of(context)
.push(BottomUpPageRoute(MessageDetail(
.push(CupertinoPageRoute(builder: (context) => MessageDetail(
receiverID: customer.id,
receiverName: customer.name,
messageModel: messageModel,

View File

@@ -5,6 +5,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:provider/provider.dart';
@@ -47,7 +48,7 @@ class _InvitationCreateState extends State<InvitationCreate> {
centerTitle: true,
leading: new IconButton(
icon: new Icon(
Icons.close,
CupertinoIcons.back,
color: primaryColor,
),
onPressed: () => Navigator.of(context).pop(),

View File

@@ -4,6 +4,7 @@ import 'package:fcs/pages/customer/model/customer_model.dart';
import 'package:fcs/pages/main/util.dart';
import 'package:fcs/pages/widgets/display_text.dart';
import 'package:fcs/pages/widgets/progress.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
@@ -49,7 +50,7 @@ class _InvitationEditorState extends State<InvitationEditor> {
centerTitle: true,
leading: new IconButton(
icon: new Icon(
Icons.close,
CupertinoIcons.back,
color: primaryColor,
size: 30,
),