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

merge PR

Browse Source
This commit is contained in:
Thinzar Win
2020-10-07 19:53:47 +06:30
parent 99e4c08414 e77de26c22
commit 08f3a9d020
11 changed files with 265 additions and 326 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/pages/shipment/shipment_editor.dart
View File

@@ -11,6 +11,7 @@ import 'package:fcs/pages/shipment_address/model/shipment_address_model.dart';
import 'package:fcs/pages/shipment_address/shipping_address_row.dart';
import 'package:fcs/pages/main/util.dart';
import 'package:fcs/pages/widgets/bottom_up_page_route.dart';
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';
@@ -206,7 +207,7 @@ class _ShipmentEditorState extends State<ShipmentEditor> {
decoration: new InputDecoration(
border: InputBorder.none,
focusedBorder: InputBorder.none,
labelText: AppTranslations.of(context).text("pickup.date"),
labelText: AppTranslations.of(context).text("shipment.date"),
// labelStyle: languageModel.isEng ? labelStyle : labelStyleMM,
contentPadding:
EdgeInsets.symmetric(vertical: 10.0, horizontal: 0.0),
@@ -236,7 +237,8 @@ class _ShipmentEditorState extends State<ShipmentEditor> {
onPressed: () => Navigator.of(context).pop(),
),
backgroundColor: primaryColor,
title: Text(AppTranslations.of(context).text("pickup.edit.title")),
title: LocalText(context, "shipment.edit.title",
fontSize: 18, color: Colors.white),
),
body: Card(
child: Column(

6
lib/pages/shipment/shipment_list.dart
View File

@@ -2,6 +2,7 @@ import 'package:fcs/helpers/theme.dart';
import 'package:fcs/localization/app_translations.dart';
import 'package:fcs/pages/shipment/model/shipment_model.dart';
import 'package:fcs/pages/widgets/bottom_up_page_route.dart';
import 'package:fcs/pages/widgets/local_text.dart';
import 'package:fcs/pages/widgets/progress.dart';
import 'package:provider/provider.dart';
@@ -43,7 +44,8 @@ class _ShipmentListState extends State<ShipmentList> {
onPressed: () => Navigator.of(context).pop(),
),
backgroundColor: primaryColor,
title: Text(AppTranslations.of(context).text("pickup.title")),
title: LocalText(context, "shipment.title",
fontSize: 18, color: Colors.white),
actions: <Widget>[
IconButton(
icon: Icon(
@@ -70,7 +72,7 @@ class _ShipmentListState extends State<ShipmentList> {
_newPickup();
},
icon: Icon(Icons.add),
label: Text(AppTranslations.of(context).text("pickup.new")),
label: Text(AppTranslations.of(context).text("shipment.new")),
backgroundColor: primaryColor,
),
body: new ListView.separated(