+Add quantity field to ingredients

+Clear list now requires confirmation
+Confirm / Cancel buttons are now coloured

one_trip/lib/widgets/confirm_dialog.dart

@@ -0,0 +1,67 @@
+import 'package:flutter/material.dart';
+import 'package:one_trip/theme.dart';
+
+class ConfirmForm extends StatefulWidget {
+  final String title;
+  const ConfirmForm({super.key, required this.title});
+
+  @override
+  State<ConfirmForm> createState() => _ConfirmFormState();
+}
+
+class _ConfirmFormState extends State<ConfirmForm> {
+  @override
+  Widget build(BuildContext context) {
+    return Card(
+      margin: EdgeInsets.zero,
+      child: Padding(
+        padding: const EdgeInsets.all(8),
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Text(
+              widget.title,
+              style: Theme.of(context).textTheme.titleMedium,
+            ),
+            const Divider(),
+            const Text("This action is permanent. Do you want to continue?"),
+            Padding(
+              padding: const EdgeInsets.only(top: 8),
+              child: Row(
+                mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+                children: [
+                  ElevatedButton(
+                    style: positiveButtonStyle(context),
+                    onPressed: () => Navigator.pop(context, false),
+                    child: const Text("Go Back"),
+                  ),
+                  ElevatedButton(
+                    style: negativeButtonStyle(context),
+                    onPressed: () => Navigator.pop(context, true),
+                    child: const Text("Continue"),
+                  ),
+                ],
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
+
+Future<bool> confirmDialog(BuildContext context, String title) async {
+  bool? value = await showDialog(
+    context: context,
+    builder: (context) {
+      return Dialog(
+        child: ConfirmForm(
+          title: title,
+        ),
+      );
+    },
+  );
+
+  return value ?? false;
+}

one_trip/lib/widgets/ingredient_dialog.dart

@@ -0,0 +1,122 @@
+import 'package:flutter/material.dart';
+import 'package:one_trip/theme.dart';
+
+class IngredientDetails {
+  String name;
+  String quantity;
+
+  IngredientDetails({required this.name, required this.quantity});
+}
+
+class IngredientForm extends StatefulWidget {
+  final String nameStartingValue;
+  final String quantityStartingValue;
+  const IngredientForm(
+      {super.key,
+      required this.nameStartingValue,
+      required this.quantityStartingValue});
+
+  @override
+  State<IngredientForm> createState() => _IngredientFormState();
+}
+
+class _IngredientFormState extends State<IngredientForm> {
+  late TextEditingController _nameController;
+  late TextEditingController _quantityController;
+
+  @override
+  void dispose() {
+    _nameController.dispose();
+    _quantityController.dispose();
+    super.dispose();
+  }
+
+  @override
+  void initState() {
+    super.initState();
+    _nameController = TextEditingController(text: widget.nameStartingValue);
+    _quantityController =
+        TextEditingController(text: widget.quantityStartingValue);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Card(
+      margin: EdgeInsets.zero,
+      child: Padding(
+        padding: const EdgeInsets.all(8),
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Text(
+              "Add / Edit Ingredient",
+              style: Theme.of(context).textTheme.titleMedium,
+            ),
+            const Divider(),
+            TextFormField(
+              autofocus: true,
+              controller: _nameController,
+              textInputAction: TextInputAction.next,
+              // onFieldSubmitted: (value) {
+              //   Navigator.pop(context, value);
+              // },
+              decoration: const InputDecoration(hintText: "Name"),
+            ),
+            TextFormField(
+              controller: _quantityController,
+              textInputAction: TextInputAction.done,
+              onFieldSubmitted: (value) => Navigator.pop(
+                context,
+                IngredientDetails(
+                    name: _nameController.text,
+                    quantity: _quantityController.text),
+              ),
+              decoration: const InputDecoration(hintText: "Quantity"),
+            ),
+            Padding(
+              padding: const EdgeInsets.only(top: 8),
+              child: Row(
+                mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+                children: [
+                  ElevatedButton(
+                    style: negativeButtonStyle(context),
+                    onPressed: () => Navigator.pop(context),
+                    child: const Text("Cancel"),
+                  ),
+                  ElevatedButton(
+                    style: positiveButtonStyle(context),
+                    onPressed: () => Navigator.pop(
+                      context,
+                      IngredientDetails(
+                          name: _nameController.text,
+                          quantity: _quantityController.text),
+                    ),
+                    child: const Text("Done"),
+                  ),
+                ],
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
+
+Future<IngredientDetails?> ingredientDialog(
+    BuildContext context, String currentName, String currentQuantity) async {
+  IngredientDetails? details = await showDialog(
+    context: context,
+    builder: (context) {
+      return Dialog(
+        child: IngredientForm(
+          nameStartingValue: currentName,
+          quantityStartingValue: currentQuantity,
+        ),
+      );
+    },
+  );
+
+  return details;
+}

one_trip/lib/widgets/text_entry_dialog.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:one_trip/theme.dart';
 
 class TextEntryForm extends StatefulWidget {
   final String title;
@@ -55,13 +56,16 @@ class _TextEntryFormState extends State<TextEntryForm> {
                 mainAxisAlignment: MainAxisAlignment.spaceEvenly,
                 children: [
                   ElevatedButton(
+                    style: negativeButtonStyle(context),
                     onPressed: () => Navigator.pop(context),
                     child: const Text("Cancel"),
                   ),
                   ElevatedButton(
-                      onPressed: () =>
-                          Navigator.pop(context, _textController.text),
-                      child: const Text("Done")),
+                    style: positiveButtonStyle(context),
+                    onPressed: () =>
+                        Navigator.pop(context, _textController.text),
+                    child: const Text("Done"),
+                  ),
                 ],
               ),
             ),