diff --git a/src/main/java/mi/hdm/components/IngredientLabel.java b/src/main/java/mi/hdm/components/IngredientLabel.java index 05d45d0eb7634f0ddf6b7dbd833c04717c4971bd..0d9f4dee757fd59bdc6b3969a8ab5bafa148845e 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 b693585cb86a78e1be883448f134d2c2b6a278a6..3adc7c1b1363e283d56a90fdde42613b0f1a36f9 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 4c6edfc82c083540b11eb678e29f99229d87d9bb..c188f4ba793e774c53f8e6a25458868e504c310c 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 + }