preparing user interface for shipment infor(30/01/2023)

assets/local/localization_en.json

@@ -343,6 +343,8 @@
     "FCSshipment.ship.confirm":"Confirm ship?",
     "FCSshipment.popupmenu.active":"Active FCS shipments",
     "FCSshipment.popupmenu.shipped":"Shipped FCS shipments",
+    "FCSshipment.carton":"Cartons",
+    "FCSshipment.package":"Packages",
     "FCS Shipment End ================================================================":"",
 
     "Shipment Start ================================================================":"",

assets/local/localization_mu.json

@@ -342,6 +342,8 @@
     "FCSshipment.ship.confirm":"Confirm ship?",
     "FCSshipment.popupmenu.active":"Active FCS shipments",
     "FCSshipment.popupmenu.shipped":"Shipped FCS 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(
+    // final shipmentNumberBox = DisplayText(
-      text: _shipmentNumberController.text,
+    //   text: _shipmentNumberController.text,
-      labelTextKey: "FCSshipment.number",
+    //   labelTextKey: "FCSshipment.number",
-      iconData: Ionicons.ios_airplane,
+    //   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,
+                  //shipmentNumberBox,
-                  cutoffDateDBox,
+                   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(),

pubspec.lock

@@ -101,10 +101,10 @@ packages:
     dependency: transitive
     description:
       name: camera_avfoundation
-      sha256: "6f89cacd6039d37c122c4b2365d23b2a7493395300767873b5d39359ddbc5d5f"
+      sha256: "608b56b0880722f703871329c4d7d4c2f379c8e2936940851df7fc041abc6f51"
       url: "https://pub.dev"
     source: hosted
-    version: "0.9.13+11"
+    version: "0.9.13+10"
   camera_platform_interface:
     dependency: transitive
     description:
@@ -545,10 +545,10 @@ packages:
     dependency: "direct main"
     description:
       name: font_awesome_flutter
-      sha256: "52671aea66da73b58d42ec6d0912b727a42248dd9a7c76d6c20f275783c48c08"
+      sha256: "275ff26905134bcb59417cf60ad979136f1f8257f2f449914b2c3e05bbb4cd6f"
       url: "https://pub.dev"
     source: hosted
-    version: "10.6.0"
+    version: "10.7.0"
   frontend_server_client:
     dependency: transitive
     description:
@@ -737,10 +737,10 @@ packages:
     dependency: transitive
     description:
       name: mime
-      sha256: e4ff8e8564c03f255408decd16e7899da1733852a9110a58fe6d1b817684a63e
+      sha256: "2e123074287cc9fd6c09de8336dae606d1ddb88d9ac47358826db698c176a1f2"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.4"
+    version: "1.0.5"
   nested:
     dependency: transitive
     description:
@@ -1109,18 +1109,18 @@ packages:
     dependency: transitive
     description:
       name: sqflite
-      sha256: "591f1602816e9c31377d5f008c2d9ef7b8aca8941c3f89cc5fd9d84da0c38a9a"
+      sha256: a9016f495c927cb90557c909ff26a6d92d9bd54fc42ba92e19d4e79d61e798c6
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.0"
+    version: "2.3.2"
   sqflite_common:
     dependency: transitive
     description:
       name: sqflite_common
-      sha256: bb4738f15b23352822f4c42a531677e5c6f522e079461fd240ead29d8d8a54a6
+      sha256: "28d8c66baee4968519fb8bd6cdbedad982d6e53359091f0b74544a9f32ec72d5"
       url: "https://pub.dev"
     source: hosted
-    version: "2.5.0+2"
+    version: "2.5.3"
   stack_trace:
     dependency: transitive
     description:
@@ -1378,5 +1378,5 @@ packages:
     source: hosted
     version: "3.1.2"
 sdks:
-  dart: ">=3.2.3 <4.0.0"
+  dart: ">=3.2.0 <4.0.0"
-  flutter: ">=3.16.6"
+  flutter: ">=3.16.0"