insert shipment form

lib/pages/util.dart

@@ -200,17 +200,9 @@ void showCommentDialog(BuildContext context, commentCallback(comment)) {
 
 Widget getStatus(String status) {
   return status == "Delivered"
-      ? Chip(
-          backgroundColor: Colors.green,
-          avatar: Icon(
-            Icons.check,
-            color: Colors.white,
-            size: 14,
-          ),
-          label: Text(
-            status,
-            style: TextStyle(color: Colors.white, fontSize: 12),
-          ))
+      ? Text(status,
+          style: TextStyle(
+              color: primaryColor, fontSize: 18, fontWeight: FontWeight.bold))
       : status == "rejected"
           ? Chip(
               backgroundColor: Colors.red,
@@ -224,17 +216,10 @@ Widget getStatus(String status) {
                 style: TextStyle(color: Colors.white, fontSize: 12),
               ))
           : status == "In progress"
-              ? Chip(
-                  backgroundColor: Colors.red,
-                  avatar: Icon(
-                    Icons.timelapse,
-                    color: Colors.white,
-                    size: 14,
-                  ),
-                  label: Text(
-                    status,
-                    style: TextStyle(color: Colors.white, fontSize: 12),
-                  ))
+              ? Text(
+                  status,
+                  style: TextStyle(color: Colors.white, fontSize: 12),
+                )
               : status == "Pickuped"
                   ? Text(
                       status,
@@ -400,7 +385,7 @@ Widget phoneWidget(BuildContext context, String phone) {
 }
 
 Widget fcsInput(String label, IconData iconData,
-    {TextEditingController controller,String value}) {
+    {TextEditingController controller, String value}) {
   return Row(
     children: <Widget>[
       Padding(
@@ -409,17 +394,17 @@ Widget fcsInput(String label, IconData iconData,
       ),
       Expanded(
           child: Container(
-        height: 50.0,
         child: Row(children: <Widget>[
           Expanded(
               child: TextFormField(
-                initialValue: value,
+            initialValue: value,
             controller: controller,
             cursorColor: primaryColor,
             textAlign: TextAlign.left,
             decoration: new InputDecoration(
               contentPadding: EdgeInsets.only(top: 8),
               labelText: label,
+              labelStyle: TextStyle(fontSize: 14, color: Colors.grey),
               enabledBorder: UnderlineInputBorder(
                   borderSide: BorderSide(color: primaryColor, width: 1.0)),
               focusedBorder: UnderlineInputBorder(
@@ -473,7 +458,7 @@ Widget _dropDown() {
   );
 }
 
-Widget fcsButton(BuildContext context, String text,{Function callack}) {
+Widget fcsButton(BuildContext context, String text, {Function callack}) {
   return Container(
     padding: EdgeInsets.only(left: 10, right: 10, top: 10),
     child: Container(