merge

lib/pages/shipment/shipment_editor.dart

@@ -11,6 +11,7 @@ import 'package:fcs/pages/main/model/main_model.dart';
 import 'package:fcs/pages/shipment/model/shipment_model.dart';
 import 'package:fcs/pages/main/util.dart';
 import 'package:fcs/pages/widgets/bottom_up_page_route.dart';
+import 'package:fcs/pages/widgets/input_text.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';
@@ -105,17 +106,15 @@ class _ShipmentEditorState extends State<ShipmentEditor> {
   Widget build(BuildContext context) {
     var pickupModel = Provider.of<ShipmentModel>(context);
 
-    final fromTimeBox = fcsInput(
-      'From',
-      Icons.timer,
-      controller: _fromTimeEditingController,
-    );
+    final fromTimeBox = InputText(
+        labelTextKey: 'shipment.from',
+        iconData: Icons.timer,
+        controller: _fromTimeEditingController);
 
-    final toTimeBox = fcsInput(
-      'To',
-      null,
-      controller: _toTimeEditingController,
-    );
+    final toTimeBox = InputText(
+        labelTextKey: 'shipment.to',
+        iconData: null,
+        controller: _toTimeEditingController);
 
     final fromTimeBoxReadOnly = fcsInputReadOnly(
       'From',
@@ -142,6 +141,7 @@ class _ShipmentEditorState extends State<ShipmentEditor> {
             child: Text('-'),
           ),
           Container(
+            padding: EdgeInsets.only(left: 20),
             child: toTimeBox,
             width: 120,
           ),
@@ -170,12 +170,6 @@ class _ShipmentEditorState extends State<ShipmentEditor> {
       ),
     );
 
-    final noOfPackageBox = fcsInput(
-      'Number of Packages',
-      Octicons.package,
-      controller: _noOfPackageEditingController,
-    );
-
     final noOfPackageBoxReadonly = fcsInputReadOnly(
       'Number of Packages',
       Octicons.package,

lib/pages/shipment/shipment_list.dart

@@ -44,7 +44,7 @@ class _ShipmentListState extends State<ShipmentList> {
               onPressed: () => Navigator.of(context).pop(),
             ),
             backgroundColor: primaryColor,
-            title: LocalText(context, "shipment.title",
+            title: LocalText(context, "shipment",
                 fontSize: 18, color: Colors.white),
             actions: <Widget>[
               IconButton(