Add button now adds food to FoodEntry instead of creating a new one in sub menus. Ingredients can now be edited

Author: ComputerElite

app/lib/screens/create_ingredient_dialog.dart

@@ -21,12 +21,12 @@ class _CreateIngredientDialogState extends State<CreateIngredientDialog> {
 
   @override
   void initState() {
-    super.initState();
     if (widget.ingredient.id != null) {
       nameController.text = widget.ingredient.name ?? "";
       costController.text = PriceHelper.formatPriceWithoutUnit(widget.ingredient.cost);
       amountController.text = widget.ingredient.amount.toString();
-    }
+    } 
+    super.initState();
   }
 
   @override

app/lib/screens/food_screen.dart

@@ -49,6 +49,7 @@ class _FoodScreenState extends State<FoodScreen> {
                 },
                 items: Storage.getFoodsForCurrentAssembly(),
                 mappingFunction: (x) => FoodWidget(
+                      allowNew: true,
                       food: x,
                       foodRemoved: () => setState(() {}),
                     ),

app/lib/screens/food_widget.dart

@@ -14,11 +14,13 @@ class FoodWidget extends StatefulWidget {
   Food food;
   Function()? onTap;
   Function()? foodRemoved;
+  bool allowNew = true;
 
   FoodWidget({
     Key? key,
     required this.food,
     this.foodRemoved,
+    required this.allowNew,
     this.onTap,
   }) : super(key: key);
 
@@ -74,7 +76,7 @@ class _FoodWidgetState extends State<FoodWidget> {
               }),
             IconButton(
               icon: const Icon(Icons.add),
-              onPressed: () {
+              onPressed: widget.allowNew ? () {
                 Navigator.push(
                   context,
                   MaterialPageRoute(
@@ -83,7 +85,7 @@ class _FoodWidgetState extends State<FoodWidget> {
                     ),
                   ),
                 );
-              }),
+              } : widget.onTap),
           ],
         )
       ],

app/lib/screens/ingredient_widget.dart

@@ -1,12 +1,19 @@
 import 'package:eat_somewhere/data/food.dart';
 import 'package:eat_somewhere/data/helper.dart';
+import 'package:eat_somewhere/screens/create_ingredient_dialog.dart';
+import 'package:eat_somewhere/service/storage.dart';
+import 'package:eat_somewhere/widgets/error_dialog.dart';
+import 'package:eat_somewhere/widgets/info_dialog.dart';
+import 'package:eat_somewhere/widgets/padded_card.dart';
+import 'package:eat_somewhere/widgets/yes_cancel_dialog.dart';
 import 'package:flutter/material.dart';
 
 class IngredientWidget extends StatefulWidget {
   Ingredient ingredient;
   Function() onTap;
+  Function()? ingredientRemoved;
 
-  IngredientWidget({required this.ingredient, required this.onTap, Key? key})
+  IngredientWidget({required this.ingredient, required this.onTap, required this.ingredientRemoved, Key? key})
       : super(key: key);
 
   @override
@@ -16,10 +23,51 @@ class IngredientWidget extends StatefulWidget {
 class _IngredientWidgetState extends State<IngredientWidget> {
   @override
   Widget build(BuildContext context) {
-    return ListTile(
-      title: Text(widget.ingredient.name ?? "Unknown"),
-      subtitle: Text("${widget.ingredient.amount} ${widget.ingredient.unit.name} - ${PriceHelper.formatPriceWithUnit(widget.ingredient.cost)}"),
+    return PaddedCard(
       onTap: widget.onTap,
-    );
+        child: Row(
+      spacing: 10,
+      mainAxisAlignment: MainAxisAlignment.spaceBetween,
+      children: [
+        Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+          Text(widget.ingredient.name ?? "Unknown"),
+          Text("~ ${PriceHelper.formatPriceWithUnit(widget.ingredient.cost)} per ${widget.ingredient.amount} ${widget.ingredient.unit.name}"),
+        ]),
+        Row(
+          spacing: 10,
+          children: [
+            if(widget.ingredientRemoved != null) IconButton(
+              icon: const Icon(Icons.delete),
+              onPressed: () async {
+                if(await YesCancelDialog.show("Archive Ingredient", "Do you really want to archive '${widget.ingredient.name}'? This cannot be undone") == true) {
+                  String? error = await Storage.deleteIngredient(widget.ingredient);
+                  if(error != null) {
+                    ErrorDialog.show("Error archiving Ingredient", error);
+                    return;
+                  }
+                  InfoDialog.show("Ingredient archived", "Ingredient '${widget.ingredient.name}' was successfully archived");
+                  widget.ingredientRemoved?.call();
+                }
+              }),
+            IconButton(
+              icon: const Icon(Icons.edit),
+              onPressed: () async {
+                Ingredient? newIngredient = await showDialog(
+                  context: context,
+                  builder: (builder) => CreateIngredientDialog(
+                        ingredient: widget.ingredient
+                      ));
+                widget.ingredientRemoved?.call();
+                setState(() {});
+              }),
+            IconButton(
+              icon: const Icon(Icons.add),
+              onPressed: widget.onTap),
+          ],
+        )
+      ],
+    ));
   }
 }

