sainw/fcs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change page navigation

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/pages/fcs_shipment/fcs_shipment_editor.dart
View File

@@ -11,6 +11,7 @@ import 'package:fcs/pages/widgets/local_button.dart';
import 'package:fcs/pages/widgets/local_text.dart';
import 'package:fcs/pages/widgets/popupmenu.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';
@@ -89,7 +90,7 @@ class _FcsShipmentEditorState extends State<FcsShipmentEditor> {
centerTitle: true,
shadowColor: Colors.transparent,
leading: new IconButton(
icon: new Icon(Icons.close, color: primaryColor),
icon: new Icon(CupertinoIcons.back, color: primaryColor),
onPressed: () => Navigator.of(context).pop(),
),
backgroundColor: Colors.white,

3
lib/pages/fcs_shipment/fcs_shipment_list.dart
View File

@@ -77,6 +77,7 @@ class _FcsShipmentListState extends State<FcsShipmentList> {
}
_newShipment() {
Navigator.of(context).push(BottomUpPageRoute(FcsShipmentEditor()));
Navigator.of(context)
.push(CupertinoPageRoute(builder: (context) => FcsShipmentEditor()));
}
}

5
lib/pages/fcs_shipment/fcs_shipment_list_row.dart
View File

@@ -2,6 +2,7 @@ import 'package:fcs/domain/entities/fcs_shipment.dart';
import 'package:fcs/helpers/theme.dart';
import 'package:fcs/pages/main/util.dart';
import 'package:fcs/pages/widgets/bottom_up_page_route.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter_icons/flutter_icons.dart';
import 'package:intl/intl.dart';
@@ -19,8 +20,8 @@ class FcsShipmentListRow extends StatelessWidget {
padding: EdgeInsets.only(left: 15, right: 15),
child: InkWell(
onTap: () {
Navigator.of(context)
.push(BottomUpPageRoute(FcsShipmentEditor(shipment: shipment)));
Navigator.of(context).push(CupertinoPageRoute(
builder: (context) => FcsShipmentEditor(shipment: shipment)));
},
child: Row(
children: <Widget>[