Merge branch 'master' of sma/fcs into master

lib/pages/package_search/package_search.dart

@@ -86,14 +86,18 @@ class PackageSearchDelegate extends SearchDelegate<Package> {
             }
             return Container(
               padding: EdgeInsets.only(top: 15),
-              child: ListView(
+              child: ListView.separated(
-                children: snapshot.data!
+                  separatorBuilder: (context, index) =>
-                    .map((u) => PackageListRow(
+                      Divider(height: 1, color: dividerColor),
-                          package: u,
+                  itemCount: snapshot.data!.length,
+                  itemBuilder: (BuildContext context, int index) {
+                    return Column(children: [
+                      PackageListRow(
+                        package: snapshot.data![index],
                         callbackPackageSelect: callbackPackageSelect,
-                        ))
+                      )
-                    .toList(),
+                    ]);
-              ),
+                  }),
             );
           } else if (snapshot.hasError) {
             return Container(

lib/pages/pickup_search/pickup_search.dart

@@ -87,14 +87,18 @@ class PackageSearchDelegate extends SearchDelegate<Pickup> {
             }
             return Container(
               padding: EdgeInsets.only(top: 15),
-              child: ListView(
+              child: ListView.separated(
-                children: snapshot.data!.map((e) {
+                  separatorBuilder: (context, index) =>
-                  return PickupListRow(
+                      Divider(height: 1, color: dividerColor),
-                    pickup: e,
+                  itemCount: snapshot.data!.length,
+                  itemBuilder: (BuildContext context, int index) {
+                    return Column(children: [
+                      PickupListRow(
+                        pickup: snapshot.data![index],
                         callbackPickupSelect: callbackPickupSelect,
-                  );
+                      )
-                }).toList(),
+                    ]);
-              ),
+                  }),
             );
           } else if (snapshot.hasError) {
             return Container(