app/lib/screens/select_food.dart

@@ -27,6 +27,7 @@ class _SelectFoodScreenState extends State<SelectFoodScreen> {
         mappingFunction: (x) => FoodWidget(
               food: x,
               onTap: () => Navigator.pop(context, x),
+              allowNew: false,
             ),
         stringFunction: (x) => x.name ?? "Unknown",
         newAction: () async {

app/lib/screens/select_ingredient.dart

@@ -23,6 +23,7 @@ class _SelectIngredientScreenState extends State<SelectIngredientScreen> {
           setState(() {});
         },
         mappingFunction: (x) => IngredientWidget(
+          ingredientRemoved: () => setState(() {}),
               ingredient: x,
               onTap: () {
                 Navigator.pop(context, x);

app/lib/screens/shopping_list_screen.dart

@@ -30,8 +30,9 @@ class _ShoppingListScreenState extends State<ShoppingListScreen> {
           ),
           // Adjust the table to use the minimum width it needs
           Row(
+            mainAxisSize: MainAxisSize.min,
             children: [
-              Expanded(child: Container(child: Table(
+              Expanded(child: Table(
                 defaultVerticalAlignment: TableCellVerticalAlignment.middle,
                 children: [
                   ...widget.foodEntry
@@ -44,7 +45,7 @@ class _ShoppingListScreenState extends State<ShoppingListScreen> {
                             PriceChip(amount: item.getEstimatedCost()),
                           ])),
                 ],
-              )))
+              ))
             ],
           )
         ],

app/lib/service/server_loader.dart

@@ -170,6 +170,16 @@ class ServerLoader {
     }
     return [];
   }
+
+  static Future<ErrorContainer<bool?>> deleteIngredient(Ingredient ingredient) async {
+    var response = await ServerCom.delete("/api/v1/ingredient/${ingredient.id}");
+    print(response.body);
+    if (response.statusCode == 200) {
+      return ErrorContainer(jsonDecode(response.body)["Success"], null);
+    } else {
+      return ErrorContainer(null, "Error: ${response.statusCode} ${response.body}");
+    }
+  }
 }
 
 class CreatedResponse {

app/lib/service/storage.dart

@@ -215,4 +215,15 @@ class Storage {
     Storage.instance.foods[getSettings().chosenAssembly]?.removeWhere((x) => x.id == food.id);
     return null;
   }
+
+  static Future<String?> deleteIngredient(Ingredient ingredient) async {
+    ErrorContainer<bool?> serverResponse =
+        await ServerLoader.deleteIngredient(ingredient);
+    if (serverResponse.error != null) {
+      return serverResponse.error;
+    }
+    // The old food was archived, therefore we need to remove it
+    Storage.instance.ingredients[getSettings().chosenAssembly]?.removeWhere((x) => x.id == ingredient.id);
+    return null;
+  }
 }