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

5
lib/pages/processing/processing_editor.dart
View File

@@ -16,6 +16,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:intl/intl.dart';
@@ -116,7 +117,7 @@ class _ProcessingEditorState extends State<ProcessingEditor> {
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,
@@ -223,7 +224,7 @@ class _ProcessingEditorState extends State<ProcessingEditor> {
_manageMarket() {
Navigator.push<Package>(
context,
BottomUpPageRoute(MarketEditor()),
CupertinoPageRoute(builder: (context) => MarketEditor()),
);
}

10
lib/pages/processing/processing_info.dart
View File

@@ -10,6 +10,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';
@@ -100,7 +101,7 @@ class _ProcessingInfoState extends State<ProcessingInfo> {
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,
@@ -177,9 +178,10 @@ class _ProcessingInfoState extends State<ProcessingInfo> {
_gotoEditor() async {
bool deleted = await Navigator.push<bool>(
context,
BottomUpPageRoute(ProcessingEditor(
package: widget.package,
)));
CupertinoPageRoute(
builder: (context) => ProcessingEditor(
package: widget.package,
)));
if (deleted ?? false) {
Navigator.pop(context);
} else {

3
lib/pages/processing/processing_list.dart
View File

@@ -90,7 +90,8 @@ class _ProcessingListState extends State<ProcessingList> {
if (_package == null) return;
Navigator.push(
context,
BottomUpPageRoute(ProcessingInfo(package: _package)),
CupertinoPageRoute(
builder: (context) => ProcessingInfo(package: _package)),
);
}
}

4
lib/pages/processing/processing_list_row.dart
View File

@@ -2,6 +2,7 @@ import 'package:fcs/domain/entities/package.dart';
import 'package:fcs/pages/package/package_info.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';
@@ -30,7 +31,8 @@ class ProcessingListRow extends StatelessWidget {
}
Navigator.push(
context,
BottomUpPageRoute(ProcessingInfo(package: package)),
CupertinoPageRoute(
builder: (context) => ProcessingInfo(package: package)),
);
},
child: Row(