From f1eebb7994fccaffbd5a0a69c52e4a8df246ea4b Mon Sep 17 00:00:00 2001 From: PawelSapula Date: Mon, 25 May 2026 17:49:34 +0200 Subject: [PATCH] feat: Add Home button --- .../java/edu/ntnu/idi/idatt/view/entry/StartController.java | 4 ++-- .../ntnu/idi/idatt/view/primary/newspaper/NewspaperView.java | 4 +++- .../ntnu/idi/idatt/view/primary/portfolio/PortfolioView.java | 4 ++-- .../edu/ntnu/idi/idatt/view/primary/stock/StockView.java | 5 ++++- .../idi/idatt/view/primary/transactions/TransactionView.java | 4 +++- 5 files changed, 14 insertions(+), 7 deletions(-) diff --git a/src/main/java/edu/ntnu/idi/idatt/view/entry/StartController.java b/src/main/java/edu/ntnu/idi/idatt/view/entry/StartController.java index 84a9c5e..da6a0e3 100644 --- a/src/main/java/edu/ntnu/idi/idatt/view/entry/StartController.java +++ b/src/main/java/edu/ntnu/idi/idatt/view/entry/StartController.java @@ -65,7 +65,7 @@ public void initializeGame() { boolean loadResult = SessionManager.loadSession(model.getName().get()); if (loadResult) { - SceneManager.switchTo(SceneFactory.createExchangeView()); + SceneManager.switchTo(SceneFactory.createExchangeView(true)); return; } else { model.isNewGame().set(true); @@ -130,7 +130,7 @@ public void initializeGame() { Exchange exchange = new Exchange(player.getName(), stocks); SessionManager.newSession(player, exchange); SessionManager.saveSession(); - SceneManager.switchTo(SceneFactory.createExchangeView()); + SceneManager.switchTo(SceneFactory.createExchangeView(true)); } } diff --git a/src/main/java/edu/ntnu/idi/idatt/view/primary/newspaper/NewspaperView.java b/src/main/java/edu/ntnu/idi/idatt/view/primary/newspaper/NewspaperView.java index 71a3fc5..6c900f2 100644 --- a/src/main/java/edu/ntnu/idi/idatt/view/primary/newspaper/NewspaperView.java +++ b/src/main/java/edu/ntnu/idi/idatt/view/primary/newspaper/NewspaperView.java @@ -64,7 +64,9 @@ public Parent createContent() { */ @Override public Parent createNavigation() { - return UIFactory.createNavigation(" Newspaper", List.of()); + return UIFactory.createNavigation(" Newspaper", + List.of("Home"), + () -> SceneManager.switchTo(SceneFactory.createExchangeView(false))); } /** diff --git a/src/main/java/edu/ntnu/idi/idatt/view/primary/portfolio/PortfolioView.java b/src/main/java/edu/ntnu/idi/idatt/view/primary/portfolio/PortfolioView.java index 1a476b7..71f928d 100644 --- a/src/main/java/edu/ntnu/idi/idatt/view/primary/portfolio/PortfolioView.java +++ b/src/main/java/edu/ntnu/idi/idatt/view/primary/portfolio/PortfolioView.java @@ -58,8 +58,8 @@ public Parent createContent() { @Override public Parent createNavigation() { return UIFactory.createNavigation("Portfolio", - List.of(" • Title"), - () -> System.out.println("Newspaper clicked")); + List.of("Home"), + () -> SceneManager.switchTo(SceneFactory.createExchangeView(false))); } /** diff --git a/src/main/java/edu/ntnu/idi/idatt/view/primary/stock/StockView.java b/src/main/java/edu/ntnu/idi/idatt/view/primary/stock/StockView.java index 1263fc1..950808f 100644 --- a/src/main/java/edu/ntnu/idi/idatt/view/primary/stock/StockView.java +++ b/src/main/java/edu/ntnu/idi/idatt/view/primary/stock/StockView.java @@ -74,7 +74,10 @@ public Parent createContent() { @Override public Parent createNavigation() { return UIFactory.createNavigation(title = new Label(), - List.of(" • Newspaper"), + List.of( + "Home", + " • Newspaper"), + () -> SceneManager.switchTo(SceneFactory.createExchangeView(false)), () -> SceneManager.switchTo(SceneFactory.createNewspaperView(stockSymbol))); } diff --git a/src/main/java/edu/ntnu/idi/idatt/view/primary/transactions/TransactionView.java b/src/main/java/edu/ntnu/idi/idatt/view/primary/transactions/TransactionView.java index 5cd6f1e..6e8cce5 100644 --- a/src/main/java/edu/ntnu/idi/idatt/view/primary/transactions/TransactionView.java +++ b/src/main/java/edu/ntnu/idi/idatt/view/primary/transactions/TransactionView.java @@ -55,7 +55,9 @@ public Parent createContent() { */ @Override public Parent createNavigation() { - return UIFactory.createNavigation("Transactions", List.of()); + return UIFactory.createNavigation("Transactions", + List.of("Home"), + () -> SceneManager.switchTo(SceneFactory.createExchangeView(false))); } /**