commit 6f60c17181f1a3e7d04ffa54adbbd5d5acfc171d parent 218da32ee4a3cb13cbccef6da1727feb5e7a0954 Author: A Koens <[email protected]> Date: Thu, 2 Feb 2023 18:57:56 +0100 Navigation App now has navigation to different pages. Games can now also be started properly. Diffstat:
37 files changed, 651 insertions(+), 535 deletions(-)
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java @@ -14,27 +14,32 @@ module nl.isygameclient { requires com.google.gson; exports nl.isygameclient; - // Controllers + exports nl.isygameclient.controllers.games.tictactoe; - // Models + + exports nl.isygameclient.controllers; exports nl.isygameclient.models; + exports nl.isygameclient.views; exports nl.isygameclient.util; - exports nl.isygameclient.models.settings; - exports nl.isygameclient.models.games; exports nl.isygameclient.models.board; + exports nl.isygameclient.models.games; + exports nl.isygameclient.settings; opens nl.isygameclient to javafx.fxml; + opens nl.isygameclient.views to javafx.fxml; + + opens nl.isygameclient.controllers to javafx.fxml; opens nl.isygameclient.controllers.games to javafx.fxml; opens nl.isygameclient.controllers.games.tictactoe to javafx.fxml; opens nl.isygameclient.controllers.games.othello to javafx.fxml; - opens nl.isygameclient.util to com.google.gson; opens nl.isygameclient.models to com.google.gson; opens nl.isygameclient.models.board to com.google.gson; - opens nl.isygameclient.models.settings to com.google.gson; - opens nl.isygameclient.models.games to com.google.gson; + opens nl.isygameclient.settings to com.google.gson; + opens nl.isygameclient.models.games to com.google.gson; + opens nl.isygameclient.util to com.google.gson; } diff --git a/src/main/java/nl/isygameclient/Application.java b/src/main/java/nl/isygameclient/Application.java @@ -2,6 +2,9 @@ package nl.isygameclient; import javafx.stage.Stage; import nl.isygameclient.util.StageHandler; +import nl.isygameclient.views.GameCardControl; + +import java.util.List; /** * This class is the start of the javafx application. @@ -15,16 +18,9 @@ import nl.isygameclient.util.StageHandler; */ public class Application extends javafx.application.Application { - enum Windows { - APP("app"), - GAME("game"); - - public final String id; - Windows(String id) { - this.id = id; - } - } - + public static final List<GameCardControl> GAMES = List.of( + new GameCardControl("Tic Tac Toe", "/nl/isygameclient/imgs/tictactoe_logo.png", "/nl/isygameclient/views/games/tictactoe/TicTacToeMainMenu.fxml"), + new GameCardControl("Othello", "/nl/isygameclient/imgs/othello_logo.png", "/nl/isygameclient/views/games/othello/OthelloSinglePlayer.fxml")); public static void main(String[] args) { launch(); @@ -32,6 +28,7 @@ public class Application extends javafx.application.Application { /** * The start preforms the initialization of the stage. + * * @param stage a javafx stage. */ @Override @@ -39,13 +36,11 @@ public class Application extends javafx.application.Application { StageHandler stageHandler = StageHandler.get(); stageHandler.loadStages(); + stageHandler.changeSceneOfStage(Window.APP, "/nl/isygameclient/views/app.fxml"); + stageHandler.focusStage(Window.APP); - stageHandler.changeSceneOfStage(Windows.APP.id, "views/app.fxml"); + stageHandler.getStage(Window.APP).setOnCloseRequest((e) -> stageHandler.saveStages()); + } - stageHandler.focusStage(Windows.APP.id); - stageHandler.getStage(Windows.APP.id).setOnCloseRequest((e) -> { - stageHandler.saveStages(); - }); - } } diff --git a/src/main/java/nl/isygameclient/Headless.java b/src/main/java/nl/isygameclient/Headless.java @@ -1,19 +1,11 @@ package nl.isygameclient; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; import nl.isygameclient.models.Ai; import nl.isygameclient.models.Game; import nl.isygameclient.models.Player; import nl.isygameclient.models.PlayerManager; import nl.isygameclient.models.games.Othello; import nl.isygameclient.util.Vector2D; - -import java.io.IOException; -import java.lang.reflect.Type; -import java.nio.file.Files; -import java.nio.file.NoSuchFileException; -import java.nio.file.Paths; import java.util.*; public class Headless { @@ -21,7 +13,7 @@ public class Headless { private static final String JSON_FILENAME = "heuristics.json"; public static void main(String[] args) { - var heuristics = loadHeuristics(); + var heuristics = Ai.loadHeuristics(JSON_FILENAME); if (heuristics == null) { System.err.println("No heuristics in file."); return; @@ -88,19 +80,4 @@ public class Headless { System.out.println("Total game time in milliseconds: " + totalGameTime); System.out.println(); } - - private static Map<String, int[][]> loadHeuristics() { - try { - Type mapType = new TypeToken<Map<String, int[][]>>() { - }.getType(); - String inFile = new String(Files.readAllBytes(Paths.get(JSON_FILENAME))); - return new Gson().fromJson(inFile, mapType); - } catch (NoSuchFileException e) { - System.err.println("NO HEURISTICS JSON HAS BEEN PROVIDED."); - e.printStackTrace(); - } catch (IOException e) { - e.printStackTrace(); - } - return null; - } } diff --git a/src/main/java/nl/isygameclient/Window.java b/src/main/java/nl/isygameclient/Window.java @@ -0,0 +1,6 @@ +package nl.isygameclient; + +public enum Window { + APP, + GAME +} diff --git a/src/main/java/nl/isygameclient/controllers/AppController.java b/src/main/java/nl/isygameclient/controllers/AppController.java @@ -0,0 +1,72 @@ +package nl.isygameclient.controllers; + +import javafx.event.ActionEvent; +import javafx.fxml.FXML; +import javafx.fxml.FXMLLoader; +import javafx.fxml.Initializable; +import javafx.scene.layout.BorderPane; +import javafx.scene.layout.VBox; +import nl.isygameclient.util.StageHandler; +import nl.isygameclient.views.NavButtonControl; + +import java.io.IOException; +import java.net.URL; +import java.util.Map; +import java.util.ResourceBundle; +import java.util.TreeMap; + +public class AppController implements Initializable { + + private final TreeMap<Integer, NavButtonControl> navButtons = new TreeMap<>(Map.ofEntries( + Map.entry(0, new NavButtonControl("Store", "LOCAL_MALL", null)), + Map.entry(1, new NavButtonControl("Library", "GAMES", "/nl/isygameclient/views/game-library.fxml")), + Map.entry(2, new NavButtonControl("Community", "QUESTION_ANSWER", null)), + Map.entry(3, new NavButtonControl("Servers", "FORMAT_LIST_BULLETED", null)) + )); + private NavButtonControl activeButton; + @FXML + public BorderPane app; + @FXML + private VBox navBar; + + @Override + public void initialize(URL url, ResourceBundle resourceBundle) { + navButtons.forEach((index, button) -> { + button.setOnAction(this::onNavButtonPress); + navBar.getChildren().add(button); + }); + + activeButton = navButtons.get(1); + activeButton.activate(); + loadScene(activeButton.getSource()); + } + + @FXML + public void onNavButtonPress(ActionEvent e) { + var newButton = (NavButtonControl) e.getSource(); + activeButton.deactivate(); + activeButton = newButton; + newButton.activate(); + + loadScene(activeButton.getSource()); + } + + @FXML + public void onSettingsButtonPressed(){ + loadScene("/nl/isygameclient/views/app-settings.fxml"); + } + + private void loadScene(String path) { + app.getChildren().remove(app.getCenter()); + + if (path == null) return; + + URL url = StageHandler.class.getResource(path); + FXMLLoader fxmlLoader = new FXMLLoader(url); + try { + app.setCenter(fxmlLoader.load()); + } catch (IOException e) { + e.printStackTrace(); + } + } +} diff --git a/src/main/java/nl/isygameclient/controllers/AppSettingsController.java b/src/main/java/nl/isygameclient/controllers/AppSettingsController.java @@ -0,0 +1,13 @@ +package nl.isygameclient.controllers; + +import javafx.fxml.Initializable; + +import java.net.URL; +import java.util.ResourceBundle; + +public class AppSettingsController implements Initializable { + @Override + public void initialize(URL url, ResourceBundle resourceBundle) { + + } +} diff --git a/src/main/java/nl/isygameclient/controllers/Components/CustomRoundedImageControl.java b/src/main/java/nl/isygameclient/controllers/Components/CustomRoundedImageControl.java @@ -1,9 +0,0 @@ -package nl.isygameclient.controllers.Components; - -import javafx.scene.layout.AnchorPane; -public class CustomRoundedImageControl extends AnchorPane { - - public CustomRoundedImageControl() { - super(); - } -} -\ No newline at end of file diff --git a/src/main/java/nl/isygameclient/controllers/Components/RoundedImageController.java b/src/main/java/nl/isygameclient/controllers/Components/RoundedImageController.java @@ -1,5 +0,0 @@ -package nl.isygameclient.controllers.Components; - -public class RoundedImageController{ - -} -\ No newline at end of file diff --git a/src/main/java/nl/isygameclient/controllers/GameCardController.java b/src/main/java/nl/isygameclient/controllers/GameCardController.java @@ -1,4 +0,0 @@ -package nl.isygameclient.controllers; - -public class GameCardController { -} diff --git a/src/main/java/nl/isygameclient/controllers/GameLibraryController.java b/src/main/java/nl/isygameclient/controllers/GameLibraryController.java @@ -1,21 +1,47 @@ package nl.isygameclient.controllers; -import javafx.collections.ObservableList; -import javafx.event.ActionEvent; +import com.jfoenix.controls.JFXButton; +import com.jfoenix.controls.JFXTextField; +import javafx.beans.binding.Bindings; +import javafx.collections.FXCollections; +import javafx.collections.transformation.FilteredList; import javafx.fxml.FXML; import javafx.fxml.Initializable; +import javafx.scene.layout.FlowPane; +import nl.isygameclient.views.GameCardControl; import java.net.URL; import java.util.ResourceBundle; +import static nl.isygameclient.Application.GAMES; + public class GameLibraryController implements Initializable { + @FXML + public FlowPane gameCards; + @FXML + public JFXTextField searchTextField; + @FXML + public JFXButton searchButton; + @FXML + public JFXButton searchClear; + @FXML + public JFXButton searchOptions; + private FilteredList<GameCardControl> filteredList; @Override public void initialize(URL url, ResourceBundle resourceBundle) { + filteredList = new FilteredList<>(FXCollections.observableList(GAMES)); + searchTextField.textProperty().addListener((observable, oldValue, newValue) -> { + String searchText = searchTextField.getText().toLowerCase(); + filteredList.setPredicate(n -> n.getGameTitle().toLowerCase().contains(searchText)); + }); + Bindings.bindContent(gameCards.getChildren(), filteredList); + } + @FXML + protected void onClearSearchButtonClick() { + searchTextField.clear(); } - public void onStartGameButtonClick(ActionEvent e) { - } } \ No newline at end of file diff --git a/src/main/java/nl/isygameclient/controllers/game_selector/GameCardController.java b/src/main/java/nl/isygameclient/controllers/game_selector/GameCardController.java @@ -1,45 +0,0 @@ -//package nl.isygameclient.controllers.game_selector; -// -//import javafx.fxml.FXML; -//import javafx.scene.control.Label; -//import javafx.scene.image.Image; -//import javafx.scene.image.ImageView; -//import javafx.scene.input.MouseEvent; -//import nl.isygameclient.Application; -// -//public class GameCardController { -// -// privat e GameCard gameCard; -// -// @FXML -// private ImageView gameImage; -// -// @FXML -// private Label gameTitle; -// -// public void initializeCard(GameCard gameCard) { -// this.gameCard = gameCard; -// // Set Title -// gameTitle.setText(gameCard.getName()); -// loadImage(); -// } -// -// public void loadImage() { -// // Load Image -// if (gameCard.getImgSrc() != null) { -// var imageSrc = Application.class.getResource(gameCard.getImgSrc()); -// if (imageSrc != null) { -// gameImage.setImage(new Image(imageSrc.toExternalForm())); -// } else { -// System.err.printf("Image for: %s at %s, doen not exist\n", gameCard.getName(), gameCard.getImgSrc()); -// } -// } else { -// System.err.printf("ImgSrc for: %s, not provided\n", gameCard.getName()); -// } -// } -// -// @FXML -// protected void onCardMouseClick(MouseEvent event) { -// GameSelectorController.onGameClick(event, gameCard); -// } -//} diff --git a/src/main/java/nl/isygameclient/controllers/game_selector/GameSelectorController.java b/src/main/java/nl/isygameclient/controllers/game_selector/GameSelectorController.java @@ -1,109 +0,0 @@ -//package nl.isygameclient.controllers.game_selector; -// -//import javafx.collections.FXCollections; -//import javafx.fxml.FXML; -//import javafx.fxml.FXMLLoader; -//import javafx.fxml.Initializable; -//import javafx.scene.Node; -//import javafx.scene.control.ListCell; -//import javafx.scene.control.ListView; -//import javafx.scene.control.TextField; -//import javafx.scene.input.MouseEvent; -//import javafx.scene.layout.FlowPane; -//import javafx.scene.layout.VBox; -//import nl.isygameclient.Application; -//import nl.isygameclient.util.SettingsFileHandler; -//import nl.isygameclient.util.StageHandler; -// -//import java.io.IOException; -//import java.net.URL; -//import java.util.List; -//import java.util.ResourceBundle; -//import java.util.stream.Collectors; -// -//public class GameSelectorController implements Initializable { -// -// private final List<GameCard> gameCards = SettingsFileHandler.load().gameCards; -// -// @FXML -// public TextField searchBox; -// @FXML -// public ListView<GameCard> gamesList; -// @FXML -// public VBox gameDetail; -// -// @FXML -// public FlowPane gameContainer; -// -// public static void onGameClick(MouseEvent event, GameCard gameCard) { -// var stageHandler = StageHandler.get(); -// var stageName = "Game"; -// if (event.getClickCount() == 2 && gameCard.getViewSrc() != null && !stageHandler.getStage(stageName).isShowing()) { -// stageHandler.changeSceneOfStage(stageName, gameCard.getViewSrc()); -// var stage = stageHandler.getStage(stageName); -// stage.setTitle(gameCard.getName()); -// stage.show(); -// stageHandler.iconifyStage("GameSelector"); -// } -// } -// -// @Override -// public void initialize(URL url, ResourceBundle resourceBundle) { -// initializeGamesListView(); -// initializeGamesListCells(); -// initializeGameCards(); -// } -// -// private void initializeGamesListView() { -// gamesList.setItems(FXCollections.observableList(gameCards)); -// searchBox.textProperty().addListener((observable, oldValue, newValue) -> { -// var filteredList = FXCollections.observableList(filterGameCards(newValue)); -// gamesList.setItems(filteredList); -// }); -// } -// -// private void initializeGamesListCells() { -// gamesList.setCellFactory(lv -> { -// ListCell<GameCard> listCell = new ListCell<>() { -// @Override -// protected void updateItem(GameCard item, boolean empty) { -// super.updateItem(item, empty); -// -// if (empty || item == null || item.getName() == null) { -// setText(null); -// } else { -// setText(item.getName()); -// } -// } -// }; -// listCell.setOnMouseClicked((event) -> { -// GameCard gameCard = listCell.getItem(); -// onGameClick(event, gameCard); -// }); -// return listCell; -// }); -// } -// -// private void initializeGameCards() { -// try { -// for (GameCard gameCard : gameCards) { -// FXMLLoader fxmlLoader = new FXMLLoader(Application.class.getResource("views/game_selector/GameCard.fxml")); -// Node node = fxmlLoader.load(); -// GameCardController controller = fxmlLoader.getController(); -// controller.initializeCard(gameCard); -// gameContainer.getChildren().add(node); -// } -// } catch (IOException e) { -// e.printStackTrace(); -// } -// } -// -// private List<GameCard> filterGameCards(String value) { -// return gameCards.stream().filter(gameCard -> gameCard.getName().contains(value)).collect(Collectors.toList()); -// } -// -// @FXML -// protected void onClearSearchButtonClick() { -// searchBox.clear(); -// } -//} diff --git a/src/main/java/nl/isygameclient/controllers/games/GameController.java b/src/main/java/nl/isygameclient/controllers/games/GameController.java @@ -1,6 +1,7 @@ package nl.isygameclient.controllers.games; import javafx.fxml.FXML; +import nl.isygameclient.Window; import nl.isygameclient.models.Game; import nl.isygameclient.util.StageHandler; @@ -10,8 +11,8 @@ public abstract class GameController { @FXML protected void onExitButtonClick() { - var settingsHandler = StageHandler.get(); - settingsHandler.getStage("Game").hide(); - settingsHandler.focusStage("GameSelector"); + var stageHandler = StageHandler.get(); + stageHandler.getStage(Window.GAME).hide(); + stageHandler.focusStage(Window.APP); } } diff --git a/src/main/java/nl/isygameclient/controllers/games/othello/OthelloSinglePlayerController.java b/src/main/java/nl/isygameclient/controllers/games/othello/OthelloSinglePlayerController.java @@ -8,24 +8,48 @@ import javafx.scene.layout.GridPane; import javafx.scene.paint.Color; import javafx.scene.shape.Circle; import nl.isygameclient.controllers.games.GameController; +import nl.isygameclient.models.Ai; +import nl.isygameclient.models.Player; +import nl.isygameclient.models.PlayerManager; +import nl.isygameclient.models.games.Othello; import nl.isygameclient.util.Vector2D; import java.net.URL; import java.util.*; import java.util.stream.Stream; -public class OthelloSinglePlayerController extends GameController implements Initializable { +public class OthelloSinglePlayerController extends GameController implements Initializable { private JFXButton[][] boardButtons; @FXML private GridPane boardGrid; + + private int[][] heuristics = { + {4, 3, 3, 3, 3, 3, 3, 4}, + {3, 2, 2, 2, 2, 2, 2, 3}, + {3, 2, 1, 1, 1, 1, 2, 3}, + {3, 2, 1, 1, 1, 1, 2, 3}, + {3, 2, 1, 1, 1, 1, 2, 3}, + {3, 2, 1, 1, 1, 1, 2, 3}, + {3, 2, 2, 2, 2, 2, 2, 3}, + {4, 3, 3, 3, 3, 3, 3, 4} + }; + + private boolean hasClicked = false; + private Vector2D<Integer, Integer> clickedPos; @Override public void initialize(URL url, ResourceBundle resourceBundle) { -// var players = List.of(new Player("player1", "white"), new Player("player2", "black")); -// var manager = new PlayerManager(0, new ArrayList<>(players)); -// game = new Othello(manager); + var player = new Player("player1", "white") { + @Override + public Vector2D<Integer, Integer> onPlayerTurn() { + return clickedPos; + } + }; + var players = List.of( player, new Ai("player2", "black", heuristics)); + var manager = new PlayerManager(0, new ArrayList<>(players)); + game = new Othello(manager); initializeBoard(); updateButtons(); } @@ -126,5 +150,4 @@ public class OthelloSinglePlayerController extends GameController implements Ini } public void onMainMenuButtonClick(ActionEvent actionEvent) { } - } diff --git a/src/main/java/nl/isygameclient/controllers/games/tictactoe/TicTacToeMainMenuController.java b/src/main/java/nl/isygameclient/controllers/games/tictactoe/TicTacToeMainMenuController.java @@ -1,18 +1,19 @@ package nl.isygameclient.controllers.games.tictactoe; import javafx.fxml.FXML; +import nl.isygameclient.Window; import nl.isygameclient.controllers.games.GameController; import nl.isygameclient.util.StageHandler; public class TicTacToeMainMenuController extends GameController { @FXML public void onSinglePlayerButtonClick() { - StageHandler.get().changeSceneOfStage("Game", "views/Games/TicTacToe/TicTacToeSinglePlayer.fxml"); + StageHandler.get().changeSceneOfStage(Window.GAME, "views/games/TicTacToe/TicTacToeSinglePlayer.fxml"); } @FXML public void onMultiplayerButtonClick() { - StageHandler.get().changeSceneOfStage("Game","views/Games/TicTacToe/TicTacToeMultiPlayer.fxml"); + StageHandler.get().changeSceneOfStage(Window.GAME,"views/games/TicTacToe/TicTacToeMultiPlayer.fxml"); } } diff --git a/src/main/java/nl/isygameclient/controllers/games/tictactoe/TicTacToeMultiPlayerController.java b/src/main/java/nl/isygameclient/controllers/games/tictactoe/TicTacToeMultiPlayerController.java @@ -14,6 +14,7 @@ import javafx.fxml.Initializable; import javafx.scene.control.Label; import javafx.scene.control.TextField; import javafx.scene.layout.GridPane; +import nl.isygameclient.Window; import nl.isygameclient.controllers.games.GameController; import nl.isygameclient.network.GameClient; import nl.isygameclient.network.GameType; @@ -197,6 +198,6 @@ public class TicTacToeMultiPlayerController extends GameController implements Ru @FXML protected void onMainMenuButtonClick() { - StageHandler.get().changeSceneOfStage("Game","views/Games/TicTacToe/TicTacToeMainMenu.fxml"); + StageHandler.get().changeSceneOfStage(Window.GAME,"views/games/TicTacToe/TicTacToeMainMenu.fxml"); } } diff --git a/src/main/java/nl/isygameclient/controllers/games/tictactoe/TicTacToeSinglePlayerController.java b/src/main/java/nl/isygameclient/controllers/games/tictactoe/TicTacToeSinglePlayerController.java @@ -10,6 +10,7 @@ import javafx.event.ActionEvent; import javafx.fxml.FXML; import javafx.scene.control.Label; import javafx.scene.layout.GridPane; +import nl.isygameclient.Window; import nl.isygameclient.controllers.games.GameController; import nl.isygameclient.util.StageHandler; import nl.isygameclient.util.Vector2D; @@ -135,6 +136,6 @@ public class TicTacToeSinglePlayerController extends GameController { @FXML protected void onMainMenuButtonClick() { - StageHandler.get().changeSceneOfStage("Game","views/Games/TicTacToe/TicTacToeMainMenu.fxml"); + StageHandler.get().changeSceneOfStage(Window.GAME,"views/games/TicTacToe/TicTacToeMainMenu.fxml"); } } diff --git a/src/main/java/nl/isygameclient/models/Ai.java b/src/main/java/nl/isygameclient/models/Ai.java @@ -1,7 +1,14 @@ package nl.isygameclient.models; +import com.google.gson.Gson; +import com.google.gson.reflect.TypeToken; import nl.isygameclient.util.Vector2D; +import java.io.IOException; +import java.lang.reflect.Type; +import java.nio.file.Files; +import java.nio.file.NoSuchFileException; +import java.nio.file.Paths; import java.util.*; public class Ai extends Player{ @@ -15,6 +22,21 @@ public class Ai extends Player{ this.heuristics = heuristics; } + public static Map<String, int[][]> loadHeuristics(String fileName) { + try { + Type mapType = new TypeToken<Map<String, int[][]>>() { + }.getType(); + String inFile = new String(Files.readAllBytes(Paths.get(fileName))); + return new Gson().fromJson(inFile, mapType); + } catch (NoSuchFileException e) { + System.err.println("NO HEURISTICS JSON HAS BEEN PROVIDED."); + e.printStackTrace(); + } catch (IOException e) { + e.printStackTrace(); + } + return null; + } + public static <T> T randomMove(Collection<T> possibleMoves) { int size = possibleMoves.size(); int item = new Random().nextInt(size); // In real life, the Random object should be rather more shared than this @@ -128,6 +150,4 @@ public class Ai extends Player{ public void setHeuristics(int[][] heuristics) { this.heuristics = heuristics; } - - } diff --git a/src/main/java/nl/isygameclient/models/settings/Settings.java b/src/main/java/nl/isygameclient/models/settings/Settings.java @@ -1,19 +0,0 @@ -package nl.isygameclient.models.settings; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.Map; - - -/** - * This Class holds default settings for the application. - * It also provides the format of the settings that are saved to a file. - * - * @author A F Koens - */ -public class Settings { - public Map<String, StageSettings> stages = new HashMap<>(); - - public boolean tournamentMode = false; -} diff --git a/src/main/java/nl/isygameclient/models/settings/StageSettings.java b/src/main/java/nl/isygameclient/models/settings/StageSettings.java @@ -1,61 +0,0 @@ -package nl.isygameclient.models.settings; - -import javafx.stage.Stage; - -public class StageSettings { - public String Title = "ISYGameClient"; - public double x = 0; - public double y = 0; - public double width = 680; - public double height = 480; - public double minWidth = 0; - public double minHeight = 0; - public double maxWidth = 1.7976931348623157E308; - public double maxHeight = 1.7976931348623157E308; - public boolean isIconified = false; - public boolean isAlwaysOnTop = false; - public boolean isFullScreen = true; - public boolean isResizable = true; - public boolean isMaximized = false; - public boolean isShowing = false; - - - public static StageSettings createSettingsFromStage(Stage stage) { - var stageSettings = new StageSettings(); - stageSettings.Title = stage.getTitle(); - stageSettings.x = stage.getX(); - stageSettings.y = stage.getY(); - stageSettings.width = stage.getWidth(); - stageSettings.height = stage.getHeight(); - stageSettings.minWidth = stage.getMinWidth(); - stageSettings.minHeight = stage.getMinHeight(); - stageSettings.maxWidth = stage.getMaxWidth(); - stageSettings.maxHeight = stage.getMaxHeight(); - stageSettings.isIconified = stage.isIconified(); - stageSettings.isAlwaysOnTop = stage.isAlwaysOnTop(); - stageSettings.isFullScreen = stage.isFullScreen(); - stageSettings.isResizable = stage.isResizable(); - stageSettings.isMaximized = stage.isMaximized(); - stageSettings.isShowing = stage.isShowing(); - return stageSettings; - } - - public static Stage configureStageFromSettings(StageSettings stageSettings) { - Stage stage = new Stage(); - stage.setTitle(stageSettings.Title); - stage.setX(stageSettings.x); - stage.setY(stageSettings.y); - stage.setWidth(stageSettings.width); - stage.setHeight(stageSettings.height); - stage.setMinWidth(stageSettings.minWidth); - stage.setMinHeight(stageSettings.minHeight); - stage.setMaxWidth(stageSettings.maxWidth); - stage.setMaxHeight(stageSettings.maxHeight); - stage.setIconified(stageSettings.isIconified); - stage.setAlwaysOnTop(stageSettings.isAlwaysOnTop); - stage.setFullScreen(stageSettings.isFullScreen); - stage.setResizable(stageSettings.isResizable); - stage.setMaximized(stageSettings.isMaximized); - return stage; - } -} diff --git a/src/main/java/nl/isygameclient/settings/Settings.java b/src/main/java/nl/isygameclient/settings/Settings.java @@ -0,0 +1,20 @@ +package nl.isygameclient.settings; + +import nl.isygameclient.Window; + +import java.util.HashMap; +import java.util.Map; + + +/** + * This Class holds default settings for the application. + * It also provides the format of the settings that are saved to a file. + * + * @author A F Koens + */ +public class Settings { + public Map<Window, StageSettings> stages = new HashMap<>(); + + public boolean darkMode = true; + public boolean tournamentMode = false; +} diff --git a/src/main/java/nl/isygameclient/settings/StageSettings.java b/src/main/java/nl/isygameclient/settings/StageSettings.java @@ -0,0 +1,61 @@ +package nl.isygameclient.settings; + +import javafx.stage.Stage; + +public class StageSettings { + public String Title = "ISYGameClient"; + public double x = 0; + public double y = 0; + public double width = 680; + public double height = 480; + public double minWidth = 0; + public double minHeight = 0; + public double maxWidth = 1.7976931348623157E308; + public double maxHeight = 1.7976931348623157E308; + public boolean isIconified = false; + public boolean isAlwaysOnTop = false; + public boolean isFullScreen = true; + public boolean isResizable = true; + public boolean isMaximized = true; + public boolean isShowing = false; + + + public static StageSettings createSettingsFromStage(Stage stage) { + var stageSettings = new StageSettings(); + stageSettings.Title = stage.getTitle(); + stageSettings.x = stage.getX(); + stageSettings.y = stage.getY(); + stageSettings.width = stage.getWidth(); + stageSettings.height = stage.getHeight(); + stageSettings.minWidth = stage.getMinWidth(); + stageSettings.minHeight = stage.getMinHeight(); + stageSettings.maxWidth = stage.getMaxWidth(); + stageSettings.maxHeight = stage.getMaxHeight(); + stageSettings.isIconified = stage.isIconified(); + stageSettings.isAlwaysOnTop = stage.isAlwaysOnTop(); + stageSettings.isFullScreen = stage.isFullScreen(); + stageSettings.isResizable = stage.isResizable(); + stageSettings.isMaximized = stage.isMaximized(); + stageSettings.isShowing = stage.isShowing(); + return stageSettings; + } + + public static Stage configureStageFromSettings(StageSettings stageSettings) { + Stage stage = new Stage(); + stage.setTitle(stageSettings.Title); + stage.setX(stageSettings.x); + stage.setY(stageSettings.y); + stage.setWidth(stageSettings.width); + stage.setHeight(stageSettings.height); + stage.setMinWidth(stageSettings.minWidth); + stage.setMinHeight(stageSettings.minHeight); + stage.setMaxWidth(stageSettings.maxWidth); + stage.setMaxHeight(stageSettings.maxHeight); + stage.setIconified(stageSettings.isIconified); + stage.setAlwaysOnTop(stageSettings.isAlwaysOnTop); + stage.setFullScreen(stageSettings.isFullScreen); + stage.setResizable(stageSettings.isResizable); + stage.setMaximized(stageSettings.isMaximized); + return stage; + } +} diff --git a/src/main/java/nl/isygameclient/util/SettingsFileHandler.java b/src/main/java/nl/isygameclient/util/SettingsFileHandler.java @@ -2,7 +2,7 @@ package nl.isygameclient.util; import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import nl.isygameclient.models.settings.Settings; +import nl.isygameclient.settings.Settings; import java.io.FileWriter; import java.io.IOException; diff --git a/src/main/java/nl/isygameclient/util/StageHandler.java b/src/main/java/nl/isygameclient/util/StageHandler.java @@ -3,15 +3,16 @@ package nl.isygameclient.util; import javafx.fxml.FXMLLoader; import javafx.scene.Scene; import javafx.stage.Stage; -import nl.isygameclient.models.settings.Settings; -import nl.isygameclient.models.settings.StageSettings; +import nl.isygameclient.Window; +import nl.isygameclient.settings.Settings; +import nl.isygameclient.settings.StageSettings; import java.io.IOException; import java.util.HashMap; import java.util.Map; -import static nl.isygameclient.models.settings.StageSettings.configureStageFromSettings; -import static nl.isygameclient.models.settings.StageSettings.createSettingsFromStage; +import static nl.isygameclient.settings.StageSettings.configureStageFromSettings; +import static nl.isygameclient.settings.StageSettings.createSettingsFromStage; /** * This class is a singleton that stores and manages all the active stages in the application. @@ -19,7 +20,7 @@ import static nl.isygameclient.models.settings.StageSettings.createSettingsFromS */ public class StageHandler { private static StageHandler instance; - private final Map<String, Stage> stages = new HashMap<>(); + private final Map<Window, Stage> stages = new HashMap<>(); private StageHandler() { } @@ -40,7 +41,7 @@ public class StageHandler { * @param stageName the key for map of stages. * @return a stage object. */ - public Stage getStage(String stageName) { + public Stage getStage(Window stageName) { Stage stage = stages.get(stageName); if (stage == null) stage = new Stage(); stages.put(stageName, stage); @@ -51,7 +52,7 @@ public class StageHandler { * This function is for iconifying also known as minifying a stage window. * @param stageName the key for map of stages. */ - public void iconifyStage(String stageName) { + public void iconifyStage(Window stageName) { stages.get(stageName).setIconified(true); } @@ -59,7 +60,7 @@ public class StageHandler { * This function is for bringing a stage into view and focussing on it. * @param stageName the key for map of stages. */ - public void focusStage(String stageName) { + public void focusStage(Window stageName) { Stage stage = stages.get(stageName); stage.setIconified(false); stage.show(); @@ -71,14 +72,15 @@ public class StageHandler { * @param stageName the key for map of stages. * @param viewSource the source of the nieuw view for the scene. */ - public void changeSceneOfStage(String stageName, String viewSource) { + public void changeSceneOfStage(Window stageName, String viewSource) { Stage stage = getStage(stageName); try { - FXMLLoader fxmlSceneLoader = new FXMLLoader(getClass().getResource("/nl/isygameclient/" + viewSource)); + FXMLLoader fxmlSceneLoader = new FXMLLoader(getClass().getResource(viewSource)); Scene scene = new Scene(fxmlSceneLoader.load()); stage.setScene(scene); } catch (IOException e) { e.printStackTrace(); + throw new RuntimeException(e); } } @@ -87,7 +89,7 @@ public class StageHandler { */ public void loadStages() { Settings settings = SettingsFileHandler.load(); - for (Map.Entry<String, StageSettings> entry : settings.stages.entrySet()) { + for (Map.Entry<Window, StageSettings> entry : settings.stages.entrySet()) { stages.put(entry.getKey(), configureStageFromSettings(entry.getValue())); } } @@ -97,11 +99,9 @@ public class StageHandler { */ public void saveStages() { Settings settings = SettingsFileHandler.load(); - for (Map.Entry<String, Stage> entry : stages.entrySet()) { + for (Map.Entry<Window, Stage> entry : stages.entrySet()) { settings.stages.put(entry.getKey(), createSettingsFromStage(entry.getValue())); } SettingsFileHandler.save(settings); } - - } diff --git a/src/main/java/nl/isygameclient/views/GameCardControl.java b/src/main/java/nl/isygameclient/views/GameCardControl.java @@ -0,0 +1,76 @@ +package nl.isygameclient.views; + +import com.jfoenix.controls.JFXButton; +import javafx.beans.NamedArg; +import javafx.event.ActionEvent; +import javafx.fxml.FXML; +import javafx.fxml.FXMLLoader; +import javafx.fxml.Initializable; +import javafx.scene.control.Label; +import javafx.scene.image.Image; +import javafx.scene.image.ImageView; +import javafx.scene.layout.VBox; +import nl.isygameclient.Window; +import nl.isygameclient.util.StageHandler; + +import java.io.IOException; +import java.io.InputStream; +import java.net.URL; +import java.util.ResourceBundle; + +public class GameCardControl extends VBox implements Initializable { + + private final String gameTitle; + private final String gameImageUrl; + private final String gameSource; + + @FXML + private Label label; + + @FXML + private JFXButton button; + + @FXML + private ImageView imageView; + + + public GameCardControl(@NamedArg("gameTitle") String gameTitle, @NamedArg("gameImageUrl") String gameImageUrl, @NamedArg("gameSource") String gameSource) { + this.gameTitle = gameTitle; + this.gameImageUrl = gameImageUrl; + this.gameSource = gameSource; + + URL url = getClass().getResource("/nl/isygameclient/views/game-card.fxml"); + FXMLLoader fxmlLoader = new FXMLLoader(url); + fxmlLoader.setRoot(this); + fxmlLoader.setController(this); + + try { + fxmlLoader.load(); + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void initialize(URL url, ResourceBundle resourceBundle) { + this.label.textProperty().set(gameTitle); + + InputStream imageURL = getClass().getResourceAsStream(gameImageUrl); + if (imageURL != null) { + Image image = new Image(imageURL, 250, 200, false, false); + this.imageView.setImage(image); + } + + button.setOnAction(this::onStartGameButtonClick); + } + + public void onStartGameButtonClick(ActionEvent e) { + var stageHandler = StageHandler.get(); + stageHandler.changeSceneOfStage(Window.GAME, gameSource); + stageHandler.focusStage(Window.GAME); + } + + public String getGameTitle() { + return gameTitle; + } +} diff --git a/src/main/java/nl/isygameclient/views/NavButtonControl.java b/src/main/java/nl/isygameclient/views/NavButtonControl.java @@ -0,0 +1,55 @@ +package nl.isygameclient.views; + +import com.jfoenix.controls.JFXButton; +import de.jensd.fx.glyphs.materialicons.MaterialIconView; +import javafx.beans.NamedArg; +import javafx.fxml.FXML; +import javafx.fxml.FXMLLoader; +import javafx.fxml.Initializable; + +import java.io.IOException; +import java.net.URL; +import java.util.ResourceBundle; + +public class NavButtonControl extends JFXButton implements Initializable { + + private final String glyphName; + private final String source; + + @FXML + private MaterialIconView iconView; + + public NavButtonControl(@NamedArg("text") String text, @NamedArg("glyphName") String glyphName, @NamedArg("source") String source) { + super(text); + this.glyphName = glyphName; + this.source = source; + + URL url = getClass().getResource("/nl/isygameclient/views/nav-button.fxml"); + FXMLLoader fxmlLoader = new FXMLLoader(url); + fxmlLoader.setRoot(this); + fxmlLoader.setController(this); + + try { + fxmlLoader.load(); + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void initialize(URL url, ResourceBundle resourceBundle) { + iconView.setGlyphName(this.glyphName); + } + + public void activate() { + this.getStyleClass().add("active"); + } + + public void deactivate() { + this.getStyleClass().remove("active"); + } + + public String getSource() { + return source; + } +} diff --git a/src/main/resources/nl/isygameclient/css/style.css b/src/main/resources/nl/isygameclient/css/style.css @@ -96,3 +96,7 @@ .play-arrow .icon { -fx-fill: -positive; } + +.othello-button { + -fx-background-color: #388E3C; +} diff --git a/src/main/resources/nl/isygameclient/views/Components/RoundedImage.fxml b/src/main/resources/nl/isygameclient/views/Components/RoundedImage.fxml @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<?import javafx.scene.layout.Pane?> - - -<fx:root maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1"> - - -</fx:root> diff --git a/src/main/resources/nl/isygameclient/views/app-settings.fxml b/src/main/resources/nl/isygameclient/views/app-settings.fxml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?import javafx.scene.layout.*?> + +<AnchorPane xmlns="http://javafx.com/javafx" + xmlns:fx="http://javafx.com/fxml" + fx:controller="nl.isygameclient.controllers.AppSettingsController" + prefHeight="400.0" prefWidth="600.0"> + +</AnchorPane> diff --git a/src/main/resources/nl/isygameclient/views/app.fxml b/src/main/resources/nl/isygameclient/views/app.fxml @@ -5,42 +5,18 @@ <?import java.lang.String?> <?import java.net.URL?> <?import javafx.geometry.Insets?> +<?import javafx.scene.Cursor?> <?import javafx.scene.layout.BorderPane?> <?import javafx.scene.layout.HBox?> <?import javafx.scene.layout.Region?> <?import javafx.scene.layout.VBox?> -<BorderPane prefHeight="1024.0" prefWidth="1440.0" styleClass="background" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1"> +<BorderPane fx:id="app" prefHeight="1024.0" prefWidth="1440.0" styleClass="background" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" +fx:controller="nl.isygameclient.controllers.AppController"> <left> <VBox alignment="CENTER_LEFT" prefHeight="994.0" prefWidth="200.0" spacing="15.0" BorderPane.alignment="CENTER_LEFT"> <children> - <JFXButton alignment="CENTER" prefHeight="50.0" prefWidth="200.0" text="Store"> - <graphic> - <MaterialIconView glyphName="LOCAL_MALL"> - <styleClass> - <String fx:value="icon" /> - </styleClass> - </MaterialIconView> - </graphic> - <styleClass> - <String fx:value="nav-button" /> - <String fx:value="active" /> - <String fx:value="headline-small" /> - </styleClass> - </JFXButton> - <JFXButton alignment="CENTER" layoutX="80.0" layoutY="10.0" prefHeight="50.0" prefWidth="200.0" text="Library"> - <graphic> - <MaterialIconView glyphName="GAMES"> - <styleClass> - <String fx:value="icon" /> - </styleClass> - </MaterialIconView> - </graphic> - <styleClass> - <String fx:value="nav-button" /> - <String fx:value="headline-small" /> - </styleClass> - </JFXButton> + <VBox fx:id="navBar" spacing="15.0"/> <Region prefHeight="200.0" prefWidth="200.0" VBox.vgrow="ALWAYS" /> <HBox alignment="CENTER_LEFT" prefHeight="60.0"> <children> @@ -48,12 +24,18 @@ <graphic> <MaterialIconView glyphName="ACCOUNT_CIRCLE" size="30" styleClass="icon" /> </graphic> + <cursor> + <Cursor fx:constant="HAND" /> + </cursor> </JFXButton> <Region HBox.hgrow="ALWAYS" /> - <JFXButton alignment="CENTER" contentDisplay="CENTER" prefHeight="50.0" prefWidth="50.0" styleClass="settings" text=""> + <JFXButton onAction="#onSettingsButtonPressed" alignment="CENTER" contentDisplay="CENTER" prefHeight="50.0" prefWidth="50.0" styleClass="settings"> <graphic> <MaterialIconView glyphName="SETTINGS" size="30" styleClass="surface-text" /> </graphic> + <cursor> + <Cursor fx:constant="HAND" /> + </cursor> </JFXButton> </children> <padding> @@ -77,12 +59,11 @@ </VBox> </left> <center> - <fx:include source="game-library.fxml" /> </center> <stylesheets> <URL value="@../css/style.css" /> <URL value="@../css/themes/dark.theme.css" /> - <URL value="@../css/themes/light.theme.css" /> + <!-- <URL value="@../css/themes/light.theme.css" />--> </stylesheets> <padding> <Insets bottom="15.0" left="15.0" right="15.0" top="15.0" /> diff --git a/src/main/resources/nl/isygameclient/views/game-card.fxml b/src/main/resources/nl/isygameclient/views/game-card.fxml @@ -1,14 +1,44 @@ <?xml version="1.0" encoding="UTF-8"?> -<?import java.lang.*?> -<?import java.util.*?> -<?import javafx.scene.*?> -<?import javafx.scene.control.*?> -<?import javafx.scene.layout.*?> +<?import com.jfoenix.controls.JFXButton?> +<?import de.jensd.fx.glyphs.materialicons.MaterialIconView?> +<?import java.lang.String?> +<?import javafx.geometry.Insets?> +<?import javafx.scene.Cursor?> +<?import javafx.scene.control.Label?> +<?import javafx.scene.image.ImageView?> +<?import javafx.scene.layout.HBox?> +<?import javafx.scene.layout.VBox?> -<AnchorPane xmlns="http://javafx.com/javafx" - xmlns:fx="http://javafx.com/fxml" - fx:controller="nl.isygameclient.controllers.GameCardController" - prefHeight="400.0" prefWidth="600.0"> - -</AnchorPane> +<fx:root type="javafx.scene.layout.VBox" prefHeight="300.0" prefWidth="200.0" xmlns="http://javafx.com/javafx/19" + xmlns:fx="http://javafx.com/fxml/1"> + <children> + <ImageView fx:id="imageView" fitHeight="250.0" fitWidth="200.0" pickOnBounds="true"/> + <HBox alignment="CENTER_LEFT" prefHeight="50.0" prefWidth="200.0" spacing="15.0"> + <children> + <JFXButton fx:id="button" alignment="CENTER" contentDisplay="CENTER" minHeight="-Infinity" minWidth="-Infinity" + prefHeight="40.0" prefWidth="40.0" styleClass="play-arrow"> + <graphic> + <MaterialIconView glyphName="PLAY_ARROW" size="30" styleClass="icon"/> + </graphic> + <cursor> + <Cursor fx:constant="HAND"/> + </cursor> + </JFXButton> + <Label fx:id="label"> + <styleClass> + <String fx:value="title-medium"/> + <String fx:value="on-surface-text"/> + </styleClass> + </Label> + </children> + <padding> + <Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/> + </padding> + </HBox> + </children> + <styleClass> + <String fx:value="on-surface"/> + <String fx:value="rounded"/> + </styleClass> +</fx:root> diff --git a/src/main/resources/nl/isygameclient/views/game-library.fxml b/src/main/resources/nl/isygameclient/views/game-library.fxml @@ -5,129 +5,83 @@ <?import de.jensd.fx.glyphs.materialicons.MaterialIconView?> <?import java.lang.String?> <?import javafx.geometry.Insets?> -<?import javafx.geometry.Rectangle2D?> -<?import javafx.scene.control.Label?> +<?import javafx.scene.Cursor?> <?import javafx.scene.control.ScrollPane?> -<?import javafx.scene.image.Image?> -<?import javafx.scene.image.ImageView?> <?import javafx.scene.layout.BorderPane?> <?import javafx.scene.layout.FlowPane?> <?import javafx.scene.layout.HBox?> -<?import javafx.scene.layout.VBox?> -<ScrollPane fitToHeight="true" fitToWidth="true" hbarPolicy="NEVER" prefWidth="1200.0" styleClass="transparent" vbarPolicy="NEVER" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1"> - <content> - <BorderPane styleClass="transparent"> - <top> - <HBox alignment="CENTER" spacing="15" BorderPane.alignment="CENTER"> - <children> - <HBox alignment="CENTER" prefWidth="500.0" spacing="5.0" styleClass="search-bar"> - <children> - <JFXButton alignment="CENTER" contentDisplay="CENTER" minHeight="-Infinity" minWidth="-Infinity" prefHeight="40.0" prefWidth="40.0" styleClass="search-loop" text=""> - <graphic> - <MaterialIconView glyphName="SEARCH" size="30" styleClass="icon" /> - </graphic> - </JFXButton> - <JFXTextField promptText="Search" HBox.hgrow="ALWAYS"> - <styleClass> - <String fx:value="search-textfield" /> - <String fx:value="title-medium" /> - </styleClass></JFXTextField> - <JFXButton minHeight="-Infinity" minWidth="-Infinity" prefHeight="40.0" prefWidth="40.0" styleClass="search-close" text=""> - <graphic> - <MaterialIconView glyphName="CLOSE" size="30" styleClass="icon" /> - </graphic> - </JFXButton> - <JFXButton minHeight="-Infinity" minWidth="-Infinity" prefHeight="40.0" prefWidth="40.0" styleClass="search-options" text=""> - <graphic> - <MaterialIconView glyphName="TUNE" size="30" styleClass="icon" /> - </graphic> - </JFXButton> - </children> - <HBox.margin> - <Insets /> - </HBox.margin> - <padding> - <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" /> - </padding> - </HBox> - </children> - <BorderPane.margin> - <Insets bottom="15.0" /> - </BorderPane.margin> - </HBox> - </top> - <center> - <FlowPane fx:id="games" hgap="15.0" prefHeight="200.0" prefWidth="200.0" vgap="15.0" BorderPane.alignment="CENTER"> - <padding> - <Insets bottom="15.0" left="15.0" right="15.0" top="15.0" /> - </padding> - <children> - <VBox prefHeight="300.0" prefWidth="200.0"> - <children> - <ImageView fitHeight="250.0" fitWidth="200.0" pickOnBounds="true"> - <image> - <Image url="@../imgs/tictactoe_logo.png" /> - </image> - <viewport> - <Rectangle2D height="316.0" minX="50.0" minY="30.0" width="296.0" /> - </viewport> - </ImageView> - <HBox alignment="CENTER_LEFT" prefHeight="50.0" prefWidth="200.0" spacing="15.0"> - <children> - <JFXButton alignment="CENTER" contentDisplay="CENTER" minHeight="-Infinity" minWidth="-Infinity" prefHeight="40.0" prefWidth="40.0" styleClass="play-arrow" text=""> - <graphic> - <MaterialIconView glyphName="PLAY_ARROW" size="30" styleClass="icon" /> - </graphic> - </JFXButton> - <Label styleClass="title-medium" text="Tic Tac Toe" /> - </children> - <padding> - <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" /> - </padding> +<ScrollPane fitToHeight="true" fitToWidth="true" hbarPolicy="NEVER" prefWidth="1200.0" styleClass="transparent" + vbarPolicy="NEVER" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="nl.isygameclient.controllers.GameLibraryController"> + <content> + <BorderPane styleClass="transparent"> + <top> + <HBox alignment="CENTER" spacing="15" BorderPane.alignment="CENTER"> + <children> + <HBox alignment="CENTER" prefWidth="500.0" spacing="5.0" styleClass="search-bar"> + <children> + <JFXButton fx:id="searchButton" alignment="CENTER" contentDisplay="CENTER" minHeight="-Infinity" + minWidth="-Infinity" prefHeight="40.0" prefWidth="40.0" + styleClass="search-loop" disable="true"> + <graphic> + <MaterialIconView glyphName="SEARCH" size="30" styleClass="icon"/> + </graphic> + <cursor> + <Cursor fx:constant="HAND"/> + </cursor> + </JFXButton> + <JFXTextField fx:id="searchTextField" promptText="Search" HBox.hgrow="ALWAYS"> + <styleClass> + <String fx:value="search-textfield"/> + <String fx:value="title-medium"/> + </styleClass> + </JFXTextField> + <JFXButton fx:id="searchClear" onAction="#onClearSearchButtonClick" minHeight="-Infinity" minWidth="-Infinity" prefHeight="40.0" prefWidth="40.0" + styleClass="search-close"> + <graphic> + <MaterialIconView glyphName="CLOSE" size="30" styleClass="icon"/> + </graphic> + <cursor> + <Cursor fx:constant="HAND"/> + </cursor> + </JFXButton> + <JFXButton fx:id="searchOptions" minHeight="-Infinity" minWidth="-Infinity" prefHeight="40.0" prefWidth="40.0" + styleClass="search-options"> + <graphic> + <MaterialIconView glyphName="TUNE" size="30" styleClass="icon"/> + </graphic> + <cursor> + <Cursor fx:constant="HAND"/> + </cursor> + </JFXButton> + </children> + <HBox.margin> + <Insets/> + </HBox.margin> + <padding> + <Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/> + </padding> </HBox> - </children> - <styleClass> - <String fx:value="on-surface" /> - <String fx:value="rounded" /> - </styleClass> - </VBox> - <VBox layoutX="25.0" layoutY="25.0" prefHeight="300.0" prefWidth="200.0"> - <children> - <ImageView fitHeight="250.0" fitWidth="200.0" pickOnBounds="true"> - <image> - <Image url="@../imgs/othello_logo.png" /> - </image> - <viewport> - <Rectangle2D height="290.0" minX="10.0" width="280.0" /> - </viewport> - </ImageView> - <HBox alignment="CENTER_LEFT" prefHeight="50.0" prefWidth="200.0" spacing="15.0"> - <children> - <JFXButton alignment="CENTER" contentDisplay="CENTER" minHeight="-Infinity" minWidth="-Infinity" prefHeight="40.0" prefWidth="40.0" styleClass="play-arrow" text=""> - <graphic> - <MaterialIconView glyphName="PLAY_ARROW" size="30" styleClass="icon" /> - </graphic> - </JFXButton> - <Label styleClass="title-medium" text="Othello" /> - </children> - <padding> - <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" /> - </padding> - </HBox> - </children> - <styleClass> - <String fx:value="on-surface" /> - <String fx:value="rounded" /> - </styleClass> - </VBox> - </children> - <styleClass> - <String fx:value="surface" /> - <String fx:value="rounded" /> - </styleClass> - </FlowPane> - </center> - </BorderPane> - </content> + </children> + <BorderPane.margin> + <Insets bottom="15.0"/> + </BorderPane.margin> + </HBox> + </top> + <center> + <FlowPane fx:id="gameCards" hgap="15.0" prefHeight="200.0" prefWidth="200.0" vgap="15.0" + BorderPane.alignment="CENTER" > + <padding> + <Insets bottom="15.0" left="15.0" right="15.0" top="15.0"/> + </padding> + <styleClass> + <String fx:value="surface"/> + <String fx:value="rounded"/> + </styleClass> + </FlowPane> + </center> + <left> + </left> + </BorderPane> + </content> </ScrollPane> diff --git a/src/main/resources/nl/isygameclient/views/games/othello/OthelloSinglePlayer.fxml b/src/main/resources/nl/isygameclient/views/games/othello/OthelloSinglePlayer.fxml @@ -1,55 +1,60 @@ <?xml version="1.0" encoding="UTF-8"?> -<?import java.lang.*?> -<?import javafx.scene.layout.*?> - -<?import javafx.geometry.Insets?> <?import com.jfoenix.controls.JFXButton?> -<BorderPane xmlns="http://javafx.com/javafx" - xmlns:fx="http://javafx.com/fxml" - stylesheets="@../../../css/views/othello.css" - fx:controller="nl.isygameclient.controllers.games.othello.OthelloSinglePlayerController" - prefHeight="400.0" prefWidth="600.0"> +<?import java.lang.String?> +<?import java.net.URL?> +<?import javafx.geometry.Insets?> +<?import javafx.scene.layout.BorderPane?> +<?import javafx.scene.layout.GridPane?> +<?import javafx.scene.layout.Pane?> +<?import javafx.scene.layout.VBox?> + +<BorderPane prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="nl.isygameclient.controllers.games.othello.OthelloSinglePlayerController"> <styleClass> - <String fx:value="surface"/> + <String fx:value="background" /> </styleClass> <left> - <VBox prefWidth="200" styleClass="surface-variant" spacing="20"> + <VBox prefWidth="200" spacing="20" styleClass="surface"> <padding> - <Insets topRightBottomLeft="20"/> + <Insets topRightBottomLeft="20" /> </padding> <!-- Window Controls --> - <Pane VBox.vgrow="ALWAYS"/> - <VBox spacing="10" alignment="CENTER"> - <JFXButton text="New Game" onAction="#onNewGameButtonClick" prefWidth="Infinity"> + <Pane VBox.vgrow="ALWAYS" /> + <VBox alignment="CENTER" spacing="10"> + <JFXButton onAction="#onNewGameButtonClick" prefWidth="Infinity" text="New Game"> <styleClass> - <String fx:value="primary"/> - <String fx:value="on-primary-text"/> - <String fx:value="title-medium"/> + <String fx:value="primary" /> + <String fx:value="primary-text" /> + <String fx:value="title-medium" /> </styleClass> </JFXButton> - <JFXButton text="Main Menu" onAction="#onMainMenuButtonClick" prefWidth="Infinity"> + <JFXButton onAction="#onMainMenuButtonClick" prefWidth="Infinity" text="Main Menu"> <styleClass> - <String fx:value="primary"/> - <String fx:value="on-primary-text"/> - <String fx:value="title-medium"/> + <String fx:value="primary" /> + <String fx:value="primary-text" /> + <String fx:value="title-medium" /> </styleClass> </JFXButton> - <JFXButton text="Exit" onAction="#onExitButtonClick" prefWidth="Infinity"> + <JFXButton onAction="#onExitButtonClick" prefWidth="Infinity" text="Exit"> <styleClass> - <String fx:value="primary"/> - <String fx:value="on-primary-text"/> - <String fx:value="title-medium"/> + <String fx:value="primary" /> + <String fx:value="primary-text" /> + <String fx:value="title-medium" /> </styleClass> </JFXButton> </VBox> </VBox> </left> <center> - <GridPane fx:id="boardGrid" alignment="CENTER" vgap="2" hgap="2"> + <GridPane fx:id="boardGrid" alignment="CENTER" hgap="2" vgap="2"> <padding> - <Insets topRightBottomLeft="10"/> + <Insets topRightBottomLeft="10" /> </padding> </GridPane> </center> + <stylesheets> + <URL value="@../../../css/style.css" /> + <URL value="@../../../css/themes/dark.theme.css" /> + <!-- <URL value="@../../../css/themes/light.theme.css" />--> + </stylesheets> </BorderPane> diff --git a/src/main/resources/nl/isygameclient/views/games/tictactoe/TicTacToeMainMenu.fxml b/src/main/resources/nl/isygameclient/views/games/tictactoe/TicTacToeMainMenu.fxml @@ -7,7 +7,8 @@ <?import javafx.scene.layout.AnchorPane?> <?import javafx.scene.layout.VBox?> <?import java.lang.*?> -<AnchorPane stylesheets="@../../../css/theme.css" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml" +<?import java.net.URL?> +<AnchorPane xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml" fx:controller="nl.isygameclient.controllers.games.tictactoe.TicTacToeMainMenuController" prefWidth="680" prefHeight="480"> <VBox alignment="CENTER" AnchorPane.rightAnchor="0" AnchorPane.leftAnchor="0" AnchorPane.bottomAnchor="0" AnchorPane.topAnchor="0"> @@ -47,4 +48,9 @@ </JFXButton> </VBox> </VBox> + <stylesheets> + <URL value="@../../../css/style.css" /> + <URL value="@../../../css/themes/dark.theme.css" /> + <!-- <URL value="@../css/themes/light.theme.css" />--> + </stylesheets> </AnchorPane> diff --git a/src/main/resources/nl/isygameclient/views/games/tictactoe/TicTacToeMultiPlayer.fxml b/src/main/resources/nl/isygameclient/views/games/tictactoe/TicTacToeMultiPlayer.fxml @@ -6,7 +6,8 @@ <?import javafx.scene.layout.*?> <?import java.lang.*?> -<BorderPane stylesheets="@../../../css/theme.css" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="nl.isygameclient.controllers.games.tictactoe.TicTacToeMultiPlayerController"> +<?import java.net.URL?> +<BorderPane xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="nl.isygameclient.controllers.games.tictactoe.TicTacToeMultiPlayerController"> <styleClass> <String fx:value="surface" /> </styleClass> @@ -192,4 +193,9 @@ </VBox> </HBox> </center> + <stylesheets> + <URL value="@../../../css/style.css" /> + <URL value="@../../../css/themes/dark.theme.css" /> + <!-- <URL value="@../css/themes/light.theme.css" />--> + </stylesheets> </BorderPane> \ No newline at end of file diff --git a/src/main/resources/nl/isygameclient/views/games/tictactoe/TicTacToeSinglePlayer.fxml b/src/main/resources/nl/isygameclient/views/games/tictactoe/TicTacToeSinglePlayer.fxml @@ -5,7 +5,8 @@ <?import javafx.scene.control.*?> <?import javafx.scene.layout.*?> <?import java.lang.*?> -<BorderPane stylesheets="@../../../css/theme.css" xmlns="http://javafx.com/javafx/16" xmlns:fx="http://javafx.com/fxml/1" +<?import java.net.URL?> +<BorderPane xmlns="http://javafx.com/javafx/16" xmlns:fx="http://javafx.com/fxml/1" fx:controller="nl.isygameclient.controllers.games.tictactoe.TicTacToeSinglePlayerController"> <styleClass> <String fx:value="surface"/> @@ -193,4 +194,9 @@ </VBox> </HBox> </center> + <stylesheets> + <URL value="@../../../css/style.css" /> + <URL value="@../../../css/themes/dark.theme.css" /> + <!-- <URL value="@../css/themes/light.theme.css" />--> + </stylesheets> </BorderPane> diff --git a/src/main/resources/nl/isygameclient/views/nav-button.fxml b/src/main/resources/nl/isygameclient/views/nav-button.fxml @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<?import de.jensd.fx.glyphs.materialicons.MaterialIconView?> +<?import java.lang.String?> +<?import javafx.scene.Cursor?> + + +<fx:root type="com.jfoenix.controls.JFXButton" alignment="CENTER" layoutX="80.0" layoutY="10.0" prefHeight="50.0" + prefWidth="200.0" xmlns="http://javafx.com/javafx/19" + xmlns:fx="http://javafx.com/fxml/1"> + <graphic> + <MaterialIconView fx:id="iconView"> + <styleClass> + <String fx:value="icon"/> + </styleClass> + </MaterialIconView> + </graphic> + <styleClass> + <String fx:value="nav-button"/> + <String fx:value="headline-small"/> + </styleClass> + <cursor> + <Cursor fx:constant="HAND"/> + </cursor> +</fx:root>