rename shipment

lib/pages/main/home_page.dart

@@ -19,7 +19,7 @@ import 'package:fcs/pages/main/model/language_model.dart';
 import 'package:fcs/pages/main/model/main_model.dart';
 import 'package:fcs/pages/package/package_list.dart';
 import 'package:fcs/pages/rates/shipment_rates.dart';
-import 'package:fcs/pages/shipment/pickup_list.dart';
+import 'package:fcs/pages/shipment/shipment_list.dart';
 import 'package:fcs/pages/staff/staff_list.dart';
 import 'package:fcs/pages/widgets/task_button.dart';
 import 'package:fcs/pages/widgets/badge.dart';
@@ -211,7 +211,7 @@ class _HomePageState extends State<HomePage> {
     final pickUpBtn = TaskButton("pickup",
         icon: SimpleLineIcons.direction,
         btnCallback: () =>
-            Navigator.of(context).push(BottomUpPageRoute(PickUpList())));
+            Navigator.of(context).push(BottomUpPageRoute(ShipmentList())));
 
     final shipmentCostBtn = TaskButton("rate",
         icon: FontAwesomeIcons.calculator,

lib/pages/main/util.dart

@@ -87,69 +87,6 @@ Future<void> showConfirmDialog(
       });
 }
 
-void showCommentDialog(BuildContext context, commentCallback(comment)) {
-  TextEditingController _comment = new TextEditingController();
-  showDialog(
-      context: context,
-      builder: (_) {
-        return AlertDialog(
-          shape: RoundedRectangleBorder(
-              borderRadius: BorderRadius.all(Radius.circular(32.0))),
-          content: Container(
-            width: 300.0,
-            height: 80.0,
-            child: Container(
-              child: TextFormField(
-                controller: _comment,
-                autofocus: false,
-                cursorColor: primaryColor,
-                maxLines: 3,
-                style: textStyle,
-                decoration: new InputDecoration(
-                  labelText: "Comment",
-                  labelStyle: labelStyle,
-                  icon: Icon(
-                    Icons.add_comment,
-                    color: primaryColor,
-                  ),
-                  enabledBorder: UnderlineInputBorder(
-                      borderSide: BorderSide(color: primaryColor, width: 1.0)),
-                  focusedBorder: UnderlineInputBorder(
-                      borderSide: BorderSide(color: primaryColor, width: 1.0)),
-                ),
-                validator: (value) {
-                  if (value.isEmpty) {
-                    return "Please enter comment";
-                  }
-                  return null;
-                },
-              ),
-            ),
-          ),
-          actions: <Widget>[
-            FlatButton(
-                child: Text(
-                  "Cancel",
-                  style: labelStyle,
-                ),
-                onPressed: () {
-                  _comment.clear();
-                  Navigator.of(context).pop();
-                }),
-            FlatButton(
-                color: primaryColor,
-                child: Text("Submit",
-                    style: TextStyle(
-                        color: Colors.white, fontWeight: FontWeight.bold)),
-                onPressed: () {
-                  commentCallback(_comment.text);
-                  Navigator.of(context).pop();
-                })
-          ],
-        );
-      });
-}
-
 Widget getStatus(String status) {
   return status == "Delivered"
       ? Text(status,