Fix: Viewing planned meals with different portions not adjusting

TomBursch · Feb 23, 2025 · 49084a7 · 49084a7
1 parent 1e30227
commit 49084a7
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/kitchenowl/lib/cubits/recipe_cubit.dart b/kitchenowl/lib/cubits/recipe_cubit.dart
@@ -71,7 +71,7 @@ class RecipeCubit extends Cubit<RecipeState> {
     emit(RecipeState(
       recipe: recipe,
       updateState: state.updateState,
-      selectedYields: recipe.yields,
+      selectedYields: state.selectedYields ?? recipe.yields,
       shoppingLists: shoppingLists != null ? await shoppingLists : const [],
       household: (await household) ?? state.household,
     ));
@@ -99,8 +99,9 @@ class RecipeCubit extends Cubit<RecipeState> {
         recipePlan: RecipePlan(
           recipe: state.recipe,
           day: day,
-          yields: state.recipe.yields != state.selectedYields &&
-                  state.selectedYields > 0
+          yields: state.selectedYields != null &&
+                  state.recipe.yields != state.selectedYields &&
+                  state.selectedYields! > 0
               ? state.selectedYields
               : null,
         ),
@@ -129,7 +130,7 @@ final class RecipeState extends Equatable {
   final Set<String> selectedItems;
   final Recipe recipe;
   final Recipe dynamicRecipe;
-  final int selectedYields;
+  final int? selectedYields;
   final UpdateEnum updateState;
   final List<ShoppingList> shoppingLists;
   final Household? household;

diff --git a/kitchenowl/lib/models/recipe.dart b/kitchenowl/lib/models/recipe.dart
@@ -120,8 +120,8 @@ class Recipe extends Model implements ISuspensionBean {
         household: this.household,
       );
 
-  Recipe withYields(int yields) {
-    if (yields == this.yields) return this;
+  Recipe withYields(int? yields) {
+    if (yields == null || yields == this.yields) return this;
 
     return copyWith(
       items: items

diff --git a/kitchenowl/lib/pages/recipe_page.dart b/kitchenowl/lib/pages/recipe_page.dart
@@ -177,7 +177,7 @@ class _RecipePageState extends State<RecipePage> {
                             ),
                           ),
                           NumberSelector(
-                            value: state.selectedYields,
+                            value: state.selectedYields ?? state.recipe.yields,
                             setValue: cubit.setSelectedYields,
                             defaultValue: state.recipe.yields,
                             lowerBound: 1,
@@ -339,10 +339,12 @@ class _RecipePageState extends State<RecipePage> {
                             Expanded(
                               child: LoadingElevatedButton(
                                 child: Text(
-                                  state.selectedYields != state.recipe.yields
+                                  state.selectedYields != null &&
+                                          state.selectedYields !=
+                                              state.recipe.yields
                                       ? AppLocalizations.of(context)!
                                           .addRecipeToPlanner(
-                                          state.selectedYields,
+                                          state.selectedYields!,
                                         )
                                       : AppLocalizations.of(context)!
                                           .addRecipeToPlannerShort,