diff --git a/src/main/resources/fxml/Meal_Plan.fxml b/src/main/resources/fxml/Meal_Plan.fxml
index aa4f1d9a0c72f61bd9e320a3c9ec4834f040d9e1..ed79e850fec837c24bb14278c238f84c31721806 100644
--- a/src/main/resources/fxml/Meal_Plan.fxml
+++ b/src/main/resources/fxml/Meal_Plan.fxml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Label?>
<?import javafx.scene.control.ProgressBar?>
<?import javafx.scene.layout.AnchorPane?>
<?import javafx.scene.layout.ColumnConstraints?>
@@ -11,18 +12,14 @@
<?import javafx.scene.text.Font?>
<?import javafx.scene.text.Text?>
-<AnchorPane fx:id="parent" prefHeight="540.0" prefWidth="872.0" xmlns="http://javafx.com/javafx/14" xmlns:fx="http://javafx.com/fxml/1" fx:controller="mi.hdm.controllers.MealPlanController">
+<AnchorPane fx:id="parent" prefHeight="540.0" prefWidth="872.0" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="mi.hdm.controllers.MealPlanController">
<children>
- <VBox layoutY="69.0" prefHeight="445.0" prefWidth="872.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0">
+ <VBox layoutY="69.0" prefHeight="445.0" prefWidth="872.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
<children>
<GridPane hgap="8.0" prefHeight="197.0" prefWidth="190.0" vgap="8.0">
<columnConstraints>
- <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
- <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
- <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
- <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
- <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
- <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+ <ColumnConstraints hgrow="SOMETIMES" maxWidth="272.0" minWidth="10.0" prefWidth="78.0" />
+ <ColumnConstraints hgrow="SOMETIMES" maxWidth="473.0" minWidth="10.0" prefWidth="473.0" />
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
</columnConstraints>
<rowConstraints>
@@ -32,15 +29,19 @@
<VBox.margin>
<Insets left="15.0" right="15.0" />
</VBox.margin>
+ <children>
+ <Text fill="#1e1e1e" strokeType="OUTSIDE" strokeWidth="0.0" text="Nutrition" GridPane.rowIndex="1" GridPane.valignment="BOTTOM">
+ <font>
+ <Font name="Arial Bold" size="25.0" />
+ </font>
+ </Text>
+ <Label alignment="TOP_CENTER" text="Meal Plan" textFill="#d91c1c" GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.valignment="TOP">
+ <font>
+ <Font name="Arial" size="34.0" />
+ </font>
+ </Label>
+ </children>
</GridPane>
- <Text fill="#1e1e1e" strokeType="OUTSIDE" strokeWidth="0.0" text="Nutrition">
- <font>
- <Font name="Arial Bold" size="25.0" />
- </font>
- <VBox.margin>
- <Insets bottom="10.0" left="15.0" />
- </VBox.margin>
- </Text>
<VBox prefHeight="200.0" prefWidth="522.0">
<children>
<HBox alignment="CENTER_LEFT" prefHeight="57.0" prefWidth="872.0">
diff --git a/src/main/resources/fxml/Tasty_Pages_Main_Page.fxml b/src/main/resources/fxml/Tasty_Pages_Main_Page.fxml
index ef125400f80a4a60edaf426bd566a60d12502dab..828354e9c42e19489dfaab2e890862517d0be21e 100644
--- a/src/main/resources/fxml/Tasty_Pages_Main_Page.fxml
+++ b/src/main/resources/fxml/Tasty_Pages_Main_Page.fxml
@@ -1,44 +1,44 @@
<?xml version="1.0" encoding="UTF-8"?>
<?import javafx.geometry.Insets?>
-<?import javafx.scene.control.Button?>
<?import javafx.scene.Cursor?>
+<?import javafx.scene.control.Button?>
<?import javafx.scene.image.Image?>
<?import javafx.scene.image.ImageView?>
-<?import javafx.scene.layout.*?>
-<AnchorPane fx:id="parent" prefHeight="400.0" prefWidth="640.0" VBox.vgrow="ALWAYS"
- xmlns="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1"
- fx:controller="mi.hdm.controllers.MainPageController">
- <VBox prefHeight="400.0" prefWidth="640.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0"
- AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="40.0">
+<?import javafx.scene.layout.AnchorPane?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.Pane?>
+<?import javafx.scene.layout.TilePane?>
+<?import javafx.scene.layout.VBox?>
+
+<AnchorPane fx:id="parent" prefHeight="400.0" prefWidth="640.0" VBox.vgrow="ALWAYS" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="mi.hdm.controllers.MainPageController">
+ <VBox prefHeight="400.0" prefWidth="640.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
<children>
<HBox fx:id="categories" prefWidth="640.0" spacing="8.0">
<padding>
- <Insets bottom="8.0" left="8.0" right="8.0" top="8.0"/>
+ <Insets bottom="8.0" left="8.0" right="8.0" top="8.0" />
</padding>
</HBox>
- <TilePane fx:id="recipeTilePane" hgap="8.0" prefHeight="400.0" prefTileHeight="250.0" prefTileWidth="180.0"
- prefWidth="640.0" vgap="8.0">
- <Pane prefHeight="250.0" prefWidth="180.0"
- style="-fx-background-color: dedede; -fx-background-radius: 15;">
- <Button contentDisplay="CENTER" mnemonicParsing="false" onAction="#handleAddRecipe"
- prefHeight="250.0"
- prefWidth="180.0" style="-fx-background-color: transparent;" text="Button"
- textFill="TRANSPARENT">
+ <TilePane fx:id="recipeTilePane" hgap="8.0" prefHeight="400.0" prefTileHeight="250.0" prefTileWidth="180.0" prefWidth="640.0" vgap="8.0">
+ <Pane prefHeight="250.0" prefWidth="180.0" style="-fx-background-color: dedede; -fx-background-radius: 15;">
+ <Button contentDisplay="CENTER" mnemonicParsing="false" onAction="#handleAddRecipe" prefHeight="250.0" prefWidth="180.0" style="-fx-background-color: transparent;" text="Button" textFill="TRANSPARENT">
<graphic>
<ImageView fitHeight="67.0" fitWidth="64.0" pickOnBounds="true" preserveRatio="true">
- <Image url="@../images/Tasty_Pages_Plus_Icon.png"/>
+ <Image url="@../images/Tasty_Pages_Plus_Icon.png" />
</ImageView>
</graphic>
<cursor>
- <Cursor fx:constant="HAND"/>
+ <Cursor fx:constant="HAND" />
</cursor>
</Button>
</Pane>
<padding>
- <Insets bottom="8.0" left="8.0" right="8.0" top="8.0"/>
+ <Insets bottom="8.0" left="8.0" right="8.0" top="8.0" />
</padding>
</TilePane>
</children>
+ <padding>
+ <Insets top="30.0" />
+ </padding>
</VBox>
</AnchorPane>
diff --git a/src/main/resources/fxml/shoppingList-view.fxml b/src/main/resources/fxml/shoppingList-view.fxml
index a207a5700b81c8eee52befc5752021d0bde0520d..a1a4c6b974ac38c11cbb1e1a2594574b482e5108 100644
--- a/src/main/resources/fxml/shoppingList-view.fxml
+++ b/src/main/resources/fxml/shoppingList-view.fxml
@@ -12,11 +12,11 @@
<?import javafx.scene.text.Font?>
<AnchorPane fx:id="parent" prefHeight="540.0" prefWidth="872.0" style="-fx-background-color: ffffff;" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="mi.hdm.controllers.ShoppingListViewController">
- <VBox layoutX="410.0" layoutY="1.0" prefHeight="539.0" prefWidth="872.0" style="-fx-background-color: ffffff;" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="1.0">
+ <VBox layoutX="410.0" layoutY="1.0" prefHeight="539.0" prefWidth="872.0" style="-fx-background-color: ffffff;" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
<padding>
<Insets bottom="16.0" left="16.0" right="16.0" />
</padding>
- <GridPane prefHeight="67.0" prefWidth="840.0">
+ <GridPane prefHeight="40.0" prefWidth="840.0">
<columnConstraints>
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
<ColumnConstraints hgrow="SOMETIMES" maxWidth="609.5914306640625" minWidth="10.0" prefWidth="607.0957641601562" />
@@ -28,12 +28,12 @@
<children>
<Label alignment="TOP_CENTER" prefHeight="54.0" prefWidth="207.0" text="Shopping List" textFill="#d91c1c" GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.valignment="TOP">
<font>
- <Font size="36.0" />
+ <Font name="Arial" size="34.0" />
</font>
</Label>
</children>
</GridPane>
- <GridPane prefHeight="392.0" prefWidth="840.0">
+ <GridPane prefHeight="447.0" prefWidth="840.0">
<columnConstraints>
<ColumnConstraints hgrow="SOMETIMES" maxWidth="467.98846435546875" minWidth="10.0" prefWidth="452.50830078125" />
<ColumnConstraints halignment="CENTER" hgrow="SOMETIMES" maxWidth="496.43231201171875" minWidth="10.0" prefWidth="387.49169921875" />
@@ -44,12 +44,12 @@
<children>
<Pane prefHeight="382.0" prefWidth="445.0" style="-fx-background-color: transparent; -fx-border-color: d91c1c; -fx-border-radius: 10; -fx-border-width: 4;">
<GridPane.margin>
- <Insets left="20.0" right="30.0" top="10.0" />
+ <Insets left="20.0" right="30.0" top="30.0" />
</GridPane.margin>
</Pane>
<Pane prefHeight="200.0" prefWidth="200.0" style="-fx-background-color: transparent; -fx-border-color: d91c1c; -fx-border-radius: 10; -fx-border-width: 4;" GridPane.columnIndex="1">
<GridPane.margin>
- <Insets bottom="60.0" left="30.0" right="20.0" top="10.0" />
+ <Insets bottom="60.0" left="30.0" right="20.0" top="30.0" />
</GridPane.margin>
</Pane>
<Button accessibleText="Clear Shopping List" alignment="CENTER" contentDisplay="RIGHT" mnemonicParsing="false" prefHeight="41.0" prefWidth="159.0" style="-fx-background-color: ffffff; -fx-control-inner-background: transparent; -fx-border-color: d91c1c; -fx-border-radius: 5; -fx-border-width: 4;" text="Clear List" textAlignment="CENTER" textFill="#d91c1c" GridPane.columnIndex="1" GridPane.halignment="RIGHT" GridPane.valignment="BOTTOM">