diff --git a/src/main/java/unicash/logic/LogicManager.java b/src/main/java/unicash/logic/LogicManager.java index 85f2877db2b..f9d19d8c4c9 100644 --- a/src/main/java/unicash/logic/LogicManager.java +++ b/src/main/java/unicash/logic/LogicManager.java @@ -11,7 +11,7 @@ import unicash.logic.commands.Command; import unicash.logic.commands.CommandResult; import unicash.logic.commands.exceptions.CommandException; -import unicash.logic.parser.AddressBookParser; +import unicash.logic.parser.UniCashParser; import unicash.logic.parser.exceptions.ParseException; import unicash.model.Model; import unicash.model.transaction.Transaction; @@ -30,7 +30,7 @@ public class LogicManager implements Logic { private final Model model; private final Storage storage; - private final AddressBookParser addressBookParser; + private final UniCashParser uniCashParser; /** * Constructs a {@code LogicManager} with the given {@code Model} and {@code Storage}. @@ -38,7 +38,7 @@ public class LogicManager implements Logic { public LogicManager(Model model, Storage storage) { this.model = model; this.storage = storage; - addressBookParser = new AddressBookParser(); + uniCashParser = new UniCashParser(); } @Override @@ -46,7 +46,7 @@ public CommandResult execute(String commandText) throws CommandException, ParseE logger.info("----------------[USER COMMAND][" + commandText + "]"); CommandResult commandResult; - Command command = addressBookParser.parseCommand(commandText); + Command command = uniCashParser.parseCommand(commandText); commandResult = command.execute(model); try { diff --git a/src/main/java/unicash/logic/UniCashMessages.java b/src/main/java/unicash/logic/UniCashMessages.java index 550bab91f5d..5091a02dc6c 100644 --- a/src/main/java/unicash/logic/UniCashMessages.java +++ b/src/main/java/unicash/logic/UniCashMessages.java @@ -13,7 +13,7 @@ public class UniCashMessages { public static final String MESSAGE_UNKNOWN_COMMAND = "Unknown command"; - public static final String MESSAGE_INVALID_COMMAND_FORMAT = "Invalid command format! \n%1$s"; + public static final String MESSAGE_INVALID_COMMAND_FORMAT = "Invalid command format! \n\n%1$s"; public static final String MESSAGE_INVALID_TRANSACTION_DISPLAYED_INDEX = "The transaction index provided is invalid"; public static final String MESSAGE_TRANSACTIONS_LISTED_OVERVIEW = "%1$d transactions listed!"; @@ -39,15 +39,15 @@ public static String getErrorMessageForDuplicatePrefixes(Prefix... duplicatePref public static String formatTransaction(Transaction transaction) { final StringBuilder builder = new StringBuilder(); builder.append(transaction.getName()) - .append("; Type: ") + .append("; \nType: ") .append(transaction.getType()) - .append("; Amount: ") + .append("; \nAmount: ") .append(transaction.getAmount()) - .append("; Date: ") + .append("; \nDate: ") .append(transaction.getDateTime()) - .append("; Location: ") + .append("; \nLocation: ") .append(transaction.getLocation()) - .append("; Category: "); + .append("; \nCategory: "); transaction.getCategories().forEach(builder::append); return builder.toString(); } diff --git a/src/main/java/unicash/logic/commands/AddTransactionCommand.java b/src/main/java/unicash/logic/commands/AddTransactionCommand.java index 20e06371aec..38786130f8c 100644 --- a/src/main/java/unicash/logic/commands/AddTransactionCommand.java +++ b/src/main/java/unicash/logic/commands/AddTransactionCommand.java @@ -16,7 +16,8 @@ public class AddTransactionCommand extends Command { public static final String COMMAND_WORD = "add_transaction"; - public static final String MESSAGE_USAGE = COMMAND_WORD + ": Adds a transaction to UniCash. " + public static final String MESSAGE_USAGE = COMMAND_WORD + ": Adds a transaction to UniCa$h. \n" + + "\n" + "Parameters: " + CliSyntax.PREFIX_NAME + "NAME " + CliSyntax.PREFIX_TYPE + "TYPE " @@ -24,6 +25,7 @@ public class AddTransactionCommand extends Command { + CliSyntax.PREFIX_DATETIME + "DATETIME " + CliSyntax.PREFIX_LOCATION + "LOCATION " + "[" + CliSyntax.PREFIX_CATEGORY + "CATEGORY]...\n" + + "\n" + "Example: " + COMMAND_WORD + " " + CliSyntax.PREFIX_NAME + "Buying groceries " + CliSyntax.PREFIX_TYPE + "expense " diff --git a/src/main/java/unicash/logic/commands/DeleteTransactionCommand.java b/src/main/java/unicash/logic/commands/DeleteTransactionCommand.java index a896563dd20..257a70b8808 100644 --- a/src/main/java/unicash/logic/commands/DeleteTransactionCommand.java +++ b/src/main/java/unicash/logic/commands/DeleteTransactionCommand.java @@ -20,7 +20,9 @@ public class DeleteTransactionCommand extends Command { public static final String MESSAGE_USAGE = COMMAND_WORD + ": Deletes the transaction identified by the index number used in the displayed transaction list.\n" + + "\n" + "Parameters: INDEX (must be a positive integer)\n" + + "\n" + "Example: " + COMMAND_WORD + " 1"; public static final String MESSAGE_DELETE_TRANSACTION_SUCCESS = "Deleted Transaction: %1$s"; diff --git a/src/main/java/unicash/logic/commands/EditTransactionCommand.java b/src/main/java/unicash/logic/commands/EditTransactionCommand.java index 655c0ca674f..1435dec0168 100644 --- a/src/main/java/unicash/logic/commands/EditTransactionCommand.java +++ b/src/main/java/unicash/logic/commands/EditTransactionCommand.java @@ -38,8 +38,9 @@ public class EditTransactionCommand extends Command { public static final String COMMAND_WORD = "edit_transaction"; public static final String MESSAGE_USAGE = COMMAND_WORD + ": Edits the details of the transaction identified " - + "by the index number used in the displayed transaction list. " - + "Existing values will be overwritten by the input values.\n" + + "by the index number used in the displayed transaction list." + + "Existing values will be overwritten by the input values!\n" + + "\n" + "Parameters: INDEX (must be a positive integer) " + "[" + PREFIX_NAME + "NAME] " + "[" + PREFIX_TYPE + "TYPE] " @@ -47,6 +48,7 @@ public class EditTransactionCommand extends Command { + "[" + PREFIX_DATETIME + "DATETIME] " + "[" + PREFIX_LOCATION + "LOCATION]" + "[" + PREFIX_CATEGORY + "CATEGORY]...\n" + + "\n" + "Example: " + COMMAND_WORD + " 1 " + PREFIX_NAME + "Buying groceries " + PREFIX_TYPE + "expense " diff --git a/src/main/java/unicash/logic/commands/FindCommand.java b/src/main/java/unicash/logic/commands/FindCommand.java index 06c065a6a85..debab9accfc 100644 --- a/src/main/java/unicash/logic/commands/FindCommand.java +++ b/src/main/java/unicash/logic/commands/FindCommand.java @@ -17,7 +17,9 @@ public class FindCommand extends Command { public static final String MESSAGE_USAGE = COMMAND_WORD + ": Finds all transactions whose names contain any of " + "the specified keywords (case-insensitive) and displays them as a list with index numbers.\n" + + "\n" + "Parameters: KEYWORD [MORE_KEYWORDS]...\n" + + "\n" + "Example: " + COMMAND_WORD + " chicken rice"; private final TransactionNameContainsKeywordsPredicate predicate; diff --git a/src/main/java/unicash/logic/commands/GetTotalExpenditureCommand.java b/src/main/java/unicash/logic/commands/GetTotalExpenditureCommand.java index b97f6794228..011e9a8dbee 100644 --- a/src/main/java/unicash/logic/commands/GetTotalExpenditureCommand.java +++ b/src/main/java/unicash/logic/commands/GetTotalExpenditureCommand.java @@ -20,6 +20,7 @@ public class GetTotalExpenditureCommand extends Command { public static final String MESSAGE_USAGE = COMMAND_WORD + ": Retrieves the total expenditure by month with optional filters for category.\n" + + "\n" + "Parameters: MONTH (must be valid month index) " + PREFIX_CATEGORY + "CATEGORY\n"; diff --git a/src/main/java/unicash/logic/commands/HelpCommandUniCash.java b/src/main/java/unicash/logic/commands/HelpCommandUniCash.java index 5907c86a78c..bcbc8bb9451 100644 --- a/src/main/java/unicash/logic/commands/HelpCommandUniCash.java +++ b/src/main/java/unicash/logic/commands/HelpCommandUniCash.java @@ -10,6 +10,7 @@ public class HelpCommandUniCash extends Command { public static final String COMMAND_WORD = "help"; public static final String MESSAGE_USAGE = COMMAND_WORD + ": Shows UniCa$h usage instructions.\n" + + "\n" + "Example: " + COMMAND_WORD; public static final String SHOWING_HELP_MESSAGE = "Opened UniCa$h help window."; diff --git a/src/main/java/unicash/logic/commands/ListCommand.java b/src/main/java/unicash/logic/commands/ListCommand.java index c61e5d1dc97..370f0dc3c49 100644 --- a/src/main/java/unicash/logic/commands/ListCommand.java +++ b/src/main/java/unicash/logic/commands/ListCommand.java @@ -18,8 +18,10 @@ public class ListCommand extends Command { private static final Logger logger = Logger.getLogger("ListCommandLogger"); - public static final String MESSAGE_USAGE = COMMAND_WORD + ": Lists all transactions in UniCa$h. " - + "Example: " + COMMAND_WORD; + public static final String MESSAGE_USAGE = COMMAND_WORD + ": Lists all transactions in UniCa$h. \n" + + "\n" + + "Example: " + + COMMAND_WORD; public static final String MESSAGE_FAILURE = "Command not recognised. Try using the command " + COMMAND_WORD + " without any parameters instead."; diff --git a/src/main/java/unicash/logic/parser/AddressBookParser.java b/src/main/java/unicash/logic/parser/UniCashParser.java similarity index 94% rename from src/main/java/unicash/logic/parser/AddressBookParser.java rename to src/main/java/unicash/logic/parser/UniCashParser.java index c343f93bcad..b75bc0c4bc9 100644 --- a/src/main/java/unicash/logic/parser/AddressBookParser.java +++ b/src/main/java/unicash/logic/parser/UniCashParser.java @@ -24,13 +24,13 @@ /** * Parses user input. */ -public class AddressBookParser { +public class UniCashParser { /** * Used for initial separation of command word and args. */ private static final Pattern BASIC_COMMAND_FORMAT = Pattern.compile("(?\\S+)(?.*)"); - private static final Logger logger = LogsCenter.getLogger(AddressBookParser.class); + private static final Logger logger = LogsCenter.getLogger(UniCashParser.class); /** * Parses user input into command for execution. @@ -45,7 +45,7 @@ public Command parseCommand(String userInput) throws ParseException { throw new ParseException(String.format(MESSAGE_INVALID_COMMAND_FORMAT, HelpCommandUniCash.MESSAGE_USAGE)); } - final String commandWord = matcher.group("commandWord"); + final String commandWord = matcher.group("commandWord").toLowerCase(); final String arguments = matcher.group("arguments"); // Note to developers: Change the log level in config.json to enable lower level (i.e., FINE, FINER and lower) diff --git a/src/main/java/unicash/model/transaction/Amount.java b/src/main/java/unicash/model/transaction/Amount.java index e73ce5f3886..90c20f0cd40 100644 --- a/src/main/java/unicash/model/transaction/Amount.java +++ b/src/main/java/unicash/model/transaction/Amount.java @@ -47,6 +47,16 @@ public boolean equals(Object other) { return amount == ((Amount) other).amount; } + /** + * Returns a rounded two-decimal precision String version of an {@code Amount}. + */ + public static String amountToDecimalString(Amount amt) { + double roundedAmount = Math.round(amt.amount * 100.0) / 100.0; + String formattedNumberString = String.format("%.2f", roundedAmount); + + return formattedNumberString; + } + @Override public String toString() { return Double.toString(amount); diff --git a/src/main/java/unicash/model/util/SampleDataUtil.java b/src/main/java/unicash/model/util/SampleDataUtil.java index b3f05a47164..56ff6fbe3ad 100644 --- a/src/main/java/unicash/model/util/SampleDataUtil.java +++ b/src/main/java/unicash/model/util/SampleDataUtil.java @@ -26,21 +26,40 @@ private SampleDataUtil() { public static Transaction[] getSampleTransactions() { return new Transaction[]{ new Transaction( - new Name("Valid transaction"), + new Name("Lunch at McDonalds"), new Type("expense"), - new Amount(17.0), - new DateTime("15-09-2023 00:00"), + new Amount(17.40), + new DateTime("15-09-2023 11:00"), + new Location("Clementi Mall"), + getCategorySet("food") + ), + new Transaction( + new Name("Buy clothes"), + new Type("expense"), + new Amount(109.00), + new DateTime("17-09-2023 18:30"), + new Location("Uniqlo Bugis"), + getCategorySet("shopping") + ), + + new Transaction( + new Name("Intern allowance september"), + new Type("income"), + new Amount(1800.00), + new DateTime("17-09-2023 00:00"), new Location(""), - getCategorySet("Food") + getCategorySet("salary") ), + new Transaction( - new Name("Valid transaction 2"), + new Name("Evening with friends"), new Type("expense"), - new Amount(123), - new DateTime("15-07-2023 00:00"), - new Location("Jurong"), - getCategorySet("Others") + new Amount(49.50), + new DateTime("17-09-2023 00:00"), + new Location("Clarke Quay"), + getCategorySet("social") ) + }; } diff --git a/src/main/java/unicash/ui/HelpWindow.java b/src/main/java/unicash/ui/HelpWindow.java index 69d91ab7628..ac72059f09c 100644 --- a/src/main/java/unicash/ui/HelpWindow.java +++ b/src/main/java/unicash/ui/HelpWindow.java @@ -15,10 +15,8 @@ */ public class HelpWindow extends UiPart { - public static final String USERGUIDE_URL_OLD = "https://se-education.org/addressbook-level3/UserGuide.html"; - - public static final String USERGUIDE_URL = "https://ay2324s1-cs2103-t16-3.github.io/tp/"; - public static final String HELP_MESSAGE = "Refer to the user guide: " + USERGUIDE_URL; + public static final String USER_GUIDE_URL = "https://ay2324s1-cs2103-t16-3.github.io/tp/"; + public static final String HELP_MESSAGE = "Refer to the user guide: " + USER_GUIDE_URL; private static final Logger logger = LogsCenter.getLogger(HelpWindow.class); private static final String FXML = "HelpWindow.fxml"; @@ -29,6 +27,7 @@ public class HelpWindow extends UiPart { @FXML private Label helpMessage; + /** * Creates a new HelpWindow. * @@ -98,7 +97,8 @@ public void focus() { private void copyUrl() { final Clipboard clipboard = Clipboard.getSystemClipboard(); final ClipboardContent url = new ClipboardContent(); - url.putString(USERGUIDE_URL); + url.putString(USER_GUIDE_URL); clipboard.setContent(url); } + } diff --git a/src/main/java/unicash/ui/MainWindow.java b/src/main/java/unicash/ui/MainWindow.java index e40399d78a0..5b0b2692e5d 100644 --- a/src/main/java/unicash/ui/MainWindow.java +++ b/src/main/java/unicash/ui/MainWindow.java @@ -1,5 +1,11 @@ package unicash.ui; +import java.awt.Desktop; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.nio.file.Files; +import java.nio.file.StandardCopyOption; import java.util.logging.Logger; import javafx.event.ActionEvent; @@ -12,6 +18,7 @@ import javafx.stage.Stage; import unicash.commons.core.GuiSettings; import unicash.commons.core.LogsCenter; +import unicash.commons.util.StringUtil; import unicash.logic.Logic; import unicash.logic.commands.CommandResult; import unicash.logic.commands.exceptions.CommandException; @@ -22,9 +29,14 @@ * a menu bar and space where other JavaFX elements can be placed. */ public class MainWindow extends UiPart { + public static final String USER_GUIDE_NAME_PREFIX = "userguide_local"; + public static final String USER_GUIDE_NAME_SUFFIX = ".pdf"; + public static final String USER_GUIDE_NAME = USER_GUIDE_NAME_PREFIX + USER_GUIDE_NAME_SUFFIX; + public static final String PATH_TO_USER_GUIDE = "/documents/" + USER_GUIDE_NAME; + public static final String FILE_ERROR_MESSAGE = "A FILE ERROR OCCURRED."; + public static final String UNKNOWN_ERROR_MESSAGE = "AN UNKNOWN ERROR OCCURRED."; private static final String FXML = "MainWindow.fxml"; - private final Logger logger = LogsCenter.getLogger(getClass()); private Stage primaryStage; @@ -41,6 +53,9 @@ public class MainWindow extends UiPart { @FXML private MenuItem helpMenuItem; + @FXML + private MenuItem userGuideMenuItem; + @FXML private StackPane transactionListPanelPlaceholder; @@ -189,4 +204,30 @@ private CommandResult executeCommand(String commandText) throws CommandException throw e; } } + + /** + * Opens the local user guide. + */ + @FXML + private void handleOpenUserGuide() { + try { + // Path to the resource inside the jar file + InputStream inputStream = getClass().getResourceAsStream(PATH_TO_USER_GUIDE); + + File tempFile = File.createTempFile(USER_GUIDE_NAME_PREFIX, USER_GUIDE_NAME_SUFFIX); + tempFile.deleteOnExit(); // The user guide will be deleted upon JVM exit + + Files.copy(inputStream, tempFile.toPath(), StandardCopyOption.REPLACE_EXISTING); + Desktop.getDesktop().open(tempFile); + + } catch (IOException e) { + System.err.println(FILE_ERROR_MESSAGE); + logger.severe(FILE_ERROR_MESSAGE + StringUtil.getDetails(e)); + + } catch (Exception ex) { + System.err.println(UNKNOWN_ERROR_MESSAGE); + logger.severe(UNKNOWN_ERROR_MESSAGE + StringUtil.getDetails(ex)); + } + } + } diff --git a/src/main/java/unicash/ui/StatusBarFooter.java b/src/main/java/unicash/ui/StatusBarFooter.java index de3bb25809d..bd14862cf17 100644 --- a/src/main/java/unicash/ui/StatusBarFooter.java +++ b/src/main/java/unicash/ui/StatusBarFooter.java @@ -23,7 +23,7 @@ public class StatusBarFooter extends UiPart { */ public StatusBarFooter(Path saveLocation) { super(FXML); - saveLocationStatus.setText("Data Source -> " + Paths.get(".").resolve(saveLocation)); + saveLocationStatus.setText("Data source -> " + Paths.get(".").resolve(saveLocation)); } } diff --git a/src/main/java/unicash/ui/TransactionCard.java b/src/main/java/unicash/ui/TransactionCard.java index d78bcc18daa..7de1ec8f8c0 100644 --- a/src/main/java/unicash/ui/TransactionCard.java +++ b/src/main/java/unicash/ui/TransactionCard.java @@ -4,6 +4,7 @@ import javafx.scene.control.Label; import javafx.scene.layout.HBox; import javafx.scene.layout.Region; +import unicash.model.transaction.Amount; import unicash.model.transaction.Transaction; /** @@ -11,7 +12,7 @@ */ public class TransactionCard extends UiPart { - private static final String FXML = "TransactionListCard.fxml"; + private static final String FXML = "TransactionCard.fxml"; /** * Note: Certain keywords such as "location" and "resources" are reserved keywords in JavaFX. @@ -20,7 +21,6 @@ public class TransactionCard extends UiPart { * * @see The issue on AddressBook level 4 */ - public final Transaction transaction; @FXML @@ -40,18 +40,26 @@ public class TransactionCard extends UiPart { @FXML private Label categories; + /** - * Creates a {@code PersonCode} with the given {@code Person} and index to display. + * Creates a {@code TransactionCard} with the given {@code Transaction} and index to display. + * The transaction's polarity (i.e. direction) depends on whether it's an expense or an income. + * All transactions are assumed to be made in dollars. */ public TransactionCard(Transaction transaction, int displayedIndex) { super(FXML); this.transaction = transaction; + String dollarTransactionWithDecimal = "$" + Amount.amountToDecimalString(transaction.getAmount()); + String transactionPolarity = transaction.getType().toString().equals("expense") ? "-" : "+"; + id.setText(displayedIndex + ". "); name.setText(transaction.getName().toString()); - amount.setText(transaction.getAmount().toString()); + amount.setText(transactionPolarity + dollarTransactionWithDecimal); dateTime.setText(transaction.getDateTime().toString()); transactionLocation.setText(transaction.getLocation().toString()); categories.setText(transaction.getCategories().toString()); } + + } diff --git a/src/main/resources/documents/userguide_local.pdf b/src/main/resources/documents/userguide_local.pdf new file mode 100644 index 00000000000..395d6a712fe Binary files /dev/null and b/src/main/resources/documents/userguide_local.pdf differ diff --git a/src/main/resources/view/DarkTheme.css b/src/main/resources/view/DarkTheme.css index 335d1929188..bb5bcf7ae4c 100644 --- a/src/main/resources/view/DarkTheme.css +++ b/src/main/resources/view/DarkTheme.css @@ -122,7 +122,7 @@ .cell_big_label { -fx-font-family: "Inter"; - -fx-font-size: 16px; + -fx-font-size: 14px; -fx-text-fill: #010504; } @@ -132,6 +132,13 @@ -fx-text-fill: #010504; } +.cell_small_label_bold { + -fx-font-family: "Inter"; + -fx-font-size: 11px; + -fx-text-fill: #010504; + -fx-font-weight: bold; +} + .stack-pane { -fx-background-color: derive(#F3F3F3, 20%); } @@ -143,6 +150,12 @@ -fx-border-top-width: 1px; } +.pane-with-black-border { + -fx-background-color: derive(#F3F3F3, 20%); + -fx-background-color: black; + -fx-border-top-width: 1px; +} + .status-bar { -fx-background-color: derive(#F3F3F3, 30%); } @@ -150,7 +163,7 @@ .result-display { -fx-background-color: transparent; -fx-font-family: "Inter"; - -fx-font-size: 13pt; + -fx-font-size: 11pt; -fx-text-fill: black; } @@ -358,8 +371,54 @@ -fx-label-padding: 2 3 2 3; -fx-background-color: #FFD43E; -fx-background-radius: 4; + -fx-font-weight: bold; + -fx-font-style: italic; + } .bold-label { -fx-font-weight: bold; } + +.normal-label { + -fx-font-weight: normal; +} + +.bold-label-menubar { + -fx-font-weight: bold; + -fx-font-size: 13pt; +} + +.status-bar-color { + -fx-font-family: "Inter"; + -fx-background-color: black; + -fx-text-fill: white; + -fx-font-weight: bold; + -fx-font-size: 10pt; +} + +.transaction-name { + -fx-font-family: "Inter"; + -fx-font-size: 15px; + -fx-text-fill: #010504; + -fx-font-weight: bold; +} + +.transaction-id { + -fx-font-family: "Inter"; + -fx-font-size: 15px; + -fx-text-fill: #010504; + -fx-font-weight: bold; +} + +.transaction-subtitle { + -fx-font-family: "Inter"; + -fx-font-size: 13px; + -fx-text-fill: #010504; + -fx-font-style: italic; +} + +.big-money { + -fx-font-weight: bold; + -fx-font-size: 12pt; +} diff --git a/src/main/resources/view/Extensions.css b/src/main/resources/view/Extensions.css index 080634f4f5b..90b02fec051 100644 --- a/src/main/resources/view/Extensions.css +++ b/src/main/resources/view/Extensions.css @@ -18,3 +18,16 @@ .tooltip-text { -fx-text-fill: black; } + +.my-custom-menubar { + -fx-background-color: #2f2f2f; // Your desired color +} + +.my-custom-menubar .menu-button { + -fx-background-color: transparent; // This is to ensure individual menu items don't override the MenuBar color + -fx-text-fill: white; // Change the text color if needed +} + +.my-custom-menubar .menu-button:hover { + -fx-background-color: #3f3f3f; // Hover color for individual menu items +} diff --git a/src/main/resources/view/HelpWindow.css b/src/main/resources/view/HelpWindow.css index 2e224f5ee6e..e3939f57d09 100644 --- a/src/main/resources/view/HelpWindow.css +++ b/src/main/resources/view/HelpWindow.css @@ -5,15 +5,15 @@ } #copyButton { - -fx-background-color: darkgray; + -fx-background-color: dimgray; } #copyButton:hover { - -fx-background-color: dimgray; + -fx-background-color: darkgray; } #copyButton:armed { - -fx-background-color: white; + -fx-background-color: gray; } #helpMessageContainer { diff --git a/src/main/resources/view/MainWindow.fxml b/src/main/resources/view/MainWindow.fxml index a2397fb9b74..08773e68855 100644 --- a/src/main/resources/view/MainWindow.fxml +++ b/src/main/resources/view/MainWindow.fxml @@ -1,18 +1,14 @@ - - - - - - - - - - + + + + + + + - + @@ -24,37 +20,47 @@ - + - + - + + + + - - - - - - - - - - - + + + + + + + + - - - - - - + + + + + + + + + + + + + + + + diff --git a/src/main/resources/view/PersonListCard.fxml b/src/main/resources/view/PersonListCard.fxml index f5e812e25e6..5aca6cbfe3f 100644 --- a/src/main/resources/view/PersonListCard.fxml +++ b/src/main/resources/view/PersonListCard.fxml @@ -10,27 +10,27 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/src/main/resources/view/ResultDisplay.fxml b/src/main/resources/view/ResultDisplay.fxml index 01b691792a9..6044fe878ee 100644 --- a/src/main/resources/view/ResultDisplay.fxml +++ b/src/main/resources/view/ResultDisplay.fxml @@ -5,5 +5,5 @@ -