update carton list and editor

lib/pages/fcs_shipment/fcs_shipment_list_row.dart

@@ -1,6 +1,5 @@
 import 'package:fcs/domain/entities/fcs_shipment.dart';
 import 'package:fcs/helpers/theme.dart';
-import 'package:fcs/pages/main/util.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_vector_icons/flutter_vector_icons.dart';
@@ -8,9 +7,9 @@ import 'package:intl/intl.dart';
 import 'fcs_shipment_info.dart';
 
 class FcsShipmentListRow extends StatelessWidget {
-  final FcsShipment? shipment;
+  final FcsShipment shipment;
   final dateFormatter = new DateFormat('dd MMM yyyy');
-  FcsShipmentListRow({Key? key, this.shipment}) : super(key: key);
+  FcsShipmentListRow({Key? key, required this.shipment}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
@@ -29,7 +28,7 @@ class FcsShipmentListRow extends StatelessWidget {
                 child: new Row(
                   children: <Widget>[
                     Container(
-                      padding: EdgeInsets.only(left: 5, right: 10),
+                      padding: EdgeInsets.only(left: 5),
                       child: Icon(
                         Ionicons.ios_airplane,
                         color: primaryColor,
@@ -38,19 +37,19 @@ class FcsShipmentListRow extends StatelessWidget {
                     ),
                     new Expanded(
                       child: Padding(
-                         padding: const EdgeInsets.only(left: 8.0),
+                        padding: const EdgeInsets.only(left: 18.0),
                         child: new Column(
                           crossAxisAlignment: CrossAxisAlignment.start,
                           children: <Widget>[
                             new Text(
-                              shipment?.shipmentNumber ?? '',
+                              shipment.shipmentNumber ?? '',
                               style: new TextStyle(
                                   fontSize: 15.0, color: Colors.black),
                             ),
                             Padding(
                               padding: const EdgeInsets.only(top: 5),
                               child: new Text(
-                                dateFormatter.format(shipment!.cutoffDate!),
+                                dateFormatter.format(shipment.cutoffDate!),
                                 style: new TextStyle(
                                     fontSize: 15.0, color: Colors.grey),
                               ),
@@ -63,10 +62,11 @@ class FcsShipmentListRow extends StatelessWidget {
                 ),
               ),
             ),
-            Padding(
-              padding: const EdgeInsets.all(0),
-              child: getStatus(shipment!.status ?? ''),
-            ),
+            Text(shipment.status ?? "",
+                style: TextStyle(
+                    color: primaryColor,
+                    fontSize: 15,
+                    fontWeight: FontWeight.bold)),
           ],
         ),
       ),