From e3fba8d8b8486c9c7cd8bb5edf80a66162326817 Mon Sep 17 00:00:00 2001
From: Albert <0961988@hr.nl>
Date: Thu, 11 Jun 2020 02:11:33 +0200
Subject: [PATCH] Fix for images not loading correctly on the edit page

---
 client/lib/pages/plant-detail.dart    | 4 ++--
 client/lib/widgets/PlantListItem.dart | 6 ++----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/client/lib/pages/plant-detail.dart b/client/lib/pages/plant-detail.dart
index f7a18dc..5e0c9fc 100644
--- a/client/lib/pages/plant-detail.dart
+++ b/client/lib/pages/plant-detail.dart
@@ -37,7 +37,7 @@ class PlantDetail extends StatelessWidget {
         centerTitle: true,
       ),
       body: StatefulWrapper(
-        onInit: () { (getUserPlantImage(userPlant) as Future<CachedNetworkImage>).then((image) => userPlantImage = image); },
+        onInit: () async { userPlantImage = getUserPlantImage(userPlant); },
         child: DefaultTextStyle(
           style: TextStyle(
               fontFamily: 'Libre Baskerville',
@@ -89,7 +89,7 @@ class PlantDetail extends StatelessWidget {
                       child: Align(
                         alignment: Alignment.topRight,
                         child: RawMaterialButton(
-                          onPressed: () {
+                          onPressed: () async {
                             Navigator.pushReplacementNamed(context, '/add-plant', arguments: { 'plant': userPlant, 'userPlantImage': userPlantImage});
                           },
                           elevation: 2.0,
diff --git a/client/lib/widgets/PlantListItem.dart b/client/lib/widgets/PlantListItem.dart
index b3416e6..0bd2c69 100644
--- a/client/lib/widgets/PlantListItem.dart
+++ b/client/lib/widgets/PlantListItem.dart
@@ -32,10 +32,8 @@ class PlantListItem extends StatelessWidget {
             foregroundColor: Colors.orange.shade900,
             color: Colors.amber.shade100,
             icon: Icons.edit,
-            onTap: (){
-              plantImage.then((userPlantImage) =>
-                  Navigator.pushNamed(context, '/add-plant', arguments: { 'plant': userPlant, 'userPlantImage': userPlantImage})
-              );
+            onTap: () async {
+                Navigator.pushNamed(context, '/add-plant', arguments: { 'plant': userPlant, 'userPlantImage': await plantImage});
             },
           ),
           IconSlideAction(