chore: integrate changes from newest main

client/src/main/resources/client/scenes/nutrition/IngredientList.fxml

@@ -8,7 +8,7 @@
 <?import javafx.scene.layout.VBox?>
 
 <VBox xmlns="http://javafx.com/javafx/25" xmlns:fx="http://javafx.com/fxml/1"
-      fx:controller="client.scenes.recipe.IngredientsPopupCtrl"
+      fx:controller="client.scenes.Ingredient.IngredientListCtrl"
       spacing="10" prefWidth="420" prefHeight="520">
 
     <padding>

client/src/main/resources/client/scenes/nutrition/NutritionDetails.fxml

@@ -7,26 +7,24 @@
 <?import javafx.scene.layout.*?>
 
 <?import javafx.scene.shape.Line?>
-<AnchorPane xmlns="http://javafx.com/javafx"
-            xmlns:fx="http://javafx.com/fxml"
-            fx:controller="client.scenes.nutrition.NutritionDetailsCtrl"
-            prefHeight="400.0" prefWidth="600.0">
-    <VBox visible="false">
-        <Label fx:id="ingredientName" />
-        <HBox>
-            <Label fx:id="fatInputLabel">Fat: </Label>
-            <TextField fx:id="fatInputElement" />
-        </HBox>
-        <HBox>
-            <Label fx:id="proteinInputLabel">Protein: </Label>
-            <TextField fx:id="proteinInputElement" />
-        </HBox>
-        <HBox>
-            <Label fx:id="carbInputLabel">Carbohydrates: </Label>
-            <TextField fx:id="carbInputElement" />
-        </HBox>
-        <Label fx:id="estimatedKcalLabel">Estimated: 0kcal</Label>
-        <Label fx:id="usageLabel">Not used in any recipes</Label>
-    </VBox>
-
-</AnchorPane>
+<VBox xmlns="http://javafx.com/javafx"
+      xmlns:fx="http://javafx.com/fxml"
+      fx:controller="client.scenes.nutrition.NutritionDetailsCtrl"
+      fx:id="nutritionDetails"
+      visible="false">
+    <Label fx:id="ingredientName" />
+    <HBox>
+        <Label fx:id="fatInputLabel">Fat: </Label>
+        <TextField fx:id="fatInputElement" />
+    </HBox>
+    <HBox>
+        <Label fx:id="proteinInputLabel">Protein: </Label>
+        <TextField fx:id="proteinInputElement" />
+    </HBox>
+    <HBox>
+        <Label fx:id="carbInputLabel">Carbohydrates: </Label>
+        <TextField fx:id="carbInputElement" />
+    </HBox>
+    <Label fx:id="estimatedKcalLabel">Estimated: 0kcal</Label>
+    <Label fx:id="usageLabel">Not used in any recipes</Label>
+</VBox>

client/src/main/resources/client/scenes/nutrition/NutritionView.fxml

@@ -11,9 +11,7 @@
             fx:controller="client.scenes.nutrition.NutritionViewCtrl"
             prefHeight="400.0" prefWidth="600.0">
     <SplitPane>
-        <ListView fx:id="nutritionIngredientsView" />
-        <AnchorPane>
-            <fx:include source="NutritionDetails.fxml" />
-        </AnchorPane>
+        <fx:include source="IngredientList.fxml" />
+        <fx:include source="NutritionDetails.fxml" />
     </SplitPane>
 </AnchorPane>

client/src/main/resources/client/scenes/recipe/RecipeDetailView.fxml

@@ -30,8 +30,7 @@
     <ComboBox fx:id="langSelector" onAction="#changeLanguage" />
 
     <!-- Ingredients -->
-    <fx:include source="IngredientList.fxml" fx:id="ingredientList"
-                VBox.vgrow="ALWAYS" maxWidth="Infinity" />
+    <fx:include source="RecipeIngredientList.fxml" fx:id="ingredientList" />
 
     <!-- Preparation -->
     <fx:include source="RecipeStepList.fxml" fx:id="stepList"