From 7a8e6a3c65d0642249ee44cd1cf52816377ad6ff Mon Sep 17 00:00:00 2001 From: SomnusVeritas Date: Tue, 17 Oct 2023 22:25:48 +0200 Subject: [PATCH] refactored cooking steps --- lib/models/cooking_step.dart | 6 ++++++ lib/models/ingredient.dart | 6 ++++++ lib/models/recipe.dart | 4 ++-- lib/models/steps.dart | 13 ------------- 4 files changed, 14 insertions(+), 15 deletions(-) create mode 100644 lib/models/cooking_step.dart delete mode 100644 lib/models/steps.dart diff --git a/lib/models/cooking_step.dart b/lib/models/cooking_step.dart new file mode 100644 index 0000000..a1258f2 --- /dev/null +++ b/lib/models/cooking_step.dart @@ -0,0 +1,6 @@ +class CookingStep { + final String title; + final String description; + + CookingStep({required this.title, this.description = ''}); +} diff --git a/lib/models/ingredient.dart b/lib/models/ingredient.dart index a16f57d..398400e 100644 --- a/lib/models/ingredient.dart +++ b/lib/models/ingredient.dart @@ -10,4 +10,10 @@ class Ingredient { required this.possibleUnits, this.preferredBrands = const [], }); + + @override + bool operator ==(other) { + Ingredient i = other as Ingredient; + return title == i.title; + } } diff --git a/lib/models/recipe.dart b/lib/models/recipe.dart index bbb0b7a..90f8c67 100644 --- a/lib/models/recipe.dart +++ b/lib/models/recipe.dart @@ -1,13 +1,13 @@ import 'difficulty.dart'; import 'ingredient.dart'; -import 'steps.dart'; +import 'cooking_step.dart'; class Recipe { final String title; final String description; final Difficulty? difficulty; final List ingredients = []; - final Steps steps = Steps(); + final List steps = []; Recipe({ required this.title, diff --git a/lib/models/steps.dart b/lib/models/steps.dart deleted file mode 100644 index a97346a..0000000 --- a/lib/models/steps.dart +++ /dev/null @@ -1,13 +0,0 @@ -/// Used to display the steps required to cook the referenced recipe -class Steps { - final List steps = []; - - void add(CookingStep step) => steps.add(step); -} - -class CookingStep { - final String title; - final String description; - - CookingStep({required this.title, this.description = ''}); -}