diff --git a/src/main/java/mi/hdm/controllers/MealPlanController.java b/src/main/java/mi/hdm/controllers/MealPlanController.java
index 2e1d2b1bc488f4f8a2923c0bfe1f7109f7bff5c9..fcfc2c47fedcb8b5ffba2e6ad58e5487edb45a7d 100644
--- a/src/main/java/mi/hdm/controllers/MealPlanController.java
+++ b/src/main/java/mi/hdm/controllers/MealPlanController.java
@@ -7,10 +7,7 @@ import javafx.geometry.Pos;
import javafx.scene.control.*;
import javafx.scene.image.Image;
import javafx.scene.image.ImageView;
-import javafx.scene.layout.AnchorPane;
-import javafx.scene.layout.GridPane;
-import javafx.scene.layout.StackPane;
-import javafx.scene.layout.VBox;
+import javafx.scene.layout.*;
import javafx.scene.text.Font;
import javafx.scene.text.FontWeight;
import javafx.scene.text.Text;
@@ -104,30 +101,50 @@ public class MealPlanController extends BaseController {
for (int j = 0; j < 7; j++) {
final int J = j;
- mealPlan.getRecipeCodeForDay(LocalDate.now().plusDays(j)).ifPresentOrElse(code -> {
+ mealPlan.getRecipeCodeForDay(LocalDate.now().plusDays(J)).ifPresentOrElse(code -> {
Recipe r = recipeManager.getRecipeByCode(code);
VBox displayRecipeVBox = new VBox();
ImageView recipeImage = new ImageView(new Image(r.getImageURL().toString()));
+ HBox recipeHBox = new HBox();
Label name = new Label(r.getName());
name.setFont(font);
- displayRecipeVBox.getChildren().addAll(recipeImage, name);
+ name.setStyle("-fx-padding: 0 50 10 10;");
+ name.setOnMouseClicked(e ->
+ changeScene(View.RECIPE_VIEW, r)
+ );
+
+ Button removeRecipeButton = new Button();
+ removeRecipeButton.setStyle("-fx-background-color: dedede;" +
+ "-fx-background-radius: 5;");
+ ImageView imageView = new ImageView(String.valueOf(Recipe.class.getResource("/images/Tasty_Pages_X_Icon.png")));
+ imageView.setPreserveRatio(true);
+ imageView.setFitHeight(20);
+ imageView.setFitWidth(20);
+ removeRecipeButton.setGraphic(imageView);
+ removeRecipeButton.setOnAction(e -> {
+ mealPlan.clear(LocalDate.now().plusDays(J));
+ });
+
+ recipeHBox.getChildren().addAll(name, removeRecipeButton);
+ displayRecipeVBox.getChildren().addAll(recipeImage, recipeHBox);
mealPlanGrid.add(displayRecipeVBox, J, 1);
recipeImage.setPreserveRatio(true);
recipeImage.fitWidthProperty().bind(mealPlanGrid.widthProperty().divide(7));
recipeImage.fitHeightProperty().bind(mealPlanGrid.heightProperty().subtract(60));
- name.setPadding(new Insets(10));
}, () -> {
Button addRecipeButton = new Button();
addRecipeButton.setStyle("-fx-background-color: dedede;" +
- "-fx-background-radius: 15;");
+ "-fx-background-radius: 10;");
ImageView imageView = new ImageView(String.valueOf(Recipe.class.getResource("/images/Tasty_Pages_Plus_Icon.png")));
imageView.setPreserveRatio(true);
imageView.setFitHeight(50);
imageView.setFitWidth(50);
addRecipeButton.setGraphic(imageView);
mealPlanGrid.add(addRecipeButton, J, 1);
- addRecipeButton.setOnMouseClicked(element -> searchRecipes(LocalDate.now().plusDays(J)));
+ addRecipeButton.setOnMouseClicked(e ->
+ searchRecipes(LocalDate.now().plusDays(J))
+ );
GridPane.setHalignment(addRecipeButton, HPos.CENTER);
});
@@ -135,8 +152,8 @@ public class MealPlanController extends BaseController {
}
}
- // @FXML
- public void searchRecipes(LocalDate date) {
+
+ public void searchRecipes(LocalDate date) {
searchVBox = new VBox();
searchVBox.setMaxSize(800, 800);
searchVBox.setAlignment(Pos.CENTER);
@@ -175,7 +192,13 @@ public class MealPlanController extends BaseController {
}
);
searchScrollPane.setContent(resultContainer);
- }
+ }
+
+ @FXML
+ public void clearMealplan() {
+ mealPlan.clear();
+ displayMealPlan();
+ }
private void drawNutritionTable() {
log.debug("Drawing nutrition table for meal plan.");
diff --git a/src/main/java/mi/hdm/controllers/RecipeCreatorController.java b/src/main/java/mi/hdm/controllers/RecipeCreatorController.java
index 19b9b9e68623feb2d2e0510956ef8fc5863f4efe..d8eb4df63858c4e38c699807f34a2834477be14a 100644
--- a/src/main/java/mi/hdm/controllers/RecipeCreatorController.java
+++ b/src/main/java/mi/hdm/controllers/RecipeCreatorController.java
@@ -24,7 +24,6 @@ import java.util.stream.IntStream;
import static mi.hdm.helpers.Validation.isInteger;
public class RecipeCreatorController extends BaseController {
- //TODO: select image when creating recipe
private static final int ELEMENTS_PER_SEARCH_PAGE = 100;
private final RecipeManager recipeManager;
diff --git a/src/main/java/mi/hdm/mealPlan/MealPlan.java b/src/main/java/mi/hdm/mealPlan/MealPlan.java
index d8a163956b2d1221fea2a08a2e72e9c312595c3a..40bd1af12e4a61a5935fe8c0236942ae4aeb4e60 100644
--- a/src/main/java/mi/hdm/mealPlan/MealPlan.java
+++ b/src/main/java/mi/hdm/mealPlan/MealPlan.java
@@ -70,6 +70,7 @@ public class MealPlan {
plan.put(date, recipeCode);
}
+
public void clear(LocalDate date) {
if (date == null) {
throw new NullPointerException("Date can not be null");
diff --git a/src/main/resources/fxml/Meal_Plan.fxml b/src/main/resources/fxml/Meal_Plan.fxml
index 17bf3cbfa7a39140991ef84e68c6556bc56a705b..8fb350709031e42e7eeda404379e3ac589624bfe 100644
--- a/src/main/resources/fxml/Meal_Plan.fxml
+++ b/src/main/resources/fxml/Meal_Plan.fxml
@@ -4,188 +4,172 @@
<?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?>
<?import javafx.scene.text.*?>
-<AnchorPane fx:id="parent" prefHeight="700.0" prefWidth="960.0" xmlns="http://javafx.com/javafx/17.0.2-ea"
- xmlns:fx="http://javafx.com/fxml/1" fx:controller="mi.hdm.controllers.MealPlanController">
- <StackPane fx:id="stackPane" prefHeight="150.0" prefWidth="200.0" AnchorPane.bottomAnchor="0.0"
- AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+
+<AnchorPane fx:id="parent" prefHeight="700.0" prefWidth="960.0" xmlns="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="mi.hdm.controllers.MealPlanController">
+ <StackPane fx:id="stackPane" prefHeight="150.0" prefWidth="200.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
<VBox prefHeight="445.0" prefWidth="872.0">
<GridPane hgap="8.0" prefHeight="57.0" prefWidth="842.0" vgap="8.0">
<columnConstraints>
- <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="78.0"/>
- <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="473.0"/>
- <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0"/>
+ <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="78.0" />
+ <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="473.0" />
+ <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
</columnConstraints>
<rowConstraints>
- <RowConstraints minHeight="10.0" prefHeight="49.999996185302734" vgrow="SOMETIMES"/>
+ <RowConstraints minHeight="10.0" prefHeight="49.999996185302734" vgrow="SOMETIMES" />
</rowConstraints>
<VBox.margin>
- <Insets left="15.0" right="15.0"/>
+ <Insets left="15.0" right="15.0" />
</VBox.margin>
- <Label alignment="TOP_CENTER" text="Meal Plan" textFill="#d91c1c" GridPane.columnIndex="1"
- GridPane.halignment="CENTER" GridPane.valignment="TOP">
+ <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 name="Arial" size="34.0" />
</font>
</Label>
</GridPane>
- <GridPane fx:id="mealPlanGrid" prefHeight="214.0" prefWidth="812.0" GridPane.columnIndex="1"
- GridPane.rowIndex="0">
+ <GridPane fx:id="mealPlanGrid" prefHeight="214.0" prefWidth="812.0" GridPane.columnIndex="1" GridPane.rowIndex="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" 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" minWidth="10.0" prefWidth="100.0" />
+ <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
</columnConstraints>
<rowConstraints>
- <RowConstraints maxHeight="110.0" minHeight="10.0" prefHeight="32.0" vgrow="SOMETIMES"/>
- <RowConstraints maxHeight="204.0" minHeight="10.0" prefHeight="182.0" vgrow="SOMETIMES"/>
+ <RowConstraints maxHeight="110.0" minHeight="10.0" prefHeight="32.0" vgrow="SOMETIMES" />
+ <RowConstraints maxHeight="204.0" minHeight="10.0" prefHeight="182.0" vgrow="SOMETIMES" />
</rowConstraints>
<VBox.margin>
- <Insets bottom="30.0" left="30.0" right="30.0" top="30.0"/>
+ <Insets bottom="30.0" left="30.0" right="30.0" top="30.0" />
</VBox.margin>
</GridPane>
- <VBox prefHeight="328.0" prefWidth="945.0" spacing="15.0">
- <VBox.margin>
- <Insets left="15.0"/>
- </VBox.margin>
- <Text fill="#1e1e1e" strokeType="OUTSIDE" strokeWidth="0.0" text="Nutrition">
- <font>
- <Font name="Arial Bold" size="25.0"/>
- </font>
- </Text>
- <Text fill="#1e1e1e" strokeType="OUTSIDE" strokeWidth="0.0"
- text="Check out your nutrition scores for this week's meal plan!">
- <font>
- <Font name="Arial" size="17.0"/>
- </font>
- </Text>
- <!-- Nutrition table starts here -->
- <VBox prefHeight="200" prefWidth="500">
- <HBox alignment="CENTER_LEFT" prefHeight="57.0" prefWidth="872.0" spacing="5.0">
- <Text fill="#1e1e1e" strokeType="OUTSIDE" strokeWidth="0.0" text="Calories"
- wrappingWidth="83.47006416320801">
- <font>
- <Font name="Arial" size="17.0"/>
- </font>
- </Text>
- <ProgressBar fx:id="caloriesProgressBar" prefHeight="24.0" prefWidth="631.0" progress="0.0"
- style="-fx-background-color: #d9d9d9; -fx-background-radius: 5; -fx-control-inner-background: a; -fx-accent: #d91c1c;">
- <HBox.margin>
- <Insets left="70.0"/>
- </HBox.margin>
- </ProgressBar>
- <Text fx:id="caloriesPercentage" fill="#1e1e1e" strokeType="OUTSIDE" strokeWidth="0.0" text="0%"
- wrappingWidth="83.47006416320801">
- <font>
- <Font name="Arial" size="17.0"/>
- </font>
- </Text>
- </HBox>
- <HBox alignment="CENTER_LEFT" prefHeight="53.0" prefWidth="872.0" spacing="5.0">
- <Text fill="#1e1e1e" strokeType="OUTSIDE" strokeWidth="0.0" text="Carbs"
- wrappingWidth="83.47006416320801">
- <font>
- <Font name="Arial" size="17.0"/>
- </font>
- </Text>
- <ProgressBar fx:id="carbsProgressBar" prefHeight="24.0" prefWidth="631.0" progress="0.0"
- style="-fx-background-color: #d9d9d9; -fx-control-inner-background: a; -fx-background-radius: 5; -fx-accent: #d91c1c;">
- <HBox.margin>
- <Insets left="70.0"/>
- </HBox.margin>
- </ProgressBar>
- <Text fx:id="carbsPercentage" fill="#1e1e1e" strokeType="OUTSIDE" strokeWidth="0.0" text="0%"
- wrappingWidth="83.47006416320801">
- <font>
- <Font name="Arial" size="17.0"/>
- </font>
- </Text>
- </HBox>
- <HBox alignment="CENTER_LEFT" prefHeight="57.0" prefWidth="872.0" spacing="5.0">
- <Text fill="#1e1e1e" strokeType="OUTSIDE" strokeWidth="0.0" text="Fat"
- wrappingWidth="83.47006416320801">
- <font>
- <Font name="Arial" size="17.0"/>
- </font>
- </Text>
- <ProgressBar fx:id="fatProgressbar" prefHeight="24.0" prefWidth="631.0" progress="0.0"
- style="-fx-background-color: #d9d9d9; -fx-background-radius: 5; -fx-control-inner-background: a; -fx-accent: #d91c1c;">
- <HBox.margin>
- <Insets left="70.0"/>
- </HBox.margin>
- </ProgressBar>
- <Text fx:id="fatPercentage" fill="#1e1e1e" strokeType="OUTSIDE" strokeWidth="0.0" text="0%"
- wrappingWidth="83.47006416320801">
- <font>
- <Font name="Arial" size="17.0"/>
- </font>
- </Text>
- </HBox>
- <HBox alignment="CENTER_LEFT" prefHeight="53.0" prefWidth="872.0" spacing="5.0">
- <Text fill="#1e1e1e" strokeType="OUTSIDE" strokeWidth="0.0" text="Protein"
- wrappingWidth="83.47006416320801">
- <font>
- <Font name="Arial" size="17.0"/>
- </font>
- </Text>
- <ProgressBar fx:id="proteinProgressBar" prefHeight="24.0" prefWidth="631.0" progress="0.0"
- style="-fx-background-color: #d9d9d9; -fx-control-inner-background: a; -fx-background-radius: 5; -fx-accent: #d91c1c;">
- <HBox.margin>
- <Insets left="70.0"/>
- </HBox.margin>
- </ProgressBar>
- <Text fx:id="proteinPercentage" fill="#1e1e1e" strokeType="OUTSIDE" strokeWidth="0.0" text="0%"
- wrappingWidth="83.47006416320801">
- <font>
- <Font name="Arial" size="17.0"/>
- </font>
- </Text>
- </HBox>
- <HBox alignment="CENTER_LEFT" prefHeight="53.0" prefWidth="872.0" spacing="5.0">
- <Text fill="#1e1e1e" strokeType="OUTSIDE" strokeWidth="0.0" text="Fibers"
- wrappingWidth="83.47006416320801">
- <font>
- <Font name="Arial" size="17.0"/>
- </font>
- </Text>
- <ProgressBar fx:id="fibersProgressBar" prefHeight="24.0" prefWidth="631.0" progress="0.0"
- style="-fx-background-color: #d9d9d9; -fx-control-inner-background: a; -fx-background-radius: 5; -fx-accent: #d91c1c;">
- <HBox.margin>
- <Insets left="70.0"/>
- </HBox.margin>
- </ProgressBar>
- <Text fx:id="fiberPercentage" fill="#1e1e1e" strokeType="OUTSIDE" strokeWidth="0.0" text="0%"
- wrappingWidth="83.47006416320801">
- <font>
- <Font name="Arial" size="17.0"/>
- </font>
- </Text>
- </HBox>
- <HBox alignment="CENTER_LEFT" prefHeight="53.0" prefWidth="872.0" spacing="5.0">
- <Text fill="#1e1e1e" strokeType="OUTSIDE" strokeWidth="0.0" text="Salt"
- wrappingWidth="83.47006416320801">
- <font>
- <Font name="Arial" size="17.0"/>
- </font>
- </Text>
- <ProgressBar fx:id="saltProgressBar" prefHeight="24.0" prefWidth="631.0" progress="0.0"
- style="-fx-background-color:#d9d9d9; -fx-control-inner-background: a; -fx-background-radius: 5; -fx-accent: #d91c1c;">
- <HBox.margin>
- <Insets left="70.0"/>
- </HBox.margin>
- </ProgressBar>
- <Text fx:id="saltPercentage" fill="#1e1e1e" strokeType="OUTSIDE" strokeWidth="0.0" text="0%"
- wrappingWidth="83.47006416320801">
- <font>
- <Font name="Arial" size="17.0"/>
- </font>
- </Text>
- </HBox>
- </VBox>
- </VBox>
+ <HBox prefHeight="100.0" prefWidth="200.0">
+ <children>
+ <VBox prefHeight="346.0" prefWidth="945.0" spacing="15.0">
+ <Text fill="#1e1e1e" strokeType="OUTSIDE" strokeWidth="0.0" text="Nutrition">
+ <font>
+ <Font name="Arial Bold" size="25.0" />
+ </font>
+ </Text>
+ <Text fill="#1e1e1e" strokeType="OUTSIDE" strokeWidth="0.0" text="Check out your nutrition scores for this week's meal plan!">
+ <font>
+ <Font name="Arial" size="17.0" />
+ </font>
+ </Text>
+ <!-- Nutrition table starts here -->
+ <VBox prefHeight="200" prefWidth="500">
+ <HBox alignment="CENTER_LEFT" prefHeight="57.0" prefWidth="872.0" spacing="5.0">
+ <Text fill="#1e1e1e" strokeType="OUTSIDE" strokeWidth="0.0" text="Calories" wrappingWidth="83.47006416320801">
+ <font>
+ <Font name="Arial" size="17.0" />
+ </font>
+ </Text>
+ <ProgressBar fx:id="caloriesProgressBar" prefHeight="24.0" prefWidth="631.0" progress="0.0" style="-fx-background-color: #d9d9d9; -fx-background-radius: 5; -fx-control-inner-background: a; -fx-accent: #d91c1c;">
+ <HBox.margin>
+ <Insets left="70.0" />
+ </HBox.margin>
+ </ProgressBar>
+ <Text fx:id="caloriesPercentage" fill="#1e1e1e" strokeType="OUTSIDE" strokeWidth="0.0" text="0%" wrappingWidth="83.47006416320801">
+ <font>
+ <Font name="Arial" size="17.0" />
+ </font>
+ </Text>
+ </HBox>
+ <HBox alignment="CENTER_LEFT" prefHeight="53.0" prefWidth="872.0" spacing="5.0">
+ <Text fill="#1e1e1e" strokeType="OUTSIDE" strokeWidth="0.0" text="Carbs" wrappingWidth="83.47006416320801">
+ <font>
+ <Font name="Arial" size="17.0" />
+ </font>
+ </Text>
+ <ProgressBar fx:id="carbsProgressBar" prefHeight="24.0" prefWidth="631.0" progress="0.0" style="-fx-background-color: #d9d9d9; -fx-control-inner-background: a; -fx-background-radius: 5; -fx-accent: #d91c1c;">
+ <HBox.margin>
+ <Insets left="70.0" />
+ </HBox.margin>
+ </ProgressBar>
+ <Text fx:id="carbsPercentage" fill="#1e1e1e" strokeType="OUTSIDE" strokeWidth="0.0" text="0%" wrappingWidth="83.47006416320801">
+ <font>
+ <Font name="Arial" size="17.0" />
+ </font>
+ </Text>
+ </HBox>
+ <HBox alignment="CENTER_LEFT" prefHeight="57.0" prefWidth="872.0" spacing="5.0">
+ <Text fill="#1e1e1e" strokeType="OUTSIDE" strokeWidth="0.0" text="Fat" wrappingWidth="83.47006416320801">
+ <font>
+ <Font name="Arial" size="17.0" />
+ </font>
+ </Text>
+ <ProgressBar fx:id="fatProgressbar" prefHeight="24.0" prefWidth="631.0" progress="0.0" style="-fx-background-color: #d9d9d9; -fx-background-radius: 5; -fx-control-inner-background: a; -fx-accent: #d91c1c;">
+ <HBox.margin>
+ <Insets left="70.0" />
+ </HBox.margin>
+ </ProgressBar>
+ <Text fx:id="fatPercentage" fill="#1e1e1e" strokeType="OUTSIDE" strokeWidth="0.0" text="0%" wrappingWidth="83.47006416320801">
+ <font>
+ <Font name="Arial" size="17.0" />
+ </font>
+ </Text>
+ </HBox>
+ <HBox alignment="CENTER_LEFT" prefHeight="53.0" prefWidth="872.0" spacing="5.0">
+ <Text fill="#1e1e1e" strokeType="OUTSIDE" strokeWidth="0.0" text="Protein" wrappingWidth="83.47006416320801">
+ <font>
+ <Font name="Arial" size="17.0" />
+ </font>
+ </Text>
+ <ProgressBar fx:id="proteinProgressBar" prefHeight="24.0" prefWidth="631.0" progress="0.0" style="-fx-background-color: #d9d9d9; -fx-control-inner-background: a; -fx-background-radius: 5; -fx-accent: #d91c1c;">
+ <HBox.margin>
+ <Insets left="70.0" />
+ </HBox.margin>
+ </ProgressBar>
+ <Text fx:id="proteinPercentage" fill="#1e1e1e" strokeType="OUTSIDE" strokeWidth="0.0" text="0%" wrappingWidth="83.47006416320801">
+ <font>
+ <Font name="Arial" size="17.0" />
+ </font>
+ </Text>
+ </HBox>
+ <HBox alignment="CENTER_LEFT" prefHeight="53.0" prefWidth="872.0" spacing="5.0">
+ <Text fill="#1e1e1e" strokeType="OUTSIDE" strokeWidth="0.0" text="Fibers" wrappingWidth="83.47006416320801">
+ <font>
+ <Font name="Arial" size="17.0" />
+ </font>
+ </Text>
+ <ProgressBar fx:id="fibersProgressBar" prefHeight="24.0" prefWidth="631.0" progress="0.0" style="-fx-background-color: #d9d9d9; -fx-control-inner-background: a; -fx-background-radius: 5; -fx-accent: #d91c1c;">
+ <HBox.margin>
+ <Insets left="70.0" />
+ </HBox.margin>
+ </ProgressBar>
+ <Text fx:id="fiberPercentage" fill="#1e1e1e" strokeType="OUTSIDE" strokeWidth="0.0" text="0%" wrappingWidth="83.47006416320801">
+ <font>
+ <Font name="Arial" size="17.0" />
+ </font>
+ </Text>
+ </HBox>
+ <HBox alignment="CENTER_LEFT" prefHeight="53.0" prefWidth="872.0" spacing="5.0">
+ <Text fill="#1e1e1e" strokeType="OUTSIDE" strokeWidth="0.0" text="Salt" wrappingWidth="83.47006416320801">
+ <font>
+ <Font name="Arial" size="17.0" />
+ </font>
+ </Text>
+ <ProgressBar fx:id="saltProgressBar" prefHeight="24.0" prefWidth="631.0" progress="0.0" style="-fx-background-color:#d9d9d9; -fx-control-inner-background: a; -fx-background-radius: 5; -fx-accent: #d91c1c;">
+ <HBox.margin>
+ <Insets left="70.0" />
+ </HBox.margin>
+ </ProgressBar>
+ <Text fx:id="saltPercentage" fill="#1e1e1e" strokeType="OUTSIDE" strokeWidth="0.0" text="0%" wrappingWidth="83.47006416320801">
+ <font>
+ <Font name="Arial" size="17.0" />
+ </font>
+ </Text>
+ </HBox>
+ </VBox>
+ </VBox>
+ <Button fx:id="clearButton" mnemonicParsing="false" onAction="#clearMealplan" prefHeight="36.0" prefWidth="170.0" style="-fx-background-color: transparent; -fx-border-color: d91c1c; -fx-border-width: 4; -fx-border-radius: 5;" text="Clear Meal Plan" textFill="#d91c1c">
+ <font>
+ <Font name="System Bold" size="13.0" />
+ </font>
+ </Button>
+ </children>
+ </HBox>
</VBox>
</StackPane>
</AnchorPane>
diff --git a/src/main/resources/fxml/recipe-creator.fxml b/src/main/resources/fxml/recipe-creator.fxml
index 152c54be0dc5bc7ef51605b8e731718a31297290..2007cb5f515d5acf461c0d9c59a1213f02605726 100644
--- a/src/main/resources/fxml/recipe-creator.fxml
+++ b/src/main/resources/fxml/recipe-creator.fxml
@@ -159,7 +159,7 @@
<Insets bottom="10.0" left="5.0" right="5.0" top="5.0" />
</padding>
<ImageView accessibleRole="BUTTON" fitHeight="40.0" fitWidth="200.0" onMouseClicked="#changeSceneToHome" pickOnBounds="true" preserveRatio="true" GridPane.valignment="CENTER">
- <Image url="@../images/Tasty_Pages_Back_Arrow.png" />
+ <Image url="@../images/Tasty_Pages_Arrow_back.png" />
<cursor>
<Cursor fx:constant="HAND" />
</cursor>
diff --git a/src/main/resources/fxml/recipe-editor.fxml b/src/main/resources/fxml/recipe-editor.fxml
index cda3e92a72570457816d173f047d203a970e84a9..c7bda355759d401b19c04005cbe2ae2b5c1bee79 100644
--- a/src/main/resources/fxml/recipe-editor.fxml
+++ b/src/main/resources/fxml/recipe-editor.fxml
@@ -153,7 +153,7 @@
<Insets bottom="10.0" left="5.0" right="5.0" top="5.0" />
</padding>
<ImageView fitHeight="40.0" fitWidth="200.0" onMouseClicked="#changeSceneToRecipe" pickOnBounds="true" preserveRatio="true" GridPane.valignment="CENTER">
- <Image url="@../images/Tasty_Pages_Back_Arrow.png" />
+ <Image url="@../images/Tasty_Pages_Arrow_back.png" />
<cursor>
<Cursor fx:constant="HAND" />
</cursor>
diff --git a/src/main/resources/images/Tasty_Pages_Back_Arrow.png b/src/main/resources/images/Tasty_Pages_Back_Arrow.png
deleted file mode 100644
index ed29f175a0aa11688c02c4e858009120b388ed2a..0000000000000000000000000000000000000000
Binary files a/src/main/resources/images/Tasty_Pages_Back_Arrow.png and /dev/null differ