diff --git a/src/main/java/no/ntnu/idatt1002/demo/controller/AddIngredientController.java b/src/main/java/no/ntnu/idatt1002/demo/controller/AddIngredientController.java
index fa34cebe38be07cba50000f7e9880dfbf81e6f6c..408a98ed89d4e4270255a25b195f952c949f2642 100644
--- a/src/main/java/no/ntnu/idatt1002/demo/controller/AddIngredientController.java
+++ b/src/main/java/no/ntnu/idatt1002/demo/controller/AddIngredientController.java
@@ -2,24 +2,22 @@ package no.ntnu.idatt1002.demo.controller;
import javafx.application.Platform;
import javafx.collections.FXCollections;
-import javafx.collections.ObservableList;
import javafx.fxml.FXML;
import javafx.fxml.Initializable;
-import javafx.scene.control.Label;
-import javafx.scene.control.ListView;
+import javafx.scene.control.*;
+
import java.io.IOException;
import java.net.URL;
import java.util.Arrays;
import java.util.List;
import java.util.ResourceBundle;
import java.util.stream.Collectors;
-import javafx.scene.control.Button;
-import javafx.scene.control.TextField;
import no.ntnu.idatt1002.demo.data.recipes.FileHandler;
import no.ntnu.idatt1002.demo.data.recipes.FoodItem;
import no.ntnu.idatt1002.demo.data.recipes.IngredientsAtHand;
+
/**
* The AddIngredientController manages a dialog pane used to display a search-field along with a list of all the
* possible food types in the application according to the FoodItem enum class. The food types in the list may be
@@ -32,21 +30,12 @@ import no.ntnu.idatt1002.demo.data.recipes.IngredientsAtHand;
*/
public class AddIngredientController implements Initializable {
- private ObservableList<String> ingredients;
- private String[] ingredientsList;
-
- @FXML
- private Button addBtn;
-
@FXML
private ListView<String> listView;
@FXML
private TextField searchBar;
- @FXML
- private Button searchBtn;
-
@FXML
private Label status;
@@ -68,6 +57,27 @@ public class AddIngredientController implements Initializable {
status.setWrapText(true);
}
+
+ /**
+ * The help method is called whenever the help-button (displayed as a round button with a question mark on it) is
+ * clicked. An alert box appears on the screen with information about how the current window is navigated to
+ * perform the intended use.
+ */
+ @FXML
+ void help () {
+ Alert a = new Alert(Alert.AlertType.INFORMATION);
+ a.setTitle("How to add ingredients to the fridge");
+ String information = "Write a word in the search field and either press 'ENTER' on your keyboard or " +
+ "press the button 'Search' to perform the search. Then click on the food you want to add and " +
+ "press the 'ADD' button. If the food was added to the fridge, it will appear below the 'ADD' button, " +
+ "if not, it was probably in the fridge already!";
+
+ a.setContentText(information);
+ a.showAndWait();
+ }
+
+
+
/**
* The addToFridge method reads an up-to-date instance of the IngredientsAtHand object from file and
* gets hold of the FoodItem constant that is currently selected in the list. If the selected FoodItem is not
diff --git a/src/main/java/no/ntnu/idatt1002/demo/controller/AllRecipesController.java b/src/main/java/no/ntnu/idatt1002/demo/controller/AllRecipesController.java
index a6bc85d369e4a2583c38d4202cd6003b8e6623af..80de931bafc7977a1ad8a2b5089b609d22687e4f 100644
--- a/src/main/java/no/ntnu/idatt1002/demo/controller/AllRecipesController.java
+++ b/src/main/java/no/ntnu/idatt1002/demo/controller/AllRecipesController.java
@@ -71,7 +71,7 @@ public class AllRecipesController implements Initializable {
ArrayList<Recipe> sortedRecipes = recipeRegister.pickBestFits(numberOfRecipes, ingredientsAtHand);
- recipes = FXCollections.observableArrayList(sortedRecipes.stream().map(recipe -> String.format("# %s - %d missing ingredients (%2.0f %%)", recipe.getName(), recipe.getMissingIngredients(), percent(recipe.getIngredientList().size() - recipe.getMissingIngredients(), recipe.getIngredientList().size()))).toList());
+ recipes = FXCollections.observableArrayList(sortedRecipes.stream().map(recipe -> String.format("# %s - %d missing ingredients (%2.0f %% covered)", recipe.getName(), recipe.getMissingIngredients(), percent(recipe.getIngredientList().size() - recipe.getMissingIngredients(), recipe.getIngredientList().size()))).toList());
}
allList.setItems(recipes);
diff --git a/src/main/java/no/ntnu/idatt1002/demo/controller/IngredientTileController.java b/src/main/java/no/ntnu/idatt1002/demo/controller/IngredientTileController.java
index 05937bc1e949e87ddd9f7221cae9e3de15c679a4..3762ad3c0093ab4a98c26ae67220dea0a82895e0 100644
--- a/src/main/java/no/ntnu/idatt1002/demo/controller/IngredientTileController.java
+++ b/src/main/java/no/ntnu/idatt1002/demo/controller/IngredientTileController.java
@@ -31,5 +31,6 @@ public class IngredientTileController {
.append(ingredient.getAmount()).append(" ")
.append(ingredient.getUnit().label);
text.setText(String.valueOf(sb));
+ text.setStyle("-fx-font-size: 16");
}
}
diff --git a/src/main/java/no/ntnu/idatt1002/demo/controller/RecipeTileController.java b/src/main/java/no/ntnu/idatt1002/demo/controller/RecipeTileController.java
index 81e5e3b0584efc8c6b5c984e98dea75b42bbacae..b0d579b3d496d5fa0550925cd5043da9c3d3abe1 100644
--- a/src/main/java/no/ntnu/idatt1002/demo/controller/RecipeTileController.java
+++ b/src/main/java/no/ntnu/idatt1002/demo/controller/RecipeTileController.java
@@ -27,7 +27,7 @@ import java.util.ResourceBundle;
public class RecipeTileController implements Initializable {
@FXML
- private Button nameTag;
+ private Label nameTag;
@FXML
private Label missingTag;
diff --git a/src/main/resources/budgets/SelectedBudget.current b/src/main/resources/budgets/SelectedBudget.current
index 0e696bb67074785b3a96d841be79fcb03a645e39..06b279097892ff167d38ffe92f919d36d811db9d 100644
--- a/src/main/resources/budgets/SelectedBudget.current
+++ b/src/main/resources/budgets/SelectedBudget.current
@@ -1 +1 @@
-APRILpåske
\ No newline at end of file
+APRILreasonable
\ No newline at end of file
diff --git a/src/main/resources/recipes/Fridge.register b/src/main/resources/recipes/Fridge.register
index c39c5a876cd3ef509f5cfd5bb5be3f7e5e5e05d8..d4bad4f3da523cc763978334b9e31ab3d418afcc 100644
--- a/src/main/resources/recipes/Fridge.register
+++ b/src/main/resources/recipes/Fridge.register
@@ -1,9 +1,23 @@
+CARROT
+MILK
+AVOCADO
+CANNED_TOMATO
+CELERY
+BROTH
+BAY_LEAF
+DRY_OREGANO
+WHITE_BEANS
+DRY_THYME
+FRESH_YEAST
+GARLIC_CLOVE
+RED_ONION
+PIE_DOUGH
+BROCCOLI
+LAM
+CHILLI_POWDER
+SAUSAGE
YELLOW_CHEESE
-MINCED_MEAT
-ONION
-HAM
-WHEAT_FLOUR
-ORANGE
-OIL
-POTATO
+PARMESAN
OLIVE_OIL
+CHILLI
+EGG
diff --git a/src/main/resources/style.css b/src/main/resources/style.css
index 3a562b3cc890b50ba606a44f0d05284d3f4b276b..b763b8690c9801608f74a31865901c35504a5cf3 100644
--- a/src/main/resources/style.css
+++ b/src/main/resources/style.css
@@ -1,13 +1,50 @@
+.font {
+ -fx-font-family: "JetBrains Mono Medium";
+}
+
+.head-line {
+ -fx-font-family: "Lucida Console";
+ -fx-font-weight: normal;
+ -fx-font-size: 40;
+}
+
.button-style {
- //-fx-background-color: linear-gradient(#8ca45b, #1e5b5b);
-fx-background-color: white;
-fx-text-fill: black;
-fx-background-radius: 30;
-fx-background-insets: 0;
+ -fx-font-family: "JetBrains Mono";
+ -fx-font-size: 16;
+
+}
+
+.welcome-button {
+ -fx-background-color: white;
+ -fx-text-fill: black;
+ -fx-border-width: 10;
+ -fx-border-fill: #1e5b5b;
+ -fx-background-radius: 30;
+
+ -fx-font-size: 20;
+}
+
+#small-button {
+ -fx-font-size: 12;
+}
+
+#on-white {
+ -fx-background-color: #83b6b6;
+ -fx-text-fill: black;
+}
+
+.square-button-style {
+ -fx-background-color: white;
+ -fx-text-fill: black;
+ -fx-background-radius: 10;
+ -fx-background-insets: 0;
-fx-font-size: 16;
- //-fx-text-fill: white;
}
.button-style:hover {
@@ -22,6 +59,7 @@
-fx-border-color: white;
-fx-border-width: 6px;
-fx-border-radius: 25;
+ -fx-text-alignment: center;
}
.recipe-tile:hover {
@@ -32,7 +70,6 @@
.dialog-pane {
-fx-background-color: rgba(151, 175, 151, 0.8);
-
}
.list-cell:filled:selected:focused, .list-cell:filled:selected {
@@ -41,15 +78,16 @@
}
.list-cell{
- -fx-font-size:18.0;
+ -fx-font-size:20.0;
}
-.list-cell:even { /* <=== changed to even */
- -fx-background-color: white;
+
+.list-cell:even {
+ -fx-background-color: rgba(255, 255, 255, 0.7);
}
-.list-cell:odd { /* <=== changed to even */
- -fx-background-color: rgba(190, 217, 190, 0.8);
+.list-cell:odd {
+ -fx-background-color: rgba(190, 217, 190, 0.7);
}
.list-cell:filled:hover {
@@ -62,12 +100,17 @@
-fx-alignment: center;
}
-.ingredient:hover {
- -fx-scale-x: 1.05;
- -fx-scale-y: 1.05;
- -fx-scale-z: 1.05;
+/*#ingredient-label {
+ -fx-font-family: "JetBrains Mono Medium";
}
+#ingredient:hover {
+ -fx-text-fill: red;
+ -fx-scale-x: 1.03;
+ -fx-scale-y: 1.03;
+ -fx-scale-z: 1.03;
+}*/
+
.recipe-instructions {
-fx-font-size: 16;
-fx-font-style: italic;
@@ -80,21 +123,23 @@
-fx-border-radius: 20;
}
-/*.main-bar {
- -fx-accent: green;
-}*/
-/*
-
-.mini-bars {
- -fx-accent: #1e5b5b;
-}*/
-
.scroll-pane > .viewport {
-fx-background-color: transparent;
}
+
.scroll-pane {
-fx-background-color: rgba(255, 255, 255, 0.5);
-fx-border-width: 5;
-fx-border-radius: 5;
-fx-border-color: rgba(255, 255, 255, 0.75);
}
+
+#help {
+ -fx-font-size: 30;
+ -fx-font-weight: bold;
+ -fx-background-color: #e09188;
+ -fx-border-width: 5;
+ -fx-border-radius: 30;
+ -fx-border-color: white;
+ -fx-text-fill: white;
+}
\ No newline at end of file
diff --git a/src/main/resources/view/AddBudgetNew.fxml b/src/main/resources/view/AddBudgetNew.fxml
index 080d9ae95a03b232bf92b82db8224b0195f464ec..136560a4a0dcbe117b941d2dbb20d88aed6eee4a 100644
--- a/src/main/resources/view/AddBudgetNew.fxml
+++ b/src/main/resources/view/AddBudgetNew.fxml
@@ -1,19 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<?import javafx.geometry.Insets?>
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.ComboBox?>
-<?import javafx.scene.control.DialogPane?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.control.TextField?>
-<?import javafx.scene.layout.ColumnConstraints?>
-<?import javafx.scene.layout.GridPane?>
-<?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.RowConstraints?>
-<?import javafx.scene.text.Font?>
-<?import javafx.scene.text.Text?>
+<?import javafx.geometry.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.text.*?>
-<DialogPane prefHeight="295.0" prefWidth="360.0" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="no.ntnu.idatt1002.demo.controller.AddBudgetController">
+<DialogPane prefHeight="295.0" prefWidth="360.0" xmlns="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="no.ntnu.idatt1002.demo.controller.AddBudgetController">
<content>
<GridPane>
<columnConstraints>
@@ -48,12 +40,12 @@
<TextField fx:id="descriptionVariable" promptText="(optional)" GridPane.columnIndex="1" GridPane.rowIndex="2" />
<HBox alignment="BOTTOM_RIGHT" prefHeight="100.0" prefWidth="200.0" spacing="10.0" GridPane.columnIndex="1" GridPane.columnSpan="2" GridPane.rowIndex="4">
<children>
- <Button fx:id="cancelBtn" mnemonicParsing="false" onAction="#pressCancelBtn" prefHeight="25.0" prefWidth="60.0" text="Cancel">
+ <Button id="on-white" fx:id="cancelBtn" mnemonicParsing="false" onAction="#pressCancelBtn" prefHeight="25.0" prefWidth="78.0" styleClass="button-style" stylesheets="@../style.css" text="Cancel">
<font>
<Font name="Lucida Console" size="12.0" />
</font>
</Button>
- <Button fx:id="okBtn" mnemonicParsing="false" onAction="#pressOkBtn" prefHeight="25.0" prefWidth="60.0" text="OK">
+ <Button id="on-white" fx:id="okBtn" mnemonicParsing="false" onAction="#pressOkBtn" prefHeight="25.0" prefWidth="60.0" styleClass="button-style" stylesheets="@../style.css" text="OK">
<font>
<Font name="Lucida Console" size="12.0" />
</font>
diff --git a/src/main/resources/view/AddExpense.fxml b/src/main/resources/view/AddExpense.fxml
index b7ee352dc3e637d53c6d1f0c07623caf3c266d67..6c053d667c544a5cff754eab254e6ca210732510 100644
--- a/src/main/resources/view/AddExpense.fxml
+++ b/src/main/resources/view/AddExpense.fxml
@@ -1,20 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<?import javafx.geometry.Insets?>
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.ComboBox?>
-<?import javafx.scene.control.DatePicker?>
-<?import javafx.scene.control.DialogPane?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.control.TextField?>
-<?import javafx.scene.layout.ColumnConstraints?>
-<?import javafx.scene.layout.GridPane?>
-<?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.RowConstraints?>
-<?import javafx.scene.text.Font?>
-<?import javafx.scene.text.Text?>
+<?import javafx.geometry.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.text.*?>
-<DialogPane expanded="true" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="no.ntnu.idatt1002.demo.controller.AddExpenseController">
+<DialogPane expanded="true" xmlns="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="no.ntnu.idatt1002.demo.controller.AddExpenseController">
<content>
<GridPane>
<columnConstraints>
@@ -59,11 +50,11 @@
<ComboBox fx:id="recurringBox" prefWidth="150.0" promptText="No" GridPane.columnIndex="1" GridPane.rowIndex="4" />
<HBox alignment="BOTTOM_RIGHT" prefHeight="100.0" prefWidth="200.0" spacing="10.0" GridPane.columnIndex="1" GridPane.columnSpan="2" GridPane.rowIndex="7">
<children>
- <Button fx:id="cancelBtn" mnemonicParsing="false" onAction="#pressCancelBtn" prefHeight="25.0" prefWidth="60.0" text="Cancel">
+ <Button id="on-white" fx:id="cancelBtn" mnemonicParsing="false" onAction="#pressCancelBtn" prefHeight="30.0" prefWidth="82.0" styleClass="button-style" stylesheets="@../style.css" text="Cancel">
<font>
<Font name="Lucida Console" size="12.0" />
</font></Button>
- <Button fx:id="okBtn" mnemonicParsing="false" onAction="#pressOkBtn" prefHeight="25.0" prefWidth="60.0" text="OK">
+ <Button id="on-white" fx:id="okBtn" mnemonicParsing="false" onAction="#pressOkBtn" prefHeight="25.0" prefWidth="60.0" styleClass="button-style" stylesheets="@../style.css" text="OK">
<font>
<Font name="Lucida Console" size="12.0" />
</font></Button>
diff --git a/src/main/resources/view/AddIncome.fxml b/src/main/resources/view/AddIncome.fxml
index f25c1bef9cc0c2881fd87787875a1e10817adaa2..a2be940e3d2e6de3c242d9e56d743d5e9739df70 100644
--- a/src/main/resources/view/AddIncome.fxml
+++ b/src/main/resources/view/AddIncome.fxml
@@ -1,20 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<?import javafx.geometry.Insets?>
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.ComboBox?>
-<?import javafx.scene.control.DatePicker?>
-<?import javafx.scene.control.DialogPane?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.control.TextField?>
-<?import javafx.scene.layout.ColumnConstraints?>
-<?import javafx.scene.layout.GridPane?>
-<?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.RowConstraints?>
-<?import javafx.scene.text.Font?>
-<?import javafx.scene.text.Text?>
+<?import javafx.geometry.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.text.*?>
-<DialogPane expanded="true" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="no.ntnu.idatt1002.demo.controller.AddIncomeController">
+<DialogPane expanded="true" prefWidth="322.0" xmlns="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="no.ntnu.idatt1002.demo.controller.AddIncomeController">
<content>
<GridPane>
<columnConstraints>
@@ -64,12 +55,12 @@
<ComboBox fx:id="recurringBox" prefWidth="150.0" promptText="No" GridPane.columnIndex="1" GridPane.rowIndex="4" />
<HBox alignment="BOTTOM_RIGHT" prefHeight="100.0" prefWidth="200.0" spacing="10.0" GridPane.columnIndex="1" GridPane.columnSpan="2" GridPane.rowIndex="7">
<children>
- <Button fx:id="cancelBtn" mnemonicParsing="false" onAction="#pressCancelBtn" prefHeight="25.0" prefWidth="60.0" text="Cancel">
+ <Button id="on-white" fx:id="cancelBtn" mnemonicParsing="false" onAction="#pressCancelBtn" prefHeight="30.0" prefWidth="82.0" styleClass="button-style" stylesheets="@../style.css" text="Cancel">
<font>
<Font name="Lucida Console" size="12.0" />
</font>
</Button>
- <Button fx:id="okBtn" mnemonicParsing="false" onAction="#pressOkBtn" prefHeight="25.0" prefWidth="60.0" text="OK">
+ <Button id="on-white" fx:id="okBtn" mnemonicParsing="false" onAction="#pressOkBtn" prefHeight="25.0" prefWidth="60.0" styleClass="button-style" stylesheets="@../style.css" text="OK">
<font>
<Font name="Lucida Console" size="12.0" />
</font>
diff --git a/src/main/resources/view/AddIngredient.fxml b/src/main/resources/view/AddIngredient.fxml
index 675a26f9f2ccf35729df39cc2eb5f6b5b2211efe..3384b11dd2e656b33c21031ce603264f17525783 100644
--- a/src/main/resources/view/AddIngredient.fxml
+++ b/src/main/resources/view/AddIngredient.fxml
@@ -5,7 +5,7 @@
<?import javafx.scene.layout.*?>
<?import javafx.scene.text.*?>
-<DialogPane id="dialog-pane" expanded="true" prefHeight="524.0" prefWidth="614.0" stylesheets="@../style.css" xmlns="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="no.ntnu.idatt1002.demo.controller.AddIngredientController">
+<DialogPane id="dialog-pane" expanded="true" prefHeight="555.0" prefWidth="614.0" stylesheets="@../style.css" xmlns="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="no.ntnu.idatt1002.demo.controller.AddIngredientController">
<content>
<AnchorPane prefHeight="400.0" prefWidth="600.0">
<padding>
@@ -56,9 +56,9 @@
</Pane>
<Pane prefHeight="100.0" prefWidth="614.0">
<children>
- <Label fx:id="status" layoutX="28.0" layoutY="6.0" prefHeight="44.0" prefWidth="558.0" textAlignment="CENTER" wrapText="true">
+ <Label fx:id="status" layoutX="28.0" layoutY="-4.0" prefHeight="44.0" prefWidth="558.0" textAlignment="CENTER" wrapText="true">
<font>
- <Font size="14.0" />
+ <Font size="20.0" />
</font></Label>
</children>
</Pane>
@@ -66,17 +66,30 @@
</VBox>
</children></AnchorPane>
</content>
- <header>
- <Label fx:id="addIngredientPane" alignment="CENTER" contentDisplay="CENTER" text="Add an ingredient to the fridge">
- <font>
- <Font size="24.0" />
- </font>
- <padding>
- <Insets bottom="25.0" top="20.0" />
- </padding>
- </Label>
- </header>
<buttonTypes>
<ButtonType fx:constant="CLOSE" />
</buttonTypes>
+ <header>
+ <HBox prefHeight="100.0" prefWidth="200.0">
+ <children>
+ <Pane prefHeight="100.0" prefWidth="543.0">
+ <children>
+ <Label layoutX="19.0" layoutY="30.0" prefWidth="516.0" styleClass="head-line" stylesheets="@../style.css" text="Add ingredients to Fridge">
+ <font>
+ <Font size="30.0" />
+ </font>
+ </Label>
+ </children>
+ </Pane>
+ <Pane prefHeight="100.0" prefWidth="102.0">
+ <children>
+ <Button id="help" fx:id="helpBtn" layoutX="9.0" layoutY="14.0" mnemonicParsing="false" onAction="#help" styleClass="button-style" stylesheets="@../style.css" text="?">
+ <font>
+ <Font name="System Bold" size="36.0" />
+ </font></Button>
+ </children>
+ </Pane>
+ </children>
+ </HBox>
+ </header>
</DialogPane>
diff --git a/src/main/resources/view/AllRecipes.fxml b/src/main/resources/view/AllRecipes.fxml
index b58fa895c0942d96f5b2bac6b055fc551245034f..ddb3a64f09c00ab880255cce693a89764a72069b 100644
--- a/src/main/resources/view/AllRecipes.fxml
+++ b/src/main/resources/view/AllRecipes.fxml
@@ -7,7 +7,7 @@
<AnchorPane prefHeight="695.0" prefWidth="1130.0" xmlns="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="no.ntnu.idatt1002.demo.controller.AllRecipesController">
<children>
- <ImageView fitHeight="695.0" fitWidth="1130.0" pickOnBounds="true" preserveRatio="true">
+ <ImageView fitHeight="695.0" fitWidth="1130.0" pickOnBounds="true">
<image>
<Image url="@../Images/backgroundMini.jpg" />
</image>
@@ -23,7 +23,7 @@
</Pane>
<Pane prefHeight="100.0" prefWidth="623.0">
<children>
- <Label layoutX="115.0" layoutY="24.0" text="All recipes">
+ <Label layoutX="115.0" layoutY="24.0" styleClass="head-line" stylesheets="@../style.css" text="All recipes">
<font>
<Font size="48.0" />
</font>
diff --git a/src/main/resources/view/BudgetBar.fxml b/src/main/resources/view/BudgetBar.fxml
index 5f7c1eb75318eda737873e9acfb937ef2791302e..c69b4cf6fd3541d5f01de33beefb7c38ac797c10 100644
--- a/src/main/resources/view/BudgetBar.fxml
+++ b/src/main/resources/view/BudgetBar.fxml
@@ -9,7 +9,7 @@
<children>
<Pane prefHeight="87.0" prefWidth="167.0">
<children>
- <Label fx:id="nameTag" alignment="CENTER" contentDisplay="CENTER" prefHeight="87.0" prefWidth="167.0" text="BudgetName" textAlignment="CENTER" wrapText="true">
+ <Label fx:id="nameTag" alignment="CENTER" contentDisplay="CENTER" prefHeight="87.0" prefWidth="167.0" styleClass="font" stylesheets="@../style.css" text="BudgetName" textAlignment="CENTER" wrapText="true">
<font>
<Font size="20.0" />
</font>
@@ -21,7 +21,7 @@
</children></Pane>
<Pane prefHeight="200.0" prefWidth="200.0">
<children>
- <Label fx:id="leftoverTag" layoutY="-1.0" prefHeight="87.0" prefWidth="200.0" text="LeftOver" textAlignment="CENTER" wrapText="true">
+ <Label fx:id="leftoverTag" layoutY="-1.0" prefHeight="87.0" prefWidth="200.0" styleClass="font" stylesheets="@../style.css" text="LeftOver" textAlignment="CENTER" wrapText="true">
<font>
<Font size="20.0" />
</font>
diff --git a/src/main/resources/view/BudgetNewest.fxml b/src/main/resources/view/BudgetNewest.fxml
index 3f679d03dd86c097a26781265092206a4ebebd97..a5f38f9e4c2e41c71da6bbeeee8ff088f5665bb8 100644
--- a/src/main/resources/view/BudgetNewest.fxml
+++ b/src/main/resources/view/BudgetNewest.fxml
@@ -1,29 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
-<?import javafx.geometry.Insets?>
-<?import javafx.scene.Cursor?>
-<?import javafx.scene.chart.PieChart?>
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.ComboBox?>
-<?import javafx.scene.control.ContextMenu?>
-<?import javafx.scene.control.DatePicker?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.control.MenuItem?>
-<?import javafx.scene.control.TableColumn?>
-<?import javafx.scene.control.TableView?>
-<?import javafx.scene.image.Image?>
-<?import javafx.scene.image.ImageView?>
-<?import javafx.scene.layout.AnchorPane?>
-<?import javafx.scene.layout.BorderPane?>
-<?import javafx.scene.layout.ColumnConstraints?>
-<?import javafx.scene.layout.GridPane?>
-<?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.Pane?>
-<?import javafx.scene.layout.RowConstraints?>
-<?import javafx.scene.layout.VBox?>
-<?import javafx.scene.text.Font?>
+<?import javafx.geometry.*?>
+<?import javafx.scene.*?>
+<?import javafx.scene.chart.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.image.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.text.*?>
-<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="695.0" prefWidth="1130.0" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="no.ntnu.idatt1002.demo.controller.BudgetController">
+<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="695.0" prefWidth="1130.0" xmlns="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="no.ntnu.idatt1002.demo.controller.BudgetController">
<children>
<ImageView fitHeight="695.0" fitWidth="1130.0" pickOnBounds="true">
<image>
@@ -39,7 +24,7 @@
<right>
<Pane BorderPane.alignment="CENTER">
<children>
- <Label fx:id="daysLeftLbl" layoutX="27.0" layoutY="83.0" text="Days left: 31">
+ <Label fx:id="daysLeftLbl" layoutX="27.0" layoutY="83.0" styleClass="font" stylesheets="@../style.css" text="Days left: 31">
<font>
<Font name="Lucida Console" size="14.0" />
</font>
@@ -51,7 +36,7 @@
<left>
<Pane prefWidth="175.0" BorderPane.alignment="CENTER">
<children>
- <Button fx:id="returnToMainMenuBtn" alignment="CENTER" layoutX="-2.0" layoutY="58.0" mnemonicParsing="false" onAction="#switchScene" text="Return to Main Menu">
+ <Button fx:id="returnToMainMenuBtn" alignment="CENTER" layoutX="-2.0" layoutY="58.0" mnemonicParsing="false" onAction="#switchScene" styleClass="button-style" stylesheets="@../style.css" text="Return to Main Menu">
<font>
<Font name="Lucida Console" size="14.0" />
</font>
@@ -60,7 +45,7 @@
</Pane>
</left>
<center>
- <Label fx:id="title" text="BUDGET" textAlignment="CENTER" BorderPane.alignment="CENTER">
+ <Label fx:id="title" styleClass="head-line" stylesheets="@../style.css" text="BUDGET" textAlignment="CENTER" BorderPane.alignment="CENTER">
<font>
<Font name="Lucida Console" size="48.0" />
</font>
@@ -74,7 +59,7 @@
<left>
<HBox prefHeight="64.0" prefWidth="326.0" spacing="10.0" BorderPane.alignment="CENTER">
<children>
- <Button fx:id="addBtn" mnemonicParsing="false" onAction="#handleAddBtn" prefHeight="25.0" prefWidth="60.0" text="Add">
+ <Button id="small-button" fx:id="addBtn" mnemonicParsing="false" onAction="#handleAddBtn" prefHeight="38.0" prefWidth="75.0" styleClass="button-style" stylesheets="@../style.css" text="Add">
<font>
<Font name="Lucida Console" size="14.0" />
</font>
@@ -86,7 +71,7 @@
</ImageView>
</graphic>
</Button>
- <Button fx:id="editBtn" mnemonicParsing="false" onAction="#handleEditBtn" prefHeight="39.0" prefWidth="91.0" text="Edit">
+ <Button id="small-button" fx:id="editBtn" mnemonicParsing="false" onAction="#handleEditBtn" prefHeight="39.0" prefWidth="91.0" styleClass="button-style" stylesheets="@../style.css" text="Edit">
<font>
<Font name="Lucida Console" size="14.0" />
</font>
@@ -98,7 +83,7 @@
</ImageView>
</graphic>
</Button>
- <Button fx:id="deleteBtn" mnemonicParsing="false" onAction="#handleDeleteBtn" prefHeight="39.0" prefWidth="119.0" text="Delete">
+ <Button id="small-button" fx:id="deleteBtn" mnemonicParsing="false" onAction="#handleDeleteBtn" prefHeight="39.0" prefWidth="119.0" styleClass="button-style" stylesheets="@../style.css" text="Delete">
<font>
<Font name="Lucida Console" size="14.0" />
</font>
@@ -150,7 +135,7 @@
<children>
<Pane>
<children>
- <Label alignment="CENTER" layoutX="135.0" text="Max amount: 1000">
+ <Label alignment="CENTER" layoutX="135.0" styleClass="font" stylesheets="@../style.css" text="Max amount: 1000">
<font>
<Font name="Lucida Console" size="24.0" />
</font>
@@ -179,8 +164,8 @@
</TableView>
<HBox alignment="TOP_RIGHT">
<children>
- <Button fx:id="backBtn" mnemonicParsing="false" text="back" />
- <Button fx:id="continueBtn" mnemonicParsing="false" text="continue" />
+ <Button fx:id="backBtn" mnemonicParsing="false" styleClass="button-style" stylesheets="@../style.css" text="back" />
+ <Button fx:id="continueBtn" mnemonicParsing="false" styleClass="button-style" stylesheets="@../style.css" text="continue" />
</children>
</HBox>
</children>
@@ -190,7 +175,7 @@
</VBox>
<Pane GridPane.columnIndex="1">
<children>
- <PieChart fx:id="budgetPieChart" layoutX="105.0" layoutY="33.0" legendSide="RIGHT" maxHeight="444.0" maxWidth="512.0" prefHeight="302.0" prefWidth="354.0" />
+ <PieChart fx:id="budgetPieChart" labelsVisible="false" layoutX="105.0" layoutY="33.0" legendSide="RIGHT" maxHeight="444.0" maxWidth="512.0" prefHeight="302.0" prefWidth="354.0" />
</children>
</Pane>
</children>
diff --git a/src/main/resources/view/CreateBudget.fxml b/src/main/resources/view/CreateBudget.fxml
index 6d9dafaa20e5693e3e1c471c8b69d3f9f6ace3b1..3e21880b9f0c2e1bf7a038041c1ea40cc68046a9 100644
--- a/src/main/resources/view/CreateBudget.fxml
+++ b/src/main/resources/view/CreateBudget.fxml
@@ -1,20 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<?import javafx.geometry.Insets?>
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.DialogPane?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.control.TextField?>
-<?import javafx.scene.layout.ColumnConstraints?>
-<?import javafx.scene.layout.GridPane?>
-<?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.Pane?>
-<?import javafx.scene.layout.RowConstraints?>
-<?import javafx.scene.layout.VBox?>
-<?import javafx.scene.text.Font?>
-<?import javafx.scene.text.Text?>
+<?import javafx.geometry.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.text.*?>
-<DialogPane prefHeight="113.0" prefWidth="327.0" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="no.ntnu.idatt1002.demo.controller.CreateBudgetController">
+<DialogPane prefHeight="113.0" prefWidth="327.0" xmlns="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="no.ntnu.idatt1002.demo.controller.CreateBudgetController">
<content>
<VBox>
<children>
@@ -36,8 +27,8 @@
<Label fx:id="errorMsg" alignment="CENTER_RIGHT" opacity="0.0" prefHeight="315.0" prefWidth="315.0" text="Please fill in the name field" textAlignment="CENTER" textFill="RED" />
<HBox alignment="CENTER_RIGHT" prefHeight="100.0" prefWidth="200.0" spacing="5.0">
<children>
- <Button fx:id="cancelBtn" mnemonicParsing="false" onAction="#pressCancelBtn" prefWidth="70.0" text="Cancel" />
- <Button fx:id="okBtn" mnemonicParsing="false" onAction="#pressOkBtn" prefWidth="70.0" text="OK" />
+ <Button id="on-white" fx:id="cancelBtn" mnemonicParsing="false" onAction="#pressCancelBtn" prefHeight="30.0" prefWidth="83.0" styleClass="button-style" stylesheets="@../style.css" text="Cancel" />
+ <Button id="on-white" fx:id="okBtn" mnemonicParsing="false" onAction="#pressOkBtn" prefWidth="70.0" styleClass="button-style" stylesheets="@../style.css" text="OK" />
</children>
<VBox.margin>
<Insets top="10.0" />
diff --git a/src/main/resources/view/FirstMenu.fxml b/src/main/resources/view/FirstMenu.fxml
index 94b6c19c15ed3da752c79b8ddb61f628b8edd7f5..a12ffabc4ed0395e88bed132e77ca6d6e749a11f 100644
--- a/src/main/resources/view/FirstMenu.fxml
+++ b/src/main/resources/view/FirstMenu.fxml
@@ -1,13 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.image.Image?>
-<?import javafx.scene.image.ImageView?>
-<?import javafx.scene.layout.AnchorPane?>
-<?import javafx.scene.text.Font?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.image.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.text.*?>
-<AnchorPane maxHeight="600" maxWidth="607.0" minHeight="406.0" minWidth="600" prefHeight="406.0" prefWidth="607.0" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="no.ntnu.idatt1002.demo.controller.SceneController">
+<AnchorPane maxHeight="600" maxWidth="607.0" minHeight="406.0" minWidth="600" prefHeight="406.0" prefWidth="607.0" xmlns="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="no.ntnu.idatt1002.demo.controller.SceneController">
<ImageView fitHeight="412.0" fitWidth="614.0" layoutX="-7.0" layoutY="-6.0" pickOnBounds="true" smooth="false">
<Image url="@../Images/backgroundMini.jpg" />
</ImageView>
@@ -21,12 +19,12 @@
<Font name="Verdana" size="18.0" />
</font>
</Label>
- <Button layoutX="69.0" layoutY="212.0" mnemonicParsing="false" onAction="#switchIncome" text="New Budget">
+ <Button layoutX="69.0" layoutY="212.0" mnemonicParsing="false" onAction="#switchIncome" styleClass="welcome-button" stylesheets="@../style.css" text="New Budget">
<font>
<Font size="24.0" />
</font>
</Button>
- <Button layoutX="380.0" layoutY="212.0" mnemonicParsing="false" onAction="#switchMainMenu" text="Old Budget">
+ <Button layoutX="380.0" layoutY="212.0" mnemonicParsing="false" onAction="#switchMainMenu" styleClass="welcome-button" stylesheets="@../style.css" text="Old Budget">
<font>
<Font size="24.0" />
</font>
diff --git a/src/main/resources/view/IncomeAndExpenses.fxml b/src/main/resources/view/IncomeAndExpenses.fxml
index c69b39775cb263add4bf62c2571d77f016ddbae1..c33f765e71ec1bb59b3b3baeaaa7af210819cb1a 100644
--- a/src/main/resources/view/IncomeAndExpenses.fxml
+++ b/src/main/resources/view/IncomeAndExpenses.fxml
@@ -1,31 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
-<?import javafx.geometry.Insets?>
-<?import javafx.scene.Cursor?>
-<?import javafx.scene.chart.PieChart?>
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.ComboBox?>
-<?import javafx.scene.control.ContextMenu?>
-<?import javafx.scene.control.DatePicker?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.control.MenuButton?>
-<?import javafx.scene.control.MenuItem?>
-<?import javafx.scene.control.TableColumn?>
-<?import javafx.scene.control.TableView?>
-<?import javafx.scene.image.Image?>
-<?import javafx.scene.image.ImageView?>
-<?import javafx.scene.layout.AnchorPane?>
-<?import javafx.scene.layout.BorderPane?>
-<?import javafx.scene.layout.ColumnConstraints?>
-<?import javafx.scene.layout.GridPane?>
-<?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.Pane?>
-<?import javafx.scene.layout.RowConstraints?>
-<?import javafx.scene.layout.VBox?>
-<?import javafx.scene.text.Font?>
-<?import javafx.scene.text.Text?>
+<?import javafx.geometry.*?>
+<?import javafx.scene.*?>
+<?import javafx.scene.chart.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.image.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.text.*?>
-<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="695.0" prefWidth="1130.0" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="no.ntnu.idatt1002.demo.controller.IncomeExpenseController">
+<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="695.0" prefWidth="1130.0" xmlns="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="no.ntnu.idatt1002.demo.controller.IncomeExpenseController">
<children>
<ImageView fitHeight="695.0" fitWidth="1130.0" pickOnBounds="true">
<image>
@@ -41,7 +24,7 @@
<right>
<Pane BorderPane.alignment="CENTER">
<children>
- <Label fx:id="daysLeftLbl" layoutX="27.0" layoutY="83.0" text="Days left: 31">
+ <Label fx:id="daysLeftLbl" layoutX="27.0" layoutY="83.0" styleClass="font" stylesheets="@../style.css" text="Days left: 31">
<font>
<Font name="Lucida Console" size="14.0" />
</font>
@@ -53,7 +36,7 @@
<left>
<Pane prefWidth="175.0" BorderPane.alignment="CENTER">
<children>
- <Button fx:id="returnToMainMenuBtn" alignment="CENTER" layoutX="-2.0" layoutY="58.0" mnemonicParsing="false" onAction="#switchScene" text="Return to Main Menu">
+ <Button fx:id="returnToMainMenuBtn" alignment="CENTER" layoutX="-2.0" layoutY="58.0" mnemonicParsing="false" onAction="#switchScene" styleClass="button-style" stylesheets="@../style.css" text="Return to Main Menu">
<font>
<Font name="Lucida Console" size="14.0" />
</font>
@@ -65,7 +48,7 @@
<center>
<Pane BorderPane.alignment="CENTER">
<children>
- <Label fx:id="title" layoutX="100.0" layoutY="47.0" text="INCOME AND EXPENSES" textAlignment="CENTER">
+ <Label fx:id="title" layoutX="100.0" layoutY="47.0" styleClass="head-line" stylesheets="@../style.css" text="INCOME AND EXPENSES" textAlignment="CENTER">
<font>
<Font name="Lucida Console" size="48.0" />
</font>
@@ -82,7 +65,7 @@
<left>
<HBox alignment="CENTER_LEFT" prefHeight="64.0" prefWidth="261.0" spacing="10.0" BorderPane.alignment="CENTER">
<children>
- <MenuButton mnemonicParsing="false" prefHeight="38.0" prefWidth="101.0" text="ADD">
+ <MenuButton mnemonicParsing="false" prefHeight="40.0" prefWidth="114.0" styleClass="button-style" stylesheets="@../style.css" text="ADD">
<items>
<MenuItem fx:id="addIncome" mnemonicParsing="false" onAction="#handleAddBtn" text="Income" />
<MenuItem fx:id="addExpense" mnemonicParsing="false" onAction="#handleAddBtn" text="Expense" />
@@ -98,7 +81,7 @@
<Font name="Lucida Console" size="14.0" />
</font>
</MenuButton>
- <Button mnemonicParsing="false" />
+ <Button mnemonicParsing="false" styleClass="button-style" stylesheets="@../style.css" />
</children>
<BorderPane.margin>
<Insets left="30.0" />
@@ -112,7 +95,7 @@
<Insets />
</opaqueInsets>
<VBox.margin>
- <Insets left="10.0" right="15.0" />
+ <Insets left="50.0" right="15.0" />
</VBox.margin>
<center>
<Pane BorderPane.alignment="CENTER">
@@ -126,10 +109,10 @@
</Pane>
</center>
</BorderPane>
- <GridPane prefHeight="473.0" prefWidth="1055.0">
+ <GridPane prefHeight="473.0" prefWidth="1029.0">
<columnConstraints>
- <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
- <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+ <ColumnConstraints hgrow="SOMETIMES" maxWidth="563.0" minWidth="10.0" prefWidth="550.0" />
+ <ColumnConstraints hgrow="SOMETIMES" maxWidth="495.0" minWidth="10.0" prefWidth="455.0" />
</columnConstraints>
<rowConstraints>
<RowConstraints minHeight="10.0" percentHeight="5.0" prefHeight="30.0" vgrow="SOMETIMES" />
@@ -164,12 +147,12 @@
</VBox>
<Pane GridPane.columnIndex="1" GridPane.rowIndex="1">
<children>
- <PieChart fx:id="incomePieChart" layoutX="4.0" layoutY="-41.0" legendSide="RIGHT" maxHeight="244.0" maxWidth="512.0" prefHeight="244.0" prefWidth="350.0" title="Income" />
+ <PieChart fx:id="incomePieChart" labelsVisible="false" layoutX="4.0" layoutY="-41.0" legendSide="RIGHT" maxHeight="244.0" maxWidth="512.0" prefHeight="244.0" prefWidth="350.0" title="Income" />
</children>
</Pane>
<Pane GridPane.columnIndex="1" GridPane.rowIndex="3">
<children>
- <PieChart fx:id="expensePieChart" layoutX="-2.0" layoutY="-37.0" legendSide="RIGHT" maxHeight="261.0" maxWidth="519.0" prefHeight="237.0" prefWidth="350.0" title="Expenses" />
+ <PieChart fx:id="expensePieChart" labelsVisible="false" layoutX="-2.0" layoutY="-37.0" legendSide="RIGHT" maxHeight="261.0" maxWidth="519.0" prefHeight="237.0" prefWidth="350.0" title="Expenses" />
</children>
</Pane>
<Pane prefHeight="20.0" prefWidth="1046.0">
@@ -229,7 +212,7 @@
<Insets left="10.0" />
</padding>
<VBox.margin>
- <Insets left="30.0" right="30.0" />
+ <Insets left="60.0" right="50.0" />
</VBox.margin>
</GridPane>
</children>
diff --git a/src/main/resources/view/IngredientTile.fxml b/src/main/resources/view/IngredientTile.fxml
index 0d01e38bd7c1b21dc39222e4dfdbc352c20880f7..ebd54256560298c635bf4f3d25feeb91445252aa 100644
--- a/src/main/resources/view/IngredientTile.fxml
+++ b/src/main/resources/view/IngredientTile.fxml
@@ -5,14 +5,14 @@
<?import javafx.scene.layout.*?>
<?import javafx.scene.text.*?>
-<Pane fx:id="ingredientPane" styleClass="ingredient" stylesheets="@../style.css" xmlns="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="no.ntnu.idatt1002.demo.controller.IngredientTileController">
+<Pane id="ingredient" fx:id="ingredientPane" mouseTransparent="true" stylesheets="@../style.css" xmlns="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="no.ntnu.idatt1002.demo.controller.IngredientTileController">
<children>
- <Label fx:id="text" prefHeight="40.0" prefWidth="250.0" text="Ingredient">
+ <Label id="ingredient-label" fx:id="text" styleClass="font" stylesheets="@../style.css" text="Ingredient">
<font>
- <Font name="System Italic" size="14.0" />
+ <Font name="Ani" size="18.0" />
</font>
<padding>
- <Insets left="15.0" />
+ <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
</padding>
</Label>
</children>
diff --git a/src/main/resources/view/MainMenuNew.fxml b/src/main/resources/view/MainMenuNew.fxml
index 0eb5ac06011c8d77f742b04543680c78d956977c..00e1dbb01242affb6c59f4e695aa490fd75d4fa6 100644
--- a/src/main/resources/view/MainMenuNew.fxml
+++ b/src/main/resources/view/MainMenuNew.fxml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
+<?import java.lang.*?>
<?import javafx.geometry.*?>
<?import javafx.scene.control.*?>
<?import javafx.scene.image.*?>
@@ -19,7 +20,7 @@
<left>
<Pane prefWidth="175.0" BorderPane.alignment="CENTER">
<children>
- <Button fx:id="returnBtn" alignment="CENTER" layoutX="-2.0" layoutY="58.0" mnemonicParsing="false" onAction="#switchScene" text="Return to start">
+ <Button fx:id="returnBtn" alignment="CENTER" layoutX="-2.0" layoutY="58.0" mnemonicParsing="false" onAction="#switchScene" styleClass="button-style" stylesheets="@../style.css" text="Return to start">
<font>
<Font name="Lucida Console" size="14.0" />
</font>
@@ -28,7 +29,7 @@
</Pane>
</left>
<center>
- <Label fx:id="title" text="BUDGET JANUARY" textAlignment="CENTER" BorderPane.alignment="CENTER">
+ <Label fx:id="title" styleClass="head-line" stylesheets="@../style.css" text="BUDGET JANUARY" textAlignment="CENTER" BorderPane.alignment="CENTER">
<font>
<Font name="Lucida Console" size="48.0" />
</font>
@@ -37,7 +38,7 @@
<right>
<Pane BorderPane.alignment="CENTER">
<children>
- <Label fx:id="daysLeftLbl" layoutX="27.0" layoutY="83.0" text="Days left: 31">
+ <Label fx:id="daysLeftLbl" layoutX="27.0" layoutY="83.0" styleClass="font" stylesheets="@../style.css" text="Days left: 31">
<font>
<Font name="Lucida Console" size="14.0" />
</font>
@@ -50,7 +51,7 @@
<Insets left="15.0" right="15.0" />
</VBox.margin>
<bottom>
- <Label fx:id="balanceLbl" text="Balance: xxx" BorderPane.alignment="CENTER">
+ <Label fx:id="balanceLbl" styleClass="font" stylesheets="@../style.css" text="Balance: xxx" BorderPane.alignment="CENTER">
<font>
<Font name="Lucida Console" size="24.0" />
</font>
@@ -66,7 +67,7 @@
<Insets top="5.0" />
</StackPane.margin>
</ProgressBar>
- <Label fx:id="usageLbl" prefHeight="49.0" prefWidth="287.0" text="You have used xxx out of xxx this month">
+ <Label fx:id="usageLbl" prefHeight="49.0" prefWidth="287.0" styleClass="font" stylesheets="@../style.css" text="You have used xxx out of xxx this month">
<font>
<Font name="Lucida Console" size="14.0" />
</font>
@@ -96,7 +97,7 @@
</BorderPane>
<TilePane alignment="CENTER" hgap="50.0" prefHeight="127.0" prefWidth="1130.0">
<children>
- <Button fx:id="foodBtn" alignment="TOP_CENTER" contentDisplay="TOP" mnemonicParsing="false" onAction="#switchScene" prefHeight="100.0" prefWidth="150.0" text="Food">
+ <Button fx:id="foodBtn" alignment="TOP_CENTER" contentDisplay="TOP" mnemonicParsing="false" onAction="#switchScene" prefHeight="100.0" prefWidth="175.0" stylesheets="@../style.css" text="Food">
<graphic>
<ImageView fitHeight="75.0" fitWidth="75.0" pickOnBounds="true" preserveRatio="true">
<image>
@@ -107,8 +108,12 @@
<font>
<Font name="Lucida Console" size="14.0" />
</font>
+ <styleClass>
+ <String fx:value="square-button-style" />
+ <String fx:value="font" />
+ </styleClass>
</Button>
- <Button fx:id="incomeBtn" alignment="TOP_CENTER" contentDisplay="TOP" mnemonicParsing="false" onAction="#switchScene" prefHeight="100.0" prefWidth="150.0" text="Income/expenses">
+ <Button fx:id="incomeBtn" alignment="TOP_CENTER" contentDisplay="TOP" mnemonicParsing="false" onAction="#switchScene" prefHeight="100.0" prefWidth="175.0" stylesheets="@../style.css" text="Income/expenses">
<graphic>
<ImageView fitHeight="75.0" fitWidth="75.0" pickOnBounds="true" preserveRatio="true">
<image>
@@ -119,8 +124,12 @@
<font>
<Font name="Lucida Console" size="14.0" />
</font>
+ <styleClass>
+ <String fx:value="square-button-style" />
+ <String fx:value="font" />
+ </styleClass>
</Button>
- <Button fx:id="budgetBtn" contentDisplay="TOP" mnemonicParsing="false" onAction="#switchScene" prefHeight="100.0" prefWidth="150.0" text="View budget">
+ <Button fx:id="budgetBtn" contentDisplay="TOP" mnemonicParsing="false" onAction="#switchScene" prefHeight="100.0" prefWidth="175.0" stylesheets="@../style.css" text="View budget">
<graphic>
<ImageView fitHeight="75.0" fitWidth="75.0" pickOnBounds="true" preserveRatio="true">
<image>
@@ -131,6 +140,10 @@
<font>
<Font name="Lucida Console" size="14.0" />
</font>
+ <styleClass>
+ <String fx:value="square-button-style" />
+ <String fx:value="font" />
+ </styleClass>
</Button>
</children>
</TilePane>
diff --git a/src/main/resources/view/Recipe.fxml b/src/main/resources/view/Recipe.fxml
index eb603d60c9b5a8ef8f7a0a1560ddc5b56beb95b3..2ca258bef7b6ce44addbe8fa6c18894171098699 100644
--- a/src/main/resources/view/Recipe.fxml
+++ b/src/main/resources/view/Recipe.fxml
@@ -6,12 +6,15 @@
<?import javafx.scene.layout.*?>
<?import javafx.scene.text.*?>
-<AnchorPane prefHeight="695.0" prefWidth="1130.0" xmlns="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="no.ntnu.idatt1002.demo.controller.RecipeController">
+<AnchorPane xmlns="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="no.ntnu.idatt1002.demo.controller.RecipeController">
<children>
- <ImageView fitHeight="695.0" fitWidth="1130.0" pickOnBounds="true" preserveRatio="true">
+ <ImageView fitHeight="695.0" fitWidth="1130.0" pickOnBounds="true">
<image>
<Image url="@../Images/backgroundMini.jpg" />
- </image></ImageView>
+ </image>
+ <rotationAxis>
+ <Point3D />
+ </rotationAxis></ImageView>
<BorderPane prefHeight="695.0" prefWidth="1130.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
<top>
<HBox prefHeight="164.0" prefWidth="1130.0" BorderPane.alignment="CENTER">
@@ -27,12 +30,15 @@
</Pane>
<Pane prefHeight="103.0" prefWidth="853.0">
<children>
- <Label fx:id="recipeName" alignment="CENTER" contentDisplay="CENTER" layoutX="44.0" layoutY="38.0" text="RecipeName" textAlignment="CENTER">
+ <Label fx:id="recipeName" alignment="CENTER" contentDisplay="CENTER" layoutY="3.0" prefHeight="156.0" prefWidth="735.0" styleClass="head-line" stylesheets="@../style.css" text="RecipeName" textAlignment="CENTER" wrapText="true">
<font>
<Font size="36.0" />
</font>
</Label>
</children>
+ <HBox.margin>
+ <Insets right="25.0" />
+ </HBox.margin>
</Pane>
</children>
</HBox>
@@ -40,9 +46,9 @@
<center>
<HBox prefHeight="100.0" prefWidth="200.0" spacing="50.0" BorderPane.alignment="CENTER">
<children>
- <ScrollPane prefHeight="431.0" prefWidth="263.0" stylesheets="@../style.css">
+ <ScrollPane prefHeight="454.0" prefWidth="311.0" stylesheets="@../style.css">
<content>
- <AnchorPane prefHeight="449.0" prefWidth="270.0" styleClass="ingredient-pane" stylesheets="@../style.css">
+ <AnchorPane styleClass="ingredient-pane" stylesheets="@../style.css">
<children>
<VBox fx:id="ingredientList" styleClass="ingredient-list" stylesheets="@../style.css">
<padding>
@@ -52,7 +58,7 @@
</AnchorPane>
</content>
</ScrollPane>
- <ScrollPane prefHeight="429.0" prefWidth="632.0" stylesheets="@../style.css">
+ <ScrollPane prefHeight="454.0" prefWidth="660.0" stylesheets="@../style.css">
<content>
<Pane id="recipe-instructions" stylesheets="@../style.css">
<children>
@@ -68,13 +74,13 @@
</HBox>
</center>
<left>
- <Pane prefHeight="457.0" prefWidth="75.0" BorderPane.alignment="CENTER" />
+ <Pane prefHeight="454.0" prefWidth="45.0" BorderPane.alignment="CENTER" />
</left>
<bottom>
- <Pane prefHeight="77.0" prefWidth="1130.0" BorderPane.alignment="CENTER" />
+ <Pane prefHeight="56.0" prefWidth="1130.0" BorderPane.alignment="CENTER" />
</bottom>
<right>
- <Pane prefHeight="454.0" prefWidth="122.0" BorderPane.alignment="CENTER" />
+ <Pane prefHeight="454.0" prefWidth="86.0" BorderPane.alignment="CENTER" />
</right></BorderPane>
</children>
</AnchorPane>
diff --git a/src/main/resources/view/RecipeTile.fxml b/src/main/resources/view/RecipeTile.fxml
index b4f2c0704ecb6174aee5efd6cdba1f2f6c951f11..9f4c03272d4fd07b457be86fc285421dee2fa45e 100644
--- a/src/main/resources/view/RecipeTile.fxml
+++ b/src/main/resources/view/RecipeTile.fxml
@@ -7,34 +7,49 @@
<VBox fx:id="recipeTile" prefHeight="220.0" prefWidth="280.0" styleClass="recipe-tile" stylesheets="@../style.css" xmlns="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="no.ntnu.idatt1002.demo.controller.RecipeTileController">
<children>
- <Pane fx:id="namePane" prefHeight="178.0" prefWidth="268.0">
+ <Pane fx:id="namePane" prefHeight="218.0" prefWidth="268.0">
<children>
- <Button fx:id="nameTag" mnemonicParsing="false" onAction="#tileClick" prefHeight="149.0" prefWidth="268.0" styleClass="tile-button" stylesheets="@../style.css" text="nameOfRecipe">
+ <Button fx:id="tileBtn" alignment="TOP_LEFT" layoutX="-6.0" mnemonicParsing="false" onAction="#tileClick" prefHeight="213.0" prefWidth="280.0" styleClass="tile-button" stylesheets="@../style.css" textAlignment="CENTER">
<font>
- <Font size="24.0" />
+ <Font name="System Bold" size="24.0" />
</font>
+ <graphic>
+ <VBox prefHeight="199.0" prefWidth="95.0">
+ <children>
+ <Pane prefHeight="132.0" prefWidth="248.0" styleClass="font" stylesheets="@../style.css">
+ <children>
+ <Label fx:id="nameTag" alignment="CENTER" contentDisplay="CENTER" prefHeight="135.0" prefWidth="250.0" text="nameOfRecipe" textAlignment="CENTER" wrapText="true">
+ <font>
+ <Font name="System Bold" size="24.0" />
+ </font>
+ </Label>
+ </children>
+ </Pane>
+ <HBox accessibleRole="BUTTON" prefHeight="66.0" prefWidth="268.0">
+ <children>
+ <Label alignment="CENTER" prefHeight="66.0" prefWidth="243.0" text="Missing ingredients:" textAlignment="CENTER" wrapText="true">
+ <font>
+ <Font size="24.0" />
+ </font>
+ <opaqueInsets>
+ <Insets left="20.0" right="20.0" />
+ </opaqueInsets>
+ </Label>
+ <Label id="noMissingIngredients" fx:id="missingTag" alignment="CENTER" contentDisplay="CENTER" prefHeight="69.0" prefWidth="127.0" text="# missing">
+ <font>
+ <Font size="24.0" />
+ </font>
+ </Label>
+ </children>
+ <opaqueInsets>
+ <Insets left="20.0" right="20.0" />
+ </opaqueInsets>
+ </HBox>
+ </children>
+ </VBox>
+ </graphic>
</Button>
</children>
</Pane>
- <HBox prefHeight="88.0" prefWidth="500.0">
- <children>
- <Label alignment="CENTER" prefHeight="63.0" prefWidth="292.0" text="Ingredients missing:">
- <font>
- <Font size="18.0" />
- </font>
- <opaqueInsets>
- <Insets left="20.0" right="20.0" />
- </opaqueInsets>
- </Label>
- <Label id="noMissingIngredients" fx:id="missingTag" alignment="CENTER" contentDisplay="CENTER" prefHeight="69.0" prefWidth="127.0" text="# missing">
- <font>
- <Font size="24.0" />
- </font>
- </Label>
- </children>
- <opaqueInsets>
- <Insets left="20.0" right="20.0" />
- </opaqueInsets>
- </HBox>
</children>
</VBox>
diff --git a/src/main/resources/view/SelectBudget.fxml b/src/main/resources/view/SelectBudget.fxml
index 4cf1f903677e6bd97d6e77a8f0ef158480239b1c..c400febf982c56cf9ab4d3eb4772f5378d5972c3 100644
--- a/src/main/resources/view/SelectBudget.fxml
+++ b/src/main/resources/view/SelectBudget.fxml
@@ -1,18 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.DialogPane?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.control.ListView?>
-<?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.VBox?>
-<?import javafx.scene.text.Font?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.text.*?>
-<DialogPane prefHeight="300.0" prefWidth="400.0" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="no.ntnu.idatt1002.demo.controller.SelectBudgetController">
+<DialogPane prefHeight="300.0" prefWidth="400.0" xmlns="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="no.ntnu.idatt1002.demo.controller.SelectBudgetController">
<content>
<VBox alignment="CENTER" prefWidth="362.0" spacing="5.0">
<children>
- <Label text="Select budget project">
+ <Label styleClass="font" stylesheets="@../style.css" text="Select budget project">
<font>
<Font name="Lucida Console" size="24.0" />
</font>
@@ -25,8 +21,8 @@
</Label>
<HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0" spacing="5.0">
<children>
- <Button mnemonicParsing="false" onAction="#exitWindow" prefWidth="70.0" text="Cancel" />
- <Button fx:id="okBtn" mnemonicParsing="false" onAction="#selectBudget" prefWidth="70.0" text="OK" />
+ <Button id="on-white" mnemonicParsing="false" onAction="#exitWindow" prefHeight="24.0" prefWidth="92.0" styleClass="button-style" stylesheets="@../style.css" text="Cancel" />
+ <Button id="on-white" fx:id="okBtn" mnemonicParsing="false" onAction="#selectBudget" prefWidth="70.0" styleClass="button-style" stylesheets="@../style.css" text="OK" />
</children>
</HBox>
<Label text="Click on an entry to select it">
diff --git a/src/main/resources/view/SuggestRecipes.fxml b/src/main/resources/view/SuggestRecipes.fxml
index 54bc207605fad038051b25ee6ca3a6c7a897039e..adb817c107e493515275b00d9009ff6953b01fa8 100644
--- a/src/main/resources/view/SuggestRecipes.fxml
+++ b/src/main/resources/view/SuggestRecipes.fxml
@@ -1,21 +1,13 @@
<?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.ListView?>
-<?import javafx.scene.image.Image?>
-<?import javafx.scene.image.ImageView?>
-<?import javafx.scene.layout.AnchorPane?>
-<?import javafx.scene.layout.BorderPane?>
-<?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?>
+<?import java.lang.*?>
+<?import javafx.geometry.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.image.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.text.*?>
-<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="695.0" prefWidth="1130.0" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="no.ntnu.idatt1002.demo.controller.SuggestRecipesController">
+<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="695.0" prefWidth="1130.0" xmlns="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="no.ntnu.idatt1002.demo.controller.SuggestRecipesController">
<children>
<ImageView fitHeight="695.0" fitWidth="1130.0" pickOnBounds="true">
<image>
@@ -28,7 +20,7 @@
<children>
<Pane prefHeight="64.0" prefWidth="421.0">
<children>
- <Label layoutX="101.0" layoutY="17.0" text="Food in the Fridge" underline="true">
+ <Label layoutX="101.0" layoutY="17.0" styleClass="font" stylesheets="@../style.css" text="Food in the Fridge" underline="true">
<font>
<Font size="24.0" />
</font>
@@ -38,7 +30,7 @@
</Label>
</children>
</Pane>
- <ListView id="list-cell" fx:id="fridgeList" prefHeight="470.0" prefWidth="378.0" stylesheets="@../style.css">
+ <ListView fx:id="fridgeList" prefHeight="470.0" prefWidth="378.0" styleClass="list-cell" stylesheets="@../style.css">
<VBox.margin>
<Insets right="20.0" />
</VBox.margin></ListView>
@@ -66,13 +58,17 @@
<children>
<Pane layoutX="72.0" prefHeight="45.0" prefWidth="891.0">
<children>
- <Label fx:id="missingList" styleClass="information-label" stylesheets="@../style.css">
+ <Label fx:id="missingList" stylesheets="@../style.css">
<font>
- <Font name="System Bold" size="14.0" />
+ <Font name="System Bold" size="20.0" />
</font>
<padding>
<Insets left="20.0" right="20.0" />
- </padding></Label>
+ </padding>
+ <styleClass>
+ <String fx:value="information-label" />
+ <String fx:value="font" />
+ </styleClass></Label>
</children>
</Pane>
</children></Pane>
@@ -91,7 +87,7 @@
</Pane>
</left>
<center>
- <Label text="Recipe Suggestions" BorderPane.alignment="CENTER">
+ <Label styleClass="head-line" stylesheets="@../style.css" text="Recipe Suggestions" BorderPane.alignment="CENTER">
<font>
<Font size="48.0" />
</font>
@@ -110,7 +106,7 @@
</BorderPane>
</top>
<center>
- <GridPane fx:id="recipeGrid" hgap="20.0" prefWidth="603.0" vgap="20.0" BorderPane.alignment="CENTER">
+ <GridPane fx:id="recipeGrid" hgap="20.0" prefHeight="443.0" prefWidth="609.0" vgap="20.0" BorderPane.alignment="CENTER">
<columnConstraints>
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
diff --git a/src/main/resources/view/dualList.fxml b/src/main/resources/view/dualList.fxml
index eaf8cb97527a5984b41dc64cac4f4c082227d544..154eb7849ccebbbfb843e11ae86d99e0fe49bf42 100644
--- a/src/main/resources/view/dualList.fxml
+++ b/src/main/resources/view/dualList.fxml
@@ -1,31 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
-<?import javafx.geometry.Insets?>
-<?import javafx.scene.Cursor?>
-<?import javafx.scene.chart.PieChart?>
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.ContextMenu?>
-<?import javafx.scene.control.DatePicker?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.control.MenuButton?>
-<?import javafx.scene.control.MenuItem?>
-<?import javafx.scene.control.TableColumn?>
-<?import javafx.scene.control.TableView?>
-<?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?>
-<?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.Region?>
-<?import javafx.scene.layout.RowConstraints?>
-<?import javafx.scene.layout.StackPane?>
-<?import javafx.scene.layout.VBox?>
-<?import javafx.scene.shape.Rectangle?>
-<?import javafx.scene.text.Font?>
-<?import javafx.scene.text.Text?>
+<?import javafx.geometry.*?>
+<?import javafx.scene.*?>
+<?import javafx.scene.chart.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.image.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.shape.*?>
+<?import javafx.scene.text.*?>
-<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="500.0" prefWidth="750.0" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="no.ntnu.idatt1002.demo.controller.IncomeExpenseController">
+<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="500.0" prefWidth="750.0" xmlns="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="no.ntnu.idatt1002.demo.controller.IncomeExpenseController">
<children>
<ImageView fitHeight="500.0" fitWidth="750.0" pickOnBounds="true">
<image>
@@ -164,7 +148,7 @@
</HBox>
<HBox alignment="CENTER_LEFT" prefWidth="410.0" spacing="5.0">
<children>
- <MenuButton mnemonicParsing="false" prefHeight="42.0" prefWidth="105.0" text="Add">
+ <MenuButton mnemonicParsing="false" prefHeight="40.0" prefWidth="122.0" styleClass="button-style" stylesheets="@../style.css" text="Add">
<items>
<MenuItem fx:id="addIncome" mnemonicParsing="false" onAction="#handleAddBtn" text="Income" />
<MenuItem fx:id="addExpense" mnemonicParsing="false" onAction="#handleAddBtn" text="Expense" />
@@ -186,7 +170,7 @@
</padding>
</HBox>
<VBox alignment="CENTER_LEFT" prefHeight="200.0" prefWidth="100.0" spacing="5.0" GridPane.columnIndex="1" />
- <Button fx:id="continueBtn" mnemonicParsing="false" onAction="#switchScene" prefWidth="150.0" text="Continue" GridPane.columnIndex="1" GridPane.rowIndex="2">
+ <Button id="small-button" fx:id="continueBtn" mnemonicParsing="false" onAction="#switchScene" prefHeight="30.0" prefWidth="103.0" styleClass="button-style" stylesheets="@../style.css" text="Continue" GridPane.columnIndex="1" GridPane.rowIndex="2">
<GridPane.margin>
<Insets bottom="5.0" />
</GridPane.margin>
@@ -218,15 +202,15 @@
</GridPane>
</children>
</VBox>
- <Button fx:id="returnBtn" layoutX="14.0" layoutY="14.0" mnemonicParsing="false" onAction="#switchScene" text="Return to start">
+ <Button fx:id="returnBtn" layoutX="14.0" layoutY="14.0" mnemonicParsing="false" onAction="#switchScene" styleClass="button-style" stylesheets="@../style.css" text="Return to start">
<font>
<Font size="14.0" />
</font></Button>
- <Text layoutX="146.0" layoutY="54.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Income and Expenses" textAlignment="CENTER">
+ <Label layoutX="192.0" layoutY="14.0" styleClass="head-line" stylesheets="@../style.css" text="Income and Expenses">
<font>
- <Font name="Lucida Console" size="40.0" />
+ <Font size="40.0" />
</font>
- </Text>
+ </Label>
<DatePicker fx:id="date" disable="true" layoutX="340.0" layoutY="473.0" visible="false" />
<Button fx:id="returnToMainMenuBtn" disable="true" layoutX="99.0" layoutY="14.0" mnemonicParsing="false" opacity="0.0" text="Button" />
</children>
diff --git a/src/main/resources/view/newBudgetBudgert.fxml b/src/main/resources/view/newBudgetBudgert.fxml
index 7d19693d8871b40fa8b99c572ac73ab357bea158..ffafab793f40e1ccf53f6a5322ed4aac0aaf0ed0 100644
--- a/src/main/resources/view/newBudgetBudgert.fxml
+++ b/src/main/resources/view/newBudgetBudgert.fxml
@@ -1,29 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
-<?import javafx.geometry.Insets?>
-<?import javafx.scene.Cursor?>
-<?import javafx.scene.chart.PieChart?>
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.ComboBox?>
-<?import javafx.scene.control.DatePicker?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.control.TableColumn?>
-<?import javafx.scene.control.TableView?>
-<?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?>
-<?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.Pane?>
-<?import javafx.scene.layout.RowConstraints?>
-<?import javafx.scene.layout.StackPane?>
-<?import javafx.scene.layout.VBox?>
-<?import javafx.scene.shape.Rectangle?>
-<?import javafx.scene.text.Font?>
-<?import javafx.scene.text.Text?>
+<?import javafx.geometry.*?>
+<?import javafx.scene.*?>
+<?import javafx.scene.chart.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.image.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.shape.*?>
+<?import javafx.scene.text.*?>
-<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="500.0" prefWidth="750.0" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="no.ntnu.idatt1002.demo.controller.BudgetController">
+<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="500.0" prefWidth="750.0" xmlns="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="no.ntnu.idatt1002.demo.controller.BudgetController">
<children>
<ImageView fitHeight="500.0" fitWidth="750.0" pickOnBounds="true">
<image>
@@ -84,7 +70,7 @@
</StackPane>
<HBox alignment="CENTER_RIGHT" GridPane.columnIndex="1" GridPane.rowIndex="2">
<children>
- <Button fx:id="continueBtn" mnemonicParsing="false" onAction="#switchScene" prefWidth="100.0" text="Continue">
+ <Button fx:id="continueBtn" mnemonicParsing="false" onAction="#switchScene" prefWidth="100.0" styleClass="button-style" stylesheets="@../style.css" text="Continue">
<font>
<Font size="14.0" />
</font>
@@ -102,7 +88,7 @@
<children>
<HBox alignment="CENTER_LEFT" prefHeight="42.0" prefWidth="243.0" spacing="10.0">
<children>
- <Button fx:id="addBtn" mnemonicParsing="false" onAction="#handleAddBtn" prefHeight="28.0" prefWidth="38.0" text="Add">
+ <Button id="small-button" fx:id="addBtn" mnemonicParsing="false" onAction="#handleAddBtn" prefHeight="28.0" prefWidth="86.0" styleClass="button-style" stylesheets="@../style.css" text="Add">
<font>
<Font name="Lucida Console" size="12.0" />
</font>
@@ -114,7 +100,7 @@
</ImageView>
</graphic>
</Button>
- <Button fx:id="editBtn" mnemonicParsing="false" onAction="#handleEditBtn" prefHeight="28.0" prefWidth="86.0" text="Edit">
+ <Button id="small-button" fx:id="editBtn" mnemonicParsing="false" onAction="#handleEditBtn" prefHeight="28.0" prefWidth="92.0" styleClass="button-style" stylesheets="@../style.css" text="Edit">
<font>
<Font name="Lucida Console" size="12.0" />
</font>
@@ -126,7 +112,7 @@
</ImageView>
</graphic>
</Button>
- <Button fx:id="deleteBtn" mnemonicParsing="false" onAction="#handleDeleteBtn" prefHeight="28.0" prefWidth="109.0" text="Delete">
+ <Button id="small-button" fx:id="deleteBtn" mnemonicParsing="false" onAction="#handleDeleteBtn" prefHeight="28.0" prefWidth="109.0" styleClass="button-style" stylesheets="@../style.css" text="Delete">
<font>
<Font name="Lucida Console" size="12.0" />
</font>
@@ -153,9 +139,9 @@
</GridPane>
<HBox alignment="CENTER" GridPane.columnIndex="1">
<children>
- <Label alignment="CENTER" prefHeight="20.0" prefWidth="533.0" text="Amount at disposal: 1000">
+ <Label alignment="CENTER" prefHeight="20.0" prefWidth="533.0" styleClass="font" stylesheets="@../style.css" text="Amount at disposal: 1000">
<font>
- <Font size="24.0" />
+ <Font size="18.0" />
</font>
</Label>
</children>
@@ -179,15 +165,15 @@
</VBox>
<GridPane>
<columnConstraints>
- <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" />
- <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
- <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+ <ColumnConstraints hgrow="SOMETIMES" maxWidth="223.0" minWidth="10.0" prefWidth="167.0" />
+ <ColumnConstraints hgrow="SOMETIMES" maxWidth="368.0" minWidth="10.0" prefWidth="334.0" />
+ <ColumnConstraints hgrow="SOMETIMES" maxWidth="221.0" minWidth="10.0" prefWidth="158.0" />
</columnConstraints>
<rowConstraints>
<RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
</rowConstraints>
<children>
- <Label fx:id="title" text="Budget Setup" textAlignment="CENTER" GridPane.columnIndex="1">
+ <Label fx:id="title" styleClass="head-line" stylesheets="@../style.css" text="Budget Setup" textAlignment="CENTER" GridPane.columnIndex="1">
<font>
<Font size="36.0" />
</font>
@@ -195,7 +181,7 @@
<Pane GridPane.columnIndex="2">
<children>
<StackPane />
- <Label fx:id="daysLeftLbl" layoutX="33.0" layoutY="62.0" text="Days left: 31">
+ <Label fx:id="daysLeftLbl" layoutX="33.0" layoutY="62.0" styleClass="font" stylesheets="@../style.css" text="Days left: 31">
<font>
<Font name="Lucida Console" size="14.0" />
</font>
@@ -204,7 +190,7 @@
</children>
</Pane>
<Button fx:id="returnToMainMenuBtn" disable="true" mnemonicParsing="false" onAction="#switchScene" opacity="0.0" text="Button" />
- <Button fx:id="backBtn" mnemonicParsing="false" onAction="#switchScene" prefWidth="100.0" text="Go back">
+ <Button fx:id="backBtn" mnemonicParsing="false" onAction="#switchScene" prefWidth="100.0" styleClass="button-style" stylesheets="@../style.css" text="Go back">
<font>
<Font size="14.0" />
</font>