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/receiving/receiving_editor.dart
View File

@@ -13,6 +13,7 @@ import 'package:fcs/pages/widgets/local_text.dart';
import 'package:fcs/pages/widgets/multi_img_controller.dart';
import 'package:fcs/pages/widgets/multi_img_file.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:permission_handler/permission_handler.dart';
@@ -136,7 +137,7 @@ class _ReceivingEditorState extends State<ReceivingEditor> {
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,

10
lib/pages/receiving/receiving_info.dart
View File

@@ -12,6 +12,7 @@ import 'package:fcs/pages/widgets/multi_img_controller.dart';
import 'package:fcs/pages/widgets/multi_img_file.dart';
import 'package:fcs/pages/widgets/progress.dart';
import 'package:fcs/pages/widgets/status_tree.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter_icons/flutter_icons.dart';
import 'package:intl/intl.dart';
@@ -90,7 +91,7 @@ class _ReceivingInfoState extends State<ReceivingInfo> {
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,
@@ -144,9 +145,10 @@ class _ReceivingInfoState extends State<ReceivingInfo> {
_edit() async {
await Navigator.push(
context,
BottomUpPageRoute(ReceivingEditor(
package: widget.package,
)),
CupertinoPageRoute(
builder: (context) => ReceivingEditor(
package: widget.package,
)),
);
PackageModel packageModel =
Provider.of<PackageModel>(context, listen: false);

5
lib/pages/receiving/receiving_list.dart
View File

@@ -98,7 +98,7 @@ class _ReceivingListState extends State<ReceivingList> {
_newReceiving() {
Navigator.push(
context,
BottomUpPageRoute(ReceivingEditor()),
CupertinoPageRoute(builder: (context) => ReceivingEditor()),
);
}
@@ -108,7 +108,8 @@ class _ReceivingListState extends State<ReceivingList> {
if (_package == null) return;
Navigator.push(
context,
BottomUpPageRoute(ReceivingInfo(package: _package)),
CupertinoPageRoute(
builder: (context) => ReceivingInfo(package: _package)),
);
}
}

4
lib/pages/receiving/receiving_list_row.dart
View File

@@ -1,6 +1,7 @@
import 'package:fcs/domain/entities/package.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:intl/intl.dart';
@@ -29,7 +30,8 @@ class ReceivingListRow extends StatelessWidget {
}
Navigator.push(
context,
BottomUpPageRoute(ReceivingInfo(package: package)),
CupertinoPageRoute(
builder: (context) => ReceivingInfo(package: package)),
);
},
child: Row(