From 403bc1fc40a8e0304dcdae1bfab4e8865e7edf37 Mon Sep 17 00:00:00 2001
From: Lara Blersch <lb210@hdm-stuttgart.de>
Date: Mon, 26 Jun 2023 12:53:12 +0200
Subject: [PATCH] unified how ingredients are displayed
---
src/main/java/mi/hdm/components/IngredientLabel.java | 3 ++-
src/main/java/mi/hdm/components/SelectedIngredientLabel.java | 5 +++--
src/main/java/mi/hdm/controllers/RecipeViewController.java | 1 +
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/main/java/mi/hdm/components/IngredientLabel.java b/src/main/java/mi/hdm/components/IngredientLabel.java
index 05d45d0..0d9f4de 100644
--- a/src/main/java/mi/hdm/components/IngredientLabel.java
+++ b/src/main/java/mi/hdm/components/IngredientLabel.java
@@ -1,5 +1,6 @@
package mi.hdm.components;
+import javafx.scene.control.Label;
import javafx.scene.layout.HBox;
import javafx.scene.text.Text;
import mi.hdm.recipes.RecipeComponent;
@@ -13,7 +14,7 @@ public class IngredientLabel extends HBox {
this.amount = amount;
this.component = component;
- Text labelAmount = new Text(amount + " " + component.getMeasurement());
+ Text labelAmount = new Text(amount + " " + component.getMeasurement().getAbbreviation());
Text labelName = new Text(component.getName());
getChildren().addAll(labelAmount, labelName);
diff --git a/src/main/java/mi/hdm/components/SelectedIngredientLabel.java b/src/main/java/mi/hdm/components/SelectedIngredientLabel.java
index b693585..3adc7c1 100644
--- a/src/main/java/mi/hdm/components/SelectedIngredientLabel.java
+++ b/src/main/java/mi/hdm/components/SelectedIngredientLabel.java
@@ -35,9 +35,10 @@ public class SelectedIngredientLabel extends HBox {
amountTextField = new TextField(amount.toString());
amountTextField.setOnAction(e -> validateAmountInput());
amountTextField.setPrefWidth(75.0);
- Label componentNameLabel = new Label(component.getName());
+ Label measurement = new Label(component.getMeasurement().getAbbreviation());
+ Label componentNameLabel = new Label("| " + component.getName());
- getChildren().addAll(amountTextField, componentNameLabel);
+ getChildren().addAll(amountTextField, measurement, componentNameLabel);
setAlignment(Pos.BASELINE_LEFT);
setSpacing(5.0);
diff --git a/src/main/java/mi/hdm/controllers/RecipeViewController.java b/src/main/java/mi/hdm/controllers/RecipeViewController.java
index 4c6edfc..c188f4b 100644
--- a/src/main/java/mi/hdm/controllers/RecipeViewController.java
+++ b/src/main/java/mi/hdm/controllers/RecipeViewController.java
@@ -78,6 +78,7 @@ public class RecipeViewController extends BaseController {
recipeImage.setImage(image);
recipeImage.setPreserveRatio(true);
//TODO: for some images (f.ex. Tasty_Pages_Arrow_back.png) the image is larger than the image view
+
}
--
GitLab