From 49501cc518766db5e893ef421705573d517c7d7e Mon Sep 17 00:00:00 2001
From: Karin <kd053@hdm-stuttgart.de>
Date: Wed, 24 May 2023 17:24:32 +0200
Subject: [PATCH] Shopping List layout, small changes
---
src/main/resources/fxml/Meal_Plan.fxml | 19 ------
.../resources/fxml/components/header.fxml | 4 +-
.../resources/fxml/shoppingList-view.fxml | 62 ++++++++++++++-----
3 files changed, 50 insertions(+), 35 deletions(-)
diff --git a/src/main/resources/fxml/Meal_Plan.fxml b/src/main/resources/fxml/Meal_Plan.fxml
index 4cfe212..89e6482 100644
--- a/src/main/resources/fxml/Meal_Plan.fxml
+++ b/src/main/resources/fxml/Meal_Plan.fxml
@@ -2,8 +2,6 @@
<?import javafx.geometry.Insets?>
<?import javafx.scene.control.ProgressBar?>
-<?import javafx.scene.image.Image?>
-<?import javafx.scene.image.ImageView?>
<?import javafx.scene.layout.AnchorPane?>
<?import javafx.scene.layout.ColumnConstraints?>
<?import javafx.scene.layout.GridPane?>
@@ -15,23 +13,6 @@
<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>
- <HBox alignment="CENTER_LEFT" prefHeight="69.0" prefWidth="793.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
- <children>
- <ImageView fitHeight="35.0" fitWidth="50.0" pickOnBounds="true" preserveRatio="true">
- <image>
- <Image url="@../images/Tasty_Pages_Menu_Button.png" />
- </image>
- <HBox.margin>
- <Insets left="15.0" right="100.0" />
- </HBox.margin>
- </ImageView>
- <Text fill="#d91c1c" strokeType="OUTSIDE" strokeWidth="0.0" text="Meal Plan" wrappingWidth="184.53966265916824">
- <font>
- <Font name="Arial Bold" size="37.0" />
- </font>
- </Text>
- </children>
- </HBox>
<VBox layoutY="69.0" prefHeight="445.0" prefWidth="872.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0">
<children>
<GridPane hgap="8.0" prefHeight="197.0" prefWidth="190.0" vgap="8.0">
diff --git a/src/main/resources/fxml/components/header.fxml b/src/main/resources/fxml/components/header.fxml
index 14e6ec9..159ef44 100644
--- a/src/main/resources/fxml/components/header.fxml
+++ b/src/main/resources/fxml/components/header.fxml
@@ -10,7 +10,7 @@
<?import javafx.scene.layout.AnchorPane?>
<?import javafx.scene.text.Font?>
-<AnchorPane prefHeight="41.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="mi.hdm.controllers.HeaderController">
+<AnchorPane prefHeight="41.0" prefWidth="600.0" style="-fx-background-color: transparent;" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="mi.hdm.controllers.HeaderController">
<MenuButton alignment="TOP_LEFT" contentDisplay="GRAPHIC_ONLY" graphicTextGap="0.0" mnemonicParsing="false" style="-fx-background-color: transparent; -fx-padding: 7;" textFill="TRANSPARENT" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="0.0">
<items>
<MenuItem mnemonicParsing="false" onAction="#changeSceneToHome" text="Home" />
@@ -30,7 +30,7 @@
</font>
</MenuButton>
<Group layoutX="407.0" layoutY="-1.0" AnchorPane.rightAnchor="3.0">
- <TextField fx:id="searchBox" alignment="CENTER" layoutX="-8.0" layoutY="7.0" onAction="#searchByQuery" prefHeight="37.0" prefWidth="188.0" promptText="Search for recipe" style="-fx-border-color: D91c1c; -fx-border-width: 2; -fx-border-radius: 10; -fx-background-radius: 10;" />
+ <TextField fx:id="searchBox" alignment="CENTER" layoutX="-8.0" layoutY="7.0" onAction="#searchByQuery" prefHeight="37.0" prefWidth="188.0" promptText="Search for recipe" style="-fx-border-color: D91c1c; -fx-border-width: 2; -fx-border-radius: 10; -fx-background-radius: 10; -fx-background-color: ffffff;" />
<ImageView accessibleRole="BUTTON" fitHeight="28.0" fitWidth="28.0" layoutX="-4.0" layoutY="11.0" onMouseClicked="#searchByQuery" pickOnBounds="true" preserveRatio="true">
<Image url="@../../images/Tasty_Pages_Search_Material_Design_Icons.png" />
<cursor>
diff --git a/src/main/resources/fxml/shoppingList-view.fxml b/src/main/resources/fxml/shoppingList-view.fxml
index 41343db..e0a7692 100644
--- a/src/main/resources/fxml/shoppingList-view.fxml
+++ b/src/main/resources/fxml/shoppingList-view.fxml
@@ -1,27 +1,61 @@
<?xml version="1.0" encoding="UTF-8"?>
<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
<?import javafx.scene.control.Label?>
-<?import javafx.scene.control.SplitPane?>
<?import javafx.scene.layout.AnchorPane?>
+<?import javafx.scene.layout.ColumnConstraints?>
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.layout.Pane?>
+<?import javafx.scene.layout.RowConstraints?>
<?import javafx.scene.layout.VBox?>
<?import javafx.scene.text.Font?>
-<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.ShoppingListViewController">
- <VBox prefHeight="200.0" prefWidth="100.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="40.0">
+<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 prefHeight="200.0" prefWidth="100.0" style="-fx-background-color: ffffff;" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="40.0">
<padding>
<Insets bottom="16.0" left="16.0" right="16.0" top="16.0" />
</padding>
- <Label text="Shopping List" textFill="#1e1e1e">
- <font>
- <Font name="Inter Regular" size="32.0" />
- </font>
- </Label>
- <SplitPane fx:id="shoppingListSplitPane" dividerPositions="0.506578947368421" prefHeight="502.0" prefWidth="872.0" style="-fx-background-color: transparent; -fx-border-color: transparent; -fx-box-border: transparent; -fx-padding: 0;" VBox.vgrow="ALWAYS">
- <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="360.0" prefWidth="379.0" style="-fx-background-color: transparent; -fx-border-color: D91C1C; -fx-border-radius: 10; -fx-border-width: 4;">
-
- </AnchorPane>
- <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="259.0" prefWidth="223.0" style="-fx-background-color: transparent; -fx-border-color: D91C1C; -fx-border-width: 4; -fx-border-radius: 10;" />
- </SplitPane>
+ <GridPane prefHeight="392.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" />
+ </columnConstraints>
+ <rowConstraints>
+ <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+ </rowConstraints>
+ <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" />
+ </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" />
+ </GridPane.margin>
+ </Pane>
+ <Pane prefHeight="0.0" prefWidth="388.0" GridPane.columnIndex="1">
+ <children>
+ <Button accessibleText="Clear Shopping List" alignment="CENTER" contentDisplay="RIGHT" layoutX="205.0" layoutY="16.0" 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">
+ <font>
+ <Font name="System Bold" size="17.0" />
+ </font>
+ </Button>
+ </children>
+ <opaqueInsets>
+ <Insets />
+ </opaqueInsets>
+ <GridPane.margin>
+ <Insets top="340.0" />
+ </GridPane.margin>
+ </Pane>
+ </children>
+ </GridPane>
</VBox>
+ <Label alignment="TOP_CENTER" layoutX="295.0" layoutY="-4.0" text="Shopping List" textFill="#d91c1c" AnchorPane.topAnchor="-4.0">
+ <font>
+ <Font size="36.0" />
+ </font>
+ </Label>
</AnchorPane>
--
GitLab