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

@@ -8,6 +8,7 @@ import 'package:fcs/pages/staff/model/staff_model.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:provider/provider.dart';
@@ -170,7 +171,8 @@ class _StaffEditorState extends State<StaffEditor> {
appBar: AppBar(
centerTitle: true,
leading: new IconButton(
icon: new Icon(Icons.close, color: primaryColor, size: 30),
icon:
new Icon(CupertinoIcons.back, color: primaryColor, size: 30),
onPressed: () => Navigator.of(context).pop(),
),
shadowColor: Colors.transparent,

View File

@@ -45,7 +45,8 @@ class _StaffListState extends State<StaffList> {
),
floatingActionButton: FloatingActionButton.extended(
onPressed: () {
Navigator.of(context).push(BottomUpPageRoute(StaffEditor()));
Navigator.of(context)
.push(CupertinoPageRoute(builder: (context) => StaffEditor()));
},
icon: Icon(Icons.add),
label: LocalText(context, "staff.new", color: Colors.white),
@@ -72,8 +73,8 @@ class _StaffListState extends State<StaffList> {
children: <Widget>[
InkWell(
onTap: () {
Navigator.of(context)
.push(BottomUpPageRoute(StaffEditor(staff: user)));
Navigator.of(context).push(CupertinoPageRoute(
builder: (context) => StaffEditor(staff: user)));
},
child: Row(
children: <Widget>[