remove lock file

assets/local/localization_en.json

@@ -344,6 +344,8 @@
     "FCSshipment.popupmenu.all":"All shipments",
     "FCSshipment.popupmenu.active":"Active shipments",
     "FCSshipment.popupmenu.shipped":"Shipped shipments",
+    "FCSshipment.carton":"Cartons",
+    "FCSshipment.package":"Packages",
     "FCS Shipment End ================================================================":"",
 
     "Shipment Start ================================================================":"",

assets/local/localization_mu.json

@@ -343,6 +343,8 @@
     "FCSshipment.popupmenu.all":"All shipments",
     "FCSshipment.popupmenu.active":"Active shipments",
     "FCSshipment.popupmenu.shipped":"Shipped shipments",
+    "FCSshipment.carton":"FCS ပုံးများ",
+    "FCSshipment.package":"FCS အထုပ်",
     "FCS Shipment End ================================================================":"",
 
     "Shipment Start ================================================================":"",

lib/pages/fcs_shipment/fcs_shipment_info.dart

@@ -73,11 +73,11 @@ class _FcsShipmentInfoState extends State<FcsShipmentInfo> {
 
   @override
   Widget build(BuildContext context) {
-    final shipmentNumberBox = DisplayText(
-      text: _shipmentNumberController.text,
-      labelTextKey: "FCSshipment.number",
-      iconData: Ionicons.ios_airplane,
-    );
+    // final shipmentNumberBox = DisplayText(
+    //   text: _shipmentNumberController.text,
+    //   labelTextKey: "FCSshipment.number",
+    //   iconData: Ionicons.ios_airplane,
+    // );
     final cutoffDateDBox = DisplayText(
       text: _cutoffDateController.text,
       labelTextKey: "FCSshipment.cutoff_date",
@@ -88,6 +88,16 @@ class _FcsShipmentInfoState extends State<FcsShipmentInfo> {
       labelTextKey: "FCSshipment.ETA",
       iconData: Icons.date_range,
     );
+    final cartonBox = DisplayText(
+      //text: _arrivalDateController.text,
+      labelTextKey: "FCSshipment.carton",
+      iconData: MaterialCommunityIcons.package,
+    );
+    final packageBox = DisplayText(
+      //text: _arrivalDateController.text,
+      labelTextKey: "FCSshipment.package",
+      iconData: Octicons.package,
+    );
 
     // final departureDateBox = DisplayText(
     //   text: _departureDateControler.text,
@@ -122,7 +132,7 @@ class _FcsShipmentInfoState extends State<FcsShipmentInfo> {
     final statusBox = DisplayText(
       text: _statusController.text,
       labelTextKey: "FCSshipment.status",
-      iconData: Icons.av_timer,
+      iconData: Ionicons.md_chevron_back_circle_outline,
     );
 
     final shipBtn = LocalButton(
@@ -134,7 +144,7 @@ class _FcsShipmentInfoState extends State<FcsShipmentInfo> {
       inAsyncCall: _isLoading,
       child: Scaffold(
         appBar: LocalAppBar(
-          labelKey: "FCSshipment.form.title",
+          titleWidget: Text(_shipmentNumberController.text,style:TextStyle(fontSize: 20,color: primaryColor)),
           backgroundColor: Colors.white,
           labelColor: primaryColor,
           arrowColor: primaryColor,
@@ -143,7 +153,7 @@ class _FcsShipmentInfoState extends State<FcsShipmentInfo> {
               icon: Icon(Icons.edit, color: primaryColor),
               onPressed: _edit,
             ),
-            menuPopWidget(context)
+            //menuPopWidget(context)
           ],
         ),
         // appBar: AppBar(
@@ -176,15 +186,21 @@ class _FcsShipmentInfoState extends State<FcsShipmentInfo> {
                   child: Padding(
                 padding: const EdgeInsets.all(10.0),
                 child: ListView(children: <Widget>[
-                  shipmentNumberBox,
-                  cutoffDateDBox,
+                  //shipmentNumberBox,
+                   statusBox,
+                     Row(mainAxisAlignment: MainAxisAlignment.end,
+                  children:[Expanded(child: cutoffDateDBox,flex: 2,),
+                  Expanded(child: etaBox,),
+                  ]),
                   // departureDateBox,
-                  etaBox,
+                  Row(children: [  Expanded(child: cartonBox,flex: 2,),
+                  Flexible(child: packageBox),],),
+                
                    shipTypeBox,
                   consigneeBox,
                   portBox,
                   destinationBox,
-                  statusBox,
+                 
                   _fcsShipment?.status == fcs_shipment_confirmed_status
                       ? shipBtn
                       : Container(),