commit 2418cea1a688c2457133921c94081480bcabe442 parent 5e3986e678c7e2d2f4d0b11057a7bf3ecbaecd46 Author: A Koens <[email protected]> Date: Tue, 25 Oct 2022 19:50:36 +0200 Squashed commit of the following: commit 8528158fbb3efcb721e7fedd87f80e4968aeb580 Author: A Koens <[email protected]> Date: Tue Oct 25 19:50:20 2022 +0200 Finished Game Menu & TTT Singleplayer commit 5209f2c4ad2af4597fb308c1b3948bc50155322a Author: A Koens <[email protected]> Date: Mon Oct 24 22:41:43 2022 +0200 Dynamically adding games To Menu Got it working so that the games from settings are dynamically added as fxml cards. commit 559ef5c4477e3e213928a3ff340161ac3500ae0b Author: A Koens <[email protected]> Date: Mon Oct 24 15:25:17 2022 +0200 Tic Tac Toe ComboBox commit 36ec0e280df4ca39c27bdf5433db1d598d190e9f Author: A Koens <[email protected]> Date: Mon Oct 24 14:26:58 2022 +0200 Tic Tac Toe Playable Tic Tac Toe can now be played properly. The buttons disable when the game is over. Also added some new GUI Elements, not all working yet. Diffstat:
27 files changed, 1010 insertions(+), 509 deletions(-)
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java @@ -1,21 +1,34 @@ module nl.isygameclient { + + // JavaFX - FXMl requires javafx.fxml; requires javafx.controls; requires org.controlsfx.controls; + + // Material Design requires de.jensd.fx.glyphs.fontawesome; requires de.jensd.fx.glyphs.materialicons; requires de.jensd.fx.glyphs.commons; requires com.jfoenix; + // Json Class Data Saving + requires com.google.gson; - + // Data Access Generation requires static lombok; - requires com.google.gson; exports nl.isygameclient; - exports nl.isygameclient.controllers; + // Controllers + exports nl.isygameclient.controllers.TicTacToeGame; + exports nl.isygameclient.controllers.GameSeletorMenu; + + // Models exports nl.isygameclient.models; + exports nl.isygameclient.util; + opens nl.isygameclient to javafx.fxml; opens nl.isygameclient.util to com.google.gson; - opens nl.isygameclient.controllers to javafx.fxml; + + opens nl.isygameclient.controllers.GameSeletorMenu to javafx.fxml; + opens nl.isygameclient.controllers.TicTacToeGame to javafx.fxml; } \ No newline at end of file diff --git a/src/main/java/nl/isygameclient/Application.java b/src/main/java/nl/isygameclient/Application.java @@ -1,57 +1,87 @@ package nl.isygameclient; -import java.io.IOException; import javafx.fxml.FXMLLoader; import javafx.scene.Scene; import javafx.stage.Stage; import nl.isygameclient.util.Settings; import nl.isygameclient.util.SettingsHandler; +import java.io.IOException; + public class Application extends javafx.application.Application { - private static final String SETTINGS_FILENAME = "settings.json"; - private Stage primaryStage; + public static Stage primaryStage; + public static Stage gameStage; + + public static void changeGameScene(String viewSrc) throws IOException { + FXMLLoader fxmlSceneLoader = new FXMLLoader(Application.class.getResource(viewSrc)); + Scene scene = new Scene(fxmlSceneLoader.load()); + gameStage.setScene(scene); + gameStage.show(); + primaryStage.setIconified(true); + } + + public static void closeGameScene() { + gameStage.hide(); + primaryStage.setIconified(false); + } + + public static void openMainMenu() throws IOException { + FXMLLoader fxmlSceneLoader = new FXMLLoader(Application.class.getResource("views/GameSelectorMenu/GameSelectorMenu.fxml")); + Scene scene = new Scene(fxmlSceneLoader.load()); + primaryStage.setScene(scene); + } + + public static void main(String[] args) { + launch(); + } + + @Override + public void start(Stage stage) throws IOException { + primaryStage = stage; + gameStage = new Stage(); + openMainMenu(); + loadSettings(); - @Override - public void start(Stage stage) throws IOException { - primaryStage = stage; + // Save Values on Close + primaryStage.setOnCloseRequest((windowEvent) -> saveSettings()); - // Load Settings - SettingsHandler settingsHandler = new SettingsHandler(); - Settings settings = settingsHandler.load(SETTINGS_FILENAME); + gameStage.setOnCloseRequest((windowEvent -> closeGameScene())); - // Load Scene - FXMLLoader fxmlLoader = new FXMLLoader(getClass().getResource("views/TicTacToeGame.fxml")); - Scene scene = new Scene(fxmlLoader.load()); - primaryStage.setScene(scene); + primaryStage.show(); + } - // Set Initial Values - primaryStage.setTitle(settings.title); - primaryStage.setFullScreen(settings.isFullScreen); - primaryStage.setMaximized(settings.isMaximized); - primaryStage.setWidth(settings.screenWidth); - primaryStage.setHeight(settings.screenHeight); + private void loadSettings() { + // Load Settings from file + Settings settings = SettingsHandler.load(); - // Save Values on Close - primaryStage.setOnCloseRequest((windowEvent) -> { - settings.screenWidth = primaryStage.getWidth(); - settings.screenHeight = primaryStage.getHeight(); - settings.isFullScreen = primaryStage.isFullScreen(); - settings.isMaximized = primaryStage.isMaximized(); - settingsHandler.save(SETTINGS_FILENAME, settings); - }); + // Set Initial Values + primaryStage.setTitle(settings.title); + primaryStage.setFullScreen(settings.isFullScreen); + primaryStage.setMaximized(settings.isMaximized); + primaryStage.setWidth(settings.screenWidth); + primaryStage.setHeight(settings.screenHeight); + primaryStage.setX(settings.screenX); + primaryStage.setY(settings.screenY); + } - primaryStage.show(); - } + private void saveSettings() { + // Load Settings from file + Settings settings = SettingsHandler.load(); - public Stage getPrimaryStage() { - return primaryStage; - } + settings.screenWidth = primaryStage.getWidth(); + settings.screenHeight = primaryStage.getHeight(); + settings.isFullScreen = primaryStage.isFullScreen(); + settings.isMaximized = primaryStage.isMaximized(); + settings.screenX = primaryStage.getX(); + settings.screenY = primaryStage.getY(); + SettingsHandler.save(settings); + } - public static void main(String[] args) { - launch(); - } + public Stage getPrimaryStage() { + return primaryStage; + } } \ No newline at end of file diff --git a/src/main/java/nl/isygameclient/controllers/GameController.java b/src/main/java/nl/isygameclient/controllers/GameController.java @@ -1,7 +0,0 @@ -package nl.isygameclient.controllers; - -public interface GameController { - void start(); - void reset(); - void stop(); -} diff --git a/src/main/java/nl/isygameclient/controllers/GameSelectorMenuController.java b/src/main/java/nl/isygameclient/controllers/GameSelectorMenuController.java @@ -1,70 +0,0 @@ -package nl.isygameclient.controllers; - -import com.jfoenix.controls.JFXButton; -import javafx.application.Platform; -import javafx.collections.FXCollections; -import javafx.collections.ObservableList; -import javafx.event.ActionEvent; -import javafx.fxml.FXML; -import javafx.fxml.FXMLLoader; -import javafx.scene.Node; -import javafx.scene.Scene; -import javafx.scene.control.ListView; -import javafx.scene.control.TextField; -import javafx.scene.layout.AnchorPane; -import javafx.scene.layout.GridPane; -import javafx.scene.layout.HBox; -import javafx.scene.layout.VBox; -import nl.isygameclient.Application; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; - -public class GameSelectorMenuController { - - @FXML - public TextField searchBox; - - @FXML - public ListView<String> gamesList; - private final List<String> games = List.of("Tic Tac Toe", "Othello"); - - @FXML - public VBox gameDetail; - - @FXML - public VBox gameContainer; - - public GameSelectorMenuController() { - } - - @FXML - protected void initialize() throws IOException { - gamesList.setItems(FXCollections.observableList(games)); - searchBox.textProperty().addListener((observable, oldValue, newValue) -> { - gamesList.setItems(filterList(games, newValue)); - - }); - for (String game : games) { - System.out.println(game); - } - - } - - public void onClearSearchButtonClick() { - searchBox.clear(); - } - - private boolean searchFindsOrder(String game, String searchText) { - return (game.toLowerCase().contains(searchText.toLowerCase())); - } - - private ObservableList<String> filterList(List<String> list, String searchText) { - List<String> filteredList = new ArrayList<>(); - for (String game : list) { - if (searchFindsOrder(game, searchText)) filteredList.add(game); - } - return FXCollections.observableList(filteredList); - } -} diff --git a/src/main/java/nl/isygameclient/controllers/GameSeletorMenu/GameCardController.java b/src/main/java/nl/isygameclient/controllers/GameSeletorMenu/GameCardController.java @@ -0,0 +1,51 @@ +package nl.isygameclient.controllers.GameSeletorMenu; + +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; +import nl.isygameclient.util.Settings; + +import java.io.IOException; + +public class GameCardController { + + private Settings.GameCard gameCard; + + @FXML + private ImageView gameImage; + + @FXML + private Label gameTitle; + + public void initializeCard(Settings.GameCard gameCard) { + this.gameCard = gameCard; + // Set Title + gameTitle.setText(gameCard.name); + loadImage(); + } + + public void loadImage() { + // Load Image + if (gameCard.imgSrc != null) { + var imageSrc = Application.class.getResource(gameCard.imgSrc); + if (imageSrc != null) { + gameImage.setImage(new Image(imageSrc.toExternalForm())); + } else { + System.err.printf("Image for: %s at %s, doen not exist\n", gameCard.name, gameCard.imgSrc); + } + } else { + System.err.printf("ImgSrc for: %s, not provided\n", gameCard.name); + } + } + + @FXML + protected void onCardMouseClick(MouseEvent event) throws IOException { + if (event.getClickCount() == 2 && gameCard.viewSrc != null && !Application.gameStage.isShowing()) { + Application.changeGameScene(gameCard.viewSrc); + Application.gameStage.setTitle(gameCard.name); + } + } +} diff --git a/src/main/java/nl/isygameclient/controllers/GameSeletorMenu/GameSelectorMenuController.java b/src/main/java/nl/isygameclient/controllers/GameSeletorMenu/GameSelectorMenuController.java @@ -0,0 +1,94 @@ +package nl.isygameclient.controllers.GameSeletorMenu; + +import javafx.collections.FXCollections; +import javafx.collections.ObservableList; +import javafx.fxml.FXML; +import javafx.fxml.FXMLLoader; +import javafx.scene.Node; +import javafx.scene.control.ListCell; +import javafx.scene.control.ListView; +import javafx.scene.control.TextField; +import javafx.scene.layout.FlowPane; +import javafx.scene.layout.VBox; +import nl.isygameclient.Application; +import nl.isygameclient.util.Settings; +import nl.isygameclient.util.SettingsHandler; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; + +public class GameSelectorMenuController { + + private final List<Settings.GameCard> gameCards = SettingsHandler.load().gameCards; + + @FXML + public TextField searchBox; + @FXML + public ListView<Settings.GameCard> gamesList; + @FXML + public VBox gameDetail; + + @FXML + public FlowPane gameContainer; + + @FXML + protected void initialize() throws IOException { + initializeGamesListView(); + initializeGamesListCells(); + initializeGameCards(); + } + + private void initializeGamesListView() { + gamesList.setItems(FXCollections.observableList(gameCards)); + searchBox.textProperty().addListener((observable, oldValue, newValue) -> { + var filteredList = FXCollections.observableList(gameCards.stream().filter(gameCard -> gameCard.name.contains(newValue)).collect(Collectors.toList())); + gamesList.setItems(filteredList); + }); + } + + private void initializeGamesListCells() { + gamesList.setCellFactory(lv -> { + ListCell<Settings.GameCard> listCell = new ListCell<>() { + @Override + protected void updateItem(Settings.GameCard item, boolean empty) { + super.updateItem(item, empty); + + if (empty || item == null || item.name == null) { + setText(null); + } else { + setText(item.name); + } + } + }; + listCell.setOnMouseClicked((event) -> { + if (event.getClickCount() == 2 && !gamesList.getItems().isEmpty() && listCell.getItem().viewSrc != null && !Application.gameStage.isShowing()) { + try { + Settings.GameCard gameCard = listCell.getItem(); + Application.changeGameScene(gameCard.viewSrc); + Application.gameStage.setTitle(gameCard.name); + } catch (IOException e) { + e.printStackTrace(); + } + } + }); + return listCell; + }); + } + + private void initializeGameCards() throws IOException { + for (Settings.GameCard gameCard : gameCards) { + FXMLLoader fxmlLoader = new FXMLLoader(Application.class.getResource("views/GameSelectorMenu/GameCard.fxml")); + Node node = fxmlLoader.load(); + GameCardController controller = fxmlLoader.getController(); + controller.initializeCard(gameCard); + gameContainer.getChildren().add(node); + } + } + + @FXML + protected void onClearSearchButtonClick() { + searchBox.clear(); + } +} diff --git a/src/main/java/nl/isygameclient/controllers/TicTacToeGame/TicTacToeMainMenuController.java b/src/main/java/nl/isygameclient/controllers/TicTacToeGame/TicTacToeMainMenuController.java @@ -0,0 +1,25 @@ +package nl.isygameclient.controllers.TicTacToeGame; + +import javafx.event.ActionEvent; +import javafx.fxml.FXML; +import nl.isygameclient.Application; + +import java.io.IOException; + +public class TicTacToeMainMenuController { + + @FXML + public void onSinglePlayerButtonClick(ActionEvent event) throws IOException { + Application.changeGameScene("views/TicTacToe/TicTacToeSinglePlayer.fxml"); + } + + @FXML + public void onMultiplayerButtonClick(ActionEvent event) { + //TODO Open multiplayer Scene + } + + @FXML + public void onExitButtonClick(ActionEvent event) throws IOException { + Application.closeGameScene(); + } +} diff --git a/src/main/java/nl/isygameclient/controllers/TicTacToeGame/TicTacToeSinglePlayerController.java b/src/main/java/nl/isygameclient/controllers/TicTacToeGame/TicTacToeSinglePlayerController.java @@ -0,0 +1,165 @@ +package nl.isygameclient.controllers.TicTacToeGame; + +import com.jfoenix.controls.JFXButton; +import com.jfoenix.controls.JFXComboBox; +import javafx.event.ActionEvent; +import javafx.fxml.FXML; +import javafx.scene.control.Label; +import javafx.scene.layout.GridPane; +import nl.isygameclient.Application; +import nl.isygameclient.models.TicTacToe; + +import java.io.IOException; +import java.util.ArrayList; + +public class TicTacToeSinglePlayerController { + + private final ArrayList<JFXButton> boardButtons = new ArrayList<>(); + + @FXML + public JFXComboBox<String> difficultyCombo; + @FXML + public JFXComboBox<String> playingAsCombo; + @FXML + public JFXComboBox<String> opponentCombo; + + @FXML + protected Label currentPlayer; + @FXML + public Label gameOverText; + + @FXML + protected GridPane grid; + + private TicTacToe ttt = new TicTacToe(); + + @FXML + protected void initialize() { + initializeBoard(); + initializeDifficultyCombo(); + initializePlayingAsCombo(); + initializeOpponentCombo(); + updateCurrentPlayerLabel(); + } + + private void initializeDifficultyCombo() { + difficultyCombo.getItems().setAll("Easy", "Medium", "Hard"); + difficultyCombo.getSelectionModel().selectFirst(); + } + + private void initializePlayingAsCombo() { + playingAsCombo.getItems().setAll(ttt.getPlayers()); + playingAsCombo.getSelectionModel().selectFirst(); + } + + private void initializeOpponentCombo() { + opponentCombo.getItems().setAll("Human", "AI"); + opponentCombo.getSelectionModel().selectFirst(); + } + + private void initializeBoard() { + for (int i = 0; i < TicTacToe.BOARD_SIZE; i++) { + for (int j = 0; j < TicTacToe.BOARD_SIZE; j++) { + JFXButton button = new JFXButton(); + button.setId(String.valueOf(i + j * TicTacToe.BOARD_SIZE)); + button.setMinSize(200.0, 200.0); + var styleClass = button.getStyleClass(); + styleClass.add("ttt-button"); + styleClass.add("display-large"); + button.setOnAction((ActionEvent event) -> onMoveButtonClick(button)); + boardButtons.add(button); + grid.add(button, i, j); + } + } + } + + private void updateCurrentPlayerLabel() { + currentPlayer.setText(ttt.getCurrentPlayer()); + } + + private void onMoveButtonClick(JFXButton button) { + // Move + int pos = Integer.parseInt(button.getId()); + if (ttt.isMoveValid(pos)) { + ttt.move(pos); + button.setText(ttt.getCurrentPlayer()); + ttt.nextPlayer(); + updateCurrentPlayerLabel(); + } + + // Game Over + if (ttt.isGameOver()) { + onGameOver(); + } + } + + // TODO Create Game-over Modal + private void onGameOver() { + disableBoardButtons(); + System.out.println("Game Over"); + if (ttt.isDraw()) { + System.out.println("Draw!"); + gameOverText.setText("Draw!"); + gameOverText.setVisible(true); + } else { + System.out.printf("%s, Is the Winner!\n\n", ttt.getWinner()); + gameOverText.setText(String.format("%s, is the Winner!\n\n", ttt.getWinner())); + gameOverText.setVisible(true); + } + } + + private void clearBoardButtons() { + for (JFXButton button : boardButtons) { + button.setText(""); + } + } + + private void disableBoardButtons() { + for (JFXButton button : boardButtons) { + button.setDisable(true); + } + } + + private void enableBoardButtons() { + for (JFXButton button : boardButtons) { + button.setDisable(false); + } + } + + @FXML + protected void onDifficultyComboSelect() { + System.out.printf("Difficulty Changed to: %s\n", difficultyCombo.getValue()); + + } + + @FXML + protected void onPlayingAsComboSelect() { + System.out.printf("Now playing As: %s\n", playingAsCombo.getValue()); + + } + + @FXML + protected void onOpponentComboSelect() { + System.out.printf("Opponent Changed to: %s\n", opponentCombo.getValue()); + } + + @FXML + protected void onNewGameButtonClick() { + // Make new Game + ttt = new TicTacToe(); + + clearBoardButtons(); + enableBoardButtons(); + gameOverText.setVisible(false); + } + + @FXML + protected void onMainMenuButtonClick() throws IOException { + Application.changeGameScene("views/TicTacToe/TicTacToeMainMenu.fxml"); + } + + @FXML + protected void onExitButtonClick() throws IOException { + Application.closeGameScene(); + } +} diff --git a/src/main/java/nl/isygameclient/controllers/TicTacToeGameController.java b/src/main/java/nl/isygameclient/controllers/TicTacToeGameController.java @@ -1,70 +0,0 @@ -package nl.isygameclient.controllers; - -import com.jfoenix.controls.JFXButton; -import javafx.event.ActionEvent; -import javafx.fxml.FXML; -import javafx.scene.layout.GridPane; -import nl.isygameclient.models.TicTacToe; - -import java.util.ArrayList; - -public class TicTacToeGameController { - - private TicTacToe ttt = new TicTacToe(); - - private final ArrayList<JFXButton> buttons = new ArrayList<>(); - - @FXML - public GridPane grid; - - @FXML - protected void initialize() { - for (int i = 0; i < TicTacToe.BOARD_SIZE; i++) { - for (int j = 0; j < TicTacToe.BOARD_SIZE; j++) { - JFXButton button = new JFXButton(); - button.setId(String.valueOf(i + j * TicTacToe.BOARD_SIZE)); - button.setPrefSize(200.0, 200.0); - button.getStyleClass().add("ttt-button"); - button.setOnAction((ActionEvent event) -> { - onMoveButtonClick(button); - }); - buttons.add(button); - grid.add(button, i, j); - } - } - } - - - private void onMoveButtonClick(JFXButton button) { - // Game Over - if (ttt.isGameOver()) { - System.out.println("Game Over"); - String winner = ttt.getWinner(); - if (winner == null) { - System.out.println("Draw!"); - } else { - System.out.printf("%s, Is the Winner!", winner); - } - } else { - // Move - int pos = Integer.parseInt(button.getId()); - System.out.println(pos); - if (ttt.isMoveValid(pos)) { - ttt.move(pos); - button.setText(ttt.getCurrentPlayer()); - ttt.nextPlayer(); - } - } - } - - @FXML - protected void onNewGameButtonClick(ActionEvent event) { - // Make new Game - ttt = new TicTacToe(); - - // Clear Buttons - for (JFXButton button : buttons) { - button.setText(""); - } - } -} diff --git a/src/main/java/nl/isygameclient/models/Difficulty.java b/src/main/java/nl/isygameclient/models/Difficulty.java @@ -0,0 +1,8 @@ +package nl.isygameclient.models; + +public enum Difficulty { + EASY("Easy"), MEDIUM("Medium"), HARD("Hard"); + + Difficulty(String difficulty) { + } +} diff --git a/src/main/java/nl/isygameclient/models/Game.java b/src/main/java/nl/isygameclient/models/Game.java @@ -2,6 +2,8 @@ package nl.isygameclient.models; import lombok.Data; +import java.util.Arrays; + @Data public abstract class Game { @@ -13,9 +15,7 @@ public abstract class Game { this.players = players; } - /*** - parameters - ***/ + public abstract void move(int pos); public abstract boolean isMoveValid(int pos); @@ -34,4 +34,12 @@ public abstract class Game { public String getCurrentPlayer() { return players[currentPlayerIndex]; } + + public void setCurrentPlayerIndex(int playerIndex) { + this.currentPlayerIndex = playerIndex; + } + + public void setCurrentPlayer(String player) { + currentPlayerIndex = Arrays.asList(players).indexOf(player); + } } diff --git a/src/main/java/nl/isygameclient/models/TicTacToe.java b/src/main/java/nl/isygameclient/models/TicTacToe.java @@ -1,6 +1,9 @@ package nl.isygameclient.models; +import java.util.ArrayList; +import java.util.Arrays; + public class TicTacToe extends Game { public static final int BOARD_SIZE = 3; @@ -19,15 +22,18 @@ public class TicTacToe extends Game { board[pos] = players[currentPlayerIndex]; } - - private boolean isDraw(){ - for (String position : board) { - if (position == null) return false; + public ArrayList<Integer> getPossibleMoves() { + ArrayList<Integer> possibleMoves = new ArrayList<>(); + for (int i=0; i < board.length; i++) { + if (isMoveValid(i)) possibleMoves.add(i); } - return true; + return possibleMoves; + } + + public boolean isDraw(){ + return !Arrays.asList(board).contains(null); } - // TODO Draw Condition When board is full public boolean isGameOver() { return getWinner() != null || isDraw(); } diff --git a/src/main/java/nl/isygameclient/util/Settings.java b/src/main/java/nl/isygameclient/util/Settings.java @@ -9,6 +9,26 @@ public class Settings { public boolean isFullScreen = true; public boolean isMaximized = false; public double screenHeight = 680.0; - public double screenWidth = 480.0; - public ArrayList<String> games = new ArrayList<>(Arrays.asList("TicTacToe", "Othello", "Starvation")); + public double screenWidth = 770.0; + public double screenX = 0; + public double screenY = 0; + + public boolean tournamentMode = false; + + public ArrayList<GameCard> gameCards = new ArrayList<>(Arrays.asList( + new GameCard("TicTacToe", "views/TicTacToe/TicTacToeMainMenu.fxml", "images/tictactoe_logo.png"), + new GameCard("Othello", null, "images/othello_logo.png"), + new GameCard("Starvation", null, null))); + + public static class GameCard { + public String name; + public String viewSrc; + public String imgSrc; + + public GameCard(String name, String viewSrc, String imgSrc) { + this.name = name; + this.viewSrc = viewSrc; + this.imgSrc = imgSrc; + } + } } diff --git a/src/main/java/nl/isygameclient/util/SettingsHandler.java b/src/main/java/nl/isygameclient/util/SettingsHandler.java @@ -7,18 +7,18 @@ import java.io.FileWriter; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Paths; -import java.util.ArrayList; -import java.util.Arrays; -public class SettingsHandler { - public void save(String filename, Settings settings) { +public abstract class SettingsHandler { + public static final String SETTINGS_FILENAME = "settings.json"; + + public static void save(Settings settings) { try { Gson gson = new GsonBuilder() .setPrettyPrinting() .create(); - FileWriter writer = new FileWriter(filename); + FileWriter writer = new FileWriter(SETTINGS_FILENAME); writer.write(gson.toJson(settings)); writer.close(); } catch (IOException e) { @@ -26,18 +26,19 @@ public class SettingsHandler { } } - public Settings load(String filename) { + public static Settings load() { try { Gson gson = new GsonBuilder() .setPrettyPrinting() .create(); - String inFile = new String(Files.readAllBytes(Paths.get(filename))); + String inFile = new String(Files.readAllBytes(Paths.get(SETTINGS_FILENAME))); return gson.fromJson(inFile, Settings.class); } catch (IOException e) { - e.printStackTrace(); System.err.println("Could Not Load Settings File, Using Defaults Instead"); - return new Settings(); + var defaults = new Settings(); + save(defaults); + return defaults; } } } diff --git a/src/main/resources/nl/isygameclient/css/modules/colors.module.css b/src/main/resources/nl/isygameclient/css/modules/colors.module.css @@ -1,4 +1,5 @@ -/* Primary */ +/* -- Primary -- */ +/* Inverse Primary */ .inverse-primary { -fx-background-color: -md-sys-color-inverse-primary; } @@ -9,6 +10,7 @@ -fx-fill: -md-sys-color-inverse-primary; } +/* On Primary Container */ .on-primary-container { -fx-background-color: -md-sys-color-on-primary-container; } @@ -19,6 +21,7 @@ -fx-fill: -md-sys-color-on-primary-container; } +/* On Primary */ .on-primary { -fx-background-color: -md-sys-color-on-primary; } @@ -29,6 +32,7 @@ -fx-fill: -md-sys-color-on-primary; } +/* Primary Container */ .primary-container { -fx-background-color: -md-sys-color-primary-container; } @@ -39,6 +43,7 @@ -fx-fill: -md-sys-color-primary-container; } +/* Primary */ .primary { -fx-background-color: -md-sys-color-primary; } @@ -49,7 +54,8 @@ -fx-fill: -md-sys-color-primary; } -/* Secondary */ +/* -- Secondary -- */ +/* On Secondary Container */ .on-secondary-container { -fx-background-color: -md-sys-color-on-secondary-container; } @@ -60,6 +66,7 @@ -fx-fill: -md-sys-color-on-secondary-container; } +/* On Secondary */ .on-secondary { -fx-background-color: -md-sys-color-on-secondary; } @@ -70,6 +77,7 @@ -fx-fill: -md-sys-color-on-secondary; } +/* Secondary Container */ .secondary-container { -fx-background-color: -md-sys-color-secondary-container; } @@ -80,6 +88,7 @@ -fx-fill: -md-sys-color-secondary-container; } +/* Secondary */ .secondary { -fx-background-color: -md-sys-color-secondary; } @@ -90,7 +99,8 @@ -fx-fill: -md-sys-color-secondary; } -/* Tertiary */ +/* -- Tertiary -- */ +/* On Tertiary Container */ .on-tertiary-container { -fx-background-color: -md-sys-color-on-tertiary-container; } @@ -101,6 +111,7 @@ -fx-fill: -md-sys-color-on-tertiary-container; } +/* On Tertiary */ .on-tertiary { -fx-background-color: -md-sys-color-on-tertiary; } @@ -111,6 +122,7 @@ -fx-fill: -md-sys-color-on-tertiary; } +/* Tertiary Container */ .tertiary-container { -fx-background-color: -md-sys-color-tertiary-container; } @@ -121,6 +133,7 @@ -fx-fill: -md-sys-color-tertiary-container; } +/* Tertiary */ .tertiary { -fx-background-color: -md-sys-color-tertiary; } @@ -131,8 +144,8 @@ -fx-text-fill: -md-sys-color-tertiary; } - -/* Error */ +/* -- Error -- */ +/* On Error Container */ .on-error-container { -fx-background-color: -md-sys-color-on-error-container; } @@ -143,6 +156,7 @@ -fx-fill: -md-sys-color-on-error-container; } +/* On Error */ .on-error { -fx-background-color: -md-sys-color-on-error; } @@ -153,6 +167,7 @@ -fx-fill: -md-sys-color-on-error; } +/* Error Container */ .error-container { -fx-background-color: -md-sys-color-error-container; } @@ -163,6 +178,7 @@ -fx-fill: -md-sys-color-error-container; } +/* Error */ .error { -fx-background-color: -md-sys-color-error; } @@ -173,7 +189,8 @@ -fx-fill: -md-sys-color-error; } -/* Surface */ +/* -- Surface -- */ +/* Inverse On Surface */ .inverse-on-surface { -fx-background-color: -md-sys-color-inverse-on-surface; } @@ -184,6 +201,7 @@ -fx-fill: -md-sys-color-inverse-on-surface; } +/* Inverse surface */ .inverse-surface { -fx-background-color: -md-sys-color-inverse-surface; } @@ -194,6 +212,7 @@ -fx-fill: -md-sys-color-inverse-surface; } +/* Inverse On Surface Variant */ .on-surface-variant { -fx-background-color: -md-sys-color-on-surface-variant; } @@ -204,6 +223,7 @@ -fx-fill: -md-sys-color-on-surface-variant; } +/* On Surface */ .on-surface { -fx-background-color: -md-sys-color-on-surface; } @@ -214,6 +234,7 @@ -fx-fill: -md-sys-color-on-surface; } +/* Surface Variant */ .surface-variant { -fx-background-color: -md-sys-color-surface-variant; } @@ -224,6 +245,7 @@ -fx-fill: -md-sys-color-surface-variant; } +/* Surface */ .surface { -fx-background-color: -md-sys-color-surface; } @@ -234,6 +256,7 @@ -fx-fill: -md-sys-color-surface; } +/* Surface Tint */ .surface-tint { -fx-background-color: -md-sys-color-surface-tint; } @@ -244,6 +267,7 @@ -fx-fill: -md-sys-color-surface-tint; } +/* Surface Tint Color */ .surface-tint-color { -fx-background-color: -md-sys-color-surface-tint-color; } @@ -254,7 +278,7 @@ -fx-fill: -md-sys-color-surface-tint-color; } -/* Background */ +/* -- Background -- */ .on-background { -fx-background-color: -md-sys-color-on-background; } @@ -271,8 +295,7 @@ -fx-text-fill: -md-sys-color-background; } - -/* Shadow */ +/* -- Outline -- */ .outline { -fx-background-color: -md-sys-color-outline; } @@ -283,6 +306,7 @@ -fx--fill: -md-sys-color-outline; } +/* -- Shadow -- */ .shadow { -fx-background-color: -md-sys-color-shadow; } @@ -292,6 +316,3 @@ .shadow-fill { -fx-fill: -md-sys-color-shadow; } - - - diff --git a/src/main/resources/nl/isygameclient/css/modules/typography.module.css b/src/main/resources/nl/isygameclient/css/modules/typography.module.css @@ -81,7 +81,7 @@ .display-large { -fx-font-family: sans-serif; - -fx-font-size: 57; + -fx-font-size: 58; -fx-font-style: normal; -fx-font-weight: 400; } diff --git a/src/main/resources/nl/isygameclient/css/style.css b/src/main/resources/nl/isygameclient/css/style.css @@ -1,73 +1,6 @@ +@import url(./views/game-select-menu.css); +@import url(./views/tictactoe.css); + .transparent { -fx-background-color: transparent; -} - - -/* Menu Bar */ -.menu-bar { - -fx-effect: dropshadow(three-pass-box, black, 10, 0, 0, 0); -} -.menu-bar-settings { - -fx-fill: -md-sys-color-inverse-surface; -} - - -/* Search Bar */ -.search-bar { - -fx-border-color: -md-sys-color-on-surface; - -fx-border-width: 1; - -fx-border-radius: 2 2 2 2; -} - -.search-field { - -fx-text-fill: -md-sys-color-inverse-surface; -} - -.ttt-button { - -fx-background-insets: 5px; - -fx-background-color: -md-sys-color-surface-variant; - -fx-text-fill: -md-sys-color-inverse-surface; -} - - -/* Game List */ -#gamesList { - -fx-background-radius: 0; - -fx-vbar-policy: never; -} - -#gamesList .list-cell { - -fx-background-color: transparent; - -fx-text-fill: -md-sys-color-inverse-surface; - - /* Large Body Type Style */ - -fx-font-size: 16; - -fx-font-style: normal; - -fx-font-weight: 400; -} - -#gamesList .list-cell:filled:selected:focused, .list-cell:filled:selected { - -fx-background-color: -md-ref-palette-tertiary50; - -fx-text-fill: white; -} - -#gamesList .list-cell:even { - -fx-background-color: -md-sys-color-surface-variant; -} - -#gamesList .list-cell:odd { - -fx-background-color: -md-sys-color-inverse-on-surface; -} - -#gamesList .list-cell:filled:hover { - -fx-background-color: -md-ref-palette-tertiary60; - -fx-text-fill: white; -} - - -/* Game Detail */ - -#gameDetail { - -fx-border-color: -md-sys-color-surface; - -fx-border-width: 0 5 0 0; } \ No newline at end of file diff --git a/src/main/resources/nl/isygameclient/css/views/game-select-menu.css b/src/main/resources/nl/isygameclient/css/views/game-select-menu.css @@ -0,0 +1,60 @@ +/* Menu Bar */ +.menu-bar { + -fx-effect: dropshadow(three-pass-box, black, 10, 0, 0, 0); +} +.menu-bar-settings { + -fx-fill: -md-sys-color-inverse-surface; +} + +/* Search Bar */ +.search-bar { + -fx-border-color: -md-sys-color-on-surface; + -fx-border-width: 1; + -fx-border-radius: 2; +} + +.search-field { + -fx-text-fill: -md-sys-color-inverse-surface; +} + +/* Game List */ +#gamesList { + -fx-background-radius: 0; + -fx-vbar-policy: never; +} + +#gamesList .list-cell { + -fx-background-color: transparent; + -fx-text-fill: -md-sys-color-inverse-surface; + + /* Large Body Type Style */ + -fx-font-size: 16; + -fx-font-style: normal; + -fx-font-weight: 400; +} + +#gamesList .list-cell:filled:selected:focused, +.list-cell:filled:selected { + -fx-background-color: -md-ref-palette-tertiary50; + -fx-text-fill: white; +} + +#gamesList .list-cell:even { + -fx-background-color: -md-sys-color-surface-variant; +} + +#gamesList .list-cell:odd { + -fx-background-color: -md-sys-color-inverse-on-surface; +} + +#gamesList .list-cell:filled:hover { + -fx-background-color: -md-ref-palette-tertiary60; + -fx-text-fill: white; +} + +/* Game Detail */ + +#gameDetail { + -fx-border-color: -md-sys-color-surface; + -fx-border-width: 0 5 0 0; +} diff --git a/src/main/resources/nl/isygameclient/css/views/tictactoe.css b/src/main/resources/nl/isygameclient/css/views/tictactoe.css @@ -0,0 +1,10 @@ +.ttt-grid { + -fx-border-color: -md-sys-color-surface-variant; + -fx-border-width: 5; + -fx-border-radius: 2; + } + + .ttt-button { + -fx-background-color: -md-sys-color-surface-variant; + -fx-text-fill: -md-sys-color-on-surface-variant + } +\ No newline at end of file diff --git a/src/main/resources/nl/isygameclient/images/reversie_logo.png b/src/main/resources/nl/isygameclient/images/othello_logo.png Binary files differ. diff --git a/src/main/resources/nl/isygameclient/views/GameCard.fxml b/src/main/resources/nl/isygameclient/views/GameCard.fxml @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<?import java.lang.*?> -<?import javafx.geometry.*?> -<?import javafx.scene.control.*?> -<?import javafx.scene.image.*?> -<?import javafx.scene.layout.*?> -<AnchorPane> - <VBox prefHeight="200.0" prefWidth="100.0" xmlns="http://javafx.com/javafx/16" xmlns:fx="http://javafx.com/fxml/1" - alignment="CENTER"> - <VBox.margin> - <Insets topRightBottomLeft="5"/> - </VBox.margin> - <styleClass> - <String fx:value="on-surface"/> - </styleClass> - <ImageView fitHeight="150.0" fitWidth="150.0" pickOnBounds="true" preserveRatio="true"/> - <Separator prefWidth="200"/> - <Label alignment="TOP_RIGHT" text="Title"/> - </VBox> -</AnchorPane> diff --git a/src/main/resources/nl/isygameclient/views/GameSelectorMenu.fxml b/src/main/resources/nl/isygameclient/views/GameSelectorMenu.fxml @@ -1,160 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<?import java.lang.*?> -<?import javafx.scene.control.*?> -<?import javafx.scene.layout.*?> -<?import de.jensd.fx.glyphs.materialicons.MaterialIconView?> -<?import com.jfoenix.controls.*?> - - -<?import javafx.geometry.Insets?> -<?import javafx.scene.image.ImageView?> -<AnchorPane minHeight="480.0" minWidth="600.0" prefHeight="1080.0" prefWidth="1920.0" styleClass="white" - stylesheets="@../css/theme.css" xmlns="http://javafx.com/javafx/16" xmlns:fx="http://javafx.com/fxml/1" - fx:controller="nl.isygameclient.controllers.GameSelectorMenuController"> - <BorderPane AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" - AnchorPane.topAnchor="0.0"> - <top> - <HBox prefHeight="50.0" prefWidth="Infinity"> - <styleClass> - <String fx:value="menu-bar"/> - <String fx:value="background"/> - </styleClass> - - <!-- Menu Buttons --> - <JFXButton text="Store" disable="true" prefHeight="Infinity"> - <styleClass> - <String fx:value="title-medium"/> - <String fx:value="on-surface-text"/> - </styleClass> - </JFXButton> - - <JFXButton text="Games" prefHeight="Infinity"> - <styleClass> - <String fx:value="title-medium"/> - <String fx:value="on-surface-text"/> - </styleClass> - </JFXButton> - - <JFXButton text="User" disable="true" prefHeight="Infinity"> - <styleClass> - <String fx:value="title-medium"/> - <String fx:value="on-surface-text"/> - </styleClass> - </JFXButton> - - <Pane HBox.hgrow="ALWAYS"/> - <JFXButton textAlignment="RIGHT" text="Settings" prefHeight="Infinity"> - <styleClass> - <String fx:value="title-medium"/> - <String fx:value="on-surface-text"/> - </styleClass> - </JFXButton> - </HBox> - </top> - <left> - <AnchorPane> - <HBox AnchorPane.topAnchor="0.0" AnchorPane.bottomAnchor="0.0"> - - <!-- Search Container --> - <VBox prefWidth="200.0" AnchorPane.topAnchor="0.0" AnchorPane.bottomAnchor="0.0" - AnchorPane.leftAnchor="0.0"> - <padding> - <Insets left="5" right="5"/> - </padding> - <styleClass> - <String fx:value="search-container"/> - <String fx:value="surface"/> - </styleClass> - - <!-- Search Field --> - <StackPane> - <styleClass> - <String fx:value="search-bar"/> - <String fx:value="inverse-on-surface"/> - </styleClass> - <VBox.margin> - <Insets bottom="5.0" top="10.0"/> - </VBox.margin> - - - <TextField fx:id="searchBox" promptText="Search"> - <padding> - <Insets left="35" right="35"/> - </padding> - <styleClass> - <String fx:value="search-field"/> - <String fx:value="transparent"/> - </styleClass> - </TextField> - - <JFXButton StackPane.alignment="CENTER_LEFT" disable="true"> - <graphic> - <MaterialIconView StackPane.alignment="CENTER_LEFT" glyphName="SEARCH" - glyphSize="20" styleClass="icon"> - <styleClass> - <String fx:value="on-surface-fill"/> - </styleClass> - </MaterialIconView> - </graphic> - </JFXButton> - - <JFXButton onAction="#onClearSearchButtonClick" StackPane.alignment="CENTER_RIGHT"> - <graphic> - <MaterialIconView glyphName="CLOSE" glyphSize="16" styleClass="icon"> - <styleClass> - <String fx:value="on-surface-fill"/> - </styleClass> - </MaterialIconView> - </graphic> - </JFXButton> - </StackPane> - - <!-- Search List --> - <ListView fx:id="gamesList" VBox.vgrow="ALWAYS" styleClass="surface"> - <padding> - <Insets topRightBottomLeft="1"/> - </padding> - </ListView> - </VBox> - - - <!-- Game Detail Container --> - <VBox fx:id="gameDetail" prefWidth="400" HBox.hgrow="ALWAYS" alignment="TOP_CENTER" - styleClass="inverse-on-surface"> - <padding> - <Insets topRightBottomLeft="20"/> - </padding> - <Label text="Game Title"> - <styleClass> - <String fx:value="display-small"/> - <String fx:value="on-surface-text"/> - <String fx:value="on-surface-fill"/> - </styleClass> - </Label> - </VBox> - </HBox> - </AnchorPane> - </left> - <center> - <AnchorPane> - <VBox fx:id="gameContainer" AnchorPane.bottomAnchor="0" AnchorPane.leftAnchor="0" - AnchorPane.rightAnchor="0" AnchorPane.topAnchor="0"> - <styleClass> - <String fx:value="surface-variant"/> - </styleClass> - <HBox> - <padding> - <Insets topRightBottomLeft="10"/> - </padding> - <fx:include source="GameCard.fxml"/> - <fx:include source="GameCard.fxml"/> - <fx:include source="GameCard.fxml"/> - <fx:include source="GameCard.fxml"/> - <fx:include source="GameCard.fxml"/> - </HBox> - </VBox> - </AnchorPane> - </center> - </BorderPane> -</AnchorPane> diff --git a/src/main/resources/nl/isygameclient/views/GameSelectorMenu/GameCard.fxml b/src/main/resources/nl/isygameclient/views/GameSelectorMenu/GameCard.fxml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<?import java.lang.*?> +<?import javafx.scene.control.*?> +<?import javafx.scene.image.*?> +<?import javafx.scene.layout.*?> + +<VBox prefHeight="350.0" prefWidth="250.0" xmlns="http://javafx.com/javafx/16" xmlns:fx="http://javafx.com/fxml/1" + alignment="CENTER" fx:controller="nl.isygameclient.controllers.GameSeletorMenu.GameCardController" onMouseClicked="#onCardMouseClick"> + <styleClass> + <String fx:value="surface"/> + </styleClass> + <AnchorPane> + <ImageView fx:id="gameImage" fitWidth="250.0" preserveRatio="true"/> + </AnchorPane> + <Separator/> + <Label fx:id="gameTitle" alignment="TOP_RIGHT" text="Title"> + <styleClass> + <String fx:value="title-medium"/> + <String fx:value="on-surface-text"/> + </styleClass> + </Label> +</VBox> diff --git a/src/main/resources/nl/isygameclient/views/GameSelectorMenu/GameSelectorMenu.fxml b/src/main/resources/nl/isygameclient/views/GameSelectorMenu/GameSelectorMenu.fxml @@ -0,0 +1,153 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<?import com.jfoenix.controls.*?> +<?import de.jensd.fx.glyphs.materialicons.MaterialIconView?> +<?import javafx.geometry.*?> +<?import javafx.scene.control.Label?> +<?import javafx.scene.control.ListView?> +<?import javafx.scene.control.ScrollPane?> +<?import javafx.scene.control.TextField?> +<?import javafx.scene.layout.*?> +<?import java.lang.*?> +<AnchorPane minHeight="480.0" minWidth="600.0" prefHeight="1080.0" prefWidth="1920.0" styleClass="white" + stylesheets="@../../css/theme.css" xmlns="http://javafx.com/javafx/16" xmlns:fx="http://javafx.com/fxml/1" + fx:controller="nl.isygameclient.controllers.GameSeletorMenu.GameSelectorMenuController"> + <BorderPane AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" + AnchorPane.topAnchor="0.0"> + <top> + <HBox prefHeight="50.0" prefWidth="Infinity"> + <styleClass> + <String fx:value="menu-bar"/> + <String fx:value="background"/> + </styleClass> + + <!-- Menu Buttons --> + <JFXButton text="Store" disable="true" prefHeight="Infinity"> + <styleClass> + <String fx:value="title-medium"/> + <String fx:value="on-surface-text"/> + </styleClass> + </JFXButton> + + <JFXButton text="Games" prefHeight="Infinity"> + <styleClass> + <String fx:value="title-medium"/> + <String fx:value="on-surface-text"/> + </styleClass> + </JFXButton> + + <JFXButton text="User" disable="true" prefHeight="Infinity"> + <styleClass> + <String fx:value="title-medium"/> + <String fx:value="on-surface-text"/> + </styleClass> + </JFXButton> + + <Pane HBox.hgrow="ALWAYS"/> + <JFXButton textAlignment="RIGHT" text="Settings" prefHeight="Infinity"> + <styleClass> + <String fx:value="title-medium"/> + <String fx:value="on-surface-text"/> + </styleClass> + </JFXButton> + </HBox> + </top> + <left> + <AnchorPane> + <HBox AnchorPane.topAnchor="0.0" AnchorPane.bottomAnchor="0.0"> + + <!-- Search Container --> + <VBox prefWidth="200.0" AnchorPane.topAnchor="0.0" AnchorPane.bottomAnchor="0.0" + AnchorPane.leftAnchor="0.0"> + <padding> + <Insets left="5" right="5"/> + </padding> + <styleClass> + <String fx:value="search-container"/> + <String fx:value="surface"/> + </styleClass> + + <!-- Search Field --> + <StackPane> + <styleClass> + <String fx:value="search-bar"/> + <String fx:value="inverse-on-surface"/> + </styleClass> + <VBox.margin> + <Insets bottom="5.0" top="10.0"/> + </VBox.margin> + + + <TextField fx:id="searchBox" promptText="Search"> + <padding> + <Insets left="35" right="35"/> + </padding> + <styleClass> + <String fx:value="search-field"/> + <String fx:value="transparent"/> + </styleClass> + </TextField> + + <JFXButton StackPane.alignment="CENTER_LEFT" disable="true"> + <graphic> + <MaterialIconView StackPane.alignment="CENTER_LEFT" glyphName="SEARCH" + glyphSize="20" styleClass="icon"> + <styleClass> + <String fx:value="on-surface-fill"/> + </styleClass> + </MaterialIconView> + </graphic> + </JFXButton> + + <JFXButton onAction="#onClearSearchButtonClick" StackPane.alignment="CENTER_RIGHT"> + <graphic> + <MaterialIconView glyphName="CLOSE" glyphSize="16" styleClass="icon"> + <styleClass> + <String fx:value="on-surface-fill"/> + </styleClass> + </MaterialIconView> + </graphic> + </JFXButton> + </StackPane> + + <!-- Search List --> + <ListView fx:id="gamesList" VBox.vgrow="ALWAYS" styleClass="surface"> + <padding> + <Insets topRightBottomLeft="1"/> + </padding> + </ListView> + </VBox> + + + <!-- Game Detail Container --> + <VBox fx:id="gameDetail" prefWidth="400" HBox.hgrow="ALWAYS" alignment="TOP_CENTER" + styleClass="inverse-on-surface"> + <padding> + <Insets topRightBottomLeft="20"/> + </padding> + <Label text="Game Title"> + <styleClass> + <String fx:value="display-small"/> + <String fx:value="on-surface-text"/> + <String fx:value="on-surface-fill"/> + </styleClass> + </Label> + </VBox> + </HBox> + </AnchorPane> + </left> + <center> + <ScrollPane fitToWidth="true" fitToHeight="true" styleClass="surface-variant"> + <FlowPane fx:id="gameContainer" hgap="5" vgap="10" > + <styleClass> + <String fx:value="surface-variant"/> + </styleClass> + <padding> + <Insets topRightBottomLeft="20"/> + </padding> + </FlowPane> + </ScrollPane> + </center> + </BorderPane> +</AnchorPane> diff --git a/src/main/resources/nl/isygameclient/views/TicTacToe/TicTacToeMainMenu.fxml b/src/main/resources/nl/isygameclient/views/TicTacToe/TicTacToeMainMenu.fxml @@ -0,0 +1,50 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<?import com.jfoenix.controls.JFXButton?> +<?import javafx.geometry.Insets?> +<?import javafx.scene.control.Label?> +<?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" + fx:controller="nl.isygameclient.controllers.TicTacToeGame.TicTacToeMainMenuController" + prefWidth="680" prefHeight="480"> + <VBox alignment="CENTER" AnchorPane.rightAnchor="0" AnchorPane.leftAnchor="0" AnchorPane.bottomAnchor="0" AnchorPane.topAnchor="0"> + <styleClass> + <String fx:value="surface"/> + </styleClass> + <Label text="Tic Tac Toe"> + <styleClass> + <String fx:value="display-large"/> + <String fx:value="on-surface-text"/> + </styleClass> + <padding> + <Insets topRightBottomLeft="50"/> + </padding> + </Label> + <VBox spacing="10" alignment="CENTER" maxWidth="200"> + <JFXButton text="Single Player" onAction="#onSinglePlayerButtonClick" prefWidth="Infinity"> + <styleClass> + <String fx:value="primary"/> + <String fx:value="on-primary-text"/> + <String fx:value="title-medium"/> + </styleClass> + </JFXButton> + <JFXButton text="Multiplayer" onAction="#onMultiplayerButtonClick" prefWidth="Infinity"> + <styleClass> + <String fx:value="primary"/> + <String fx:value="on-primary-text"/> + <String fx:value="title-medium"/> + </styleClass> + </JFXButton> + <JFXButton text="Exit" onAction="#onExitButtonClick" prefWidth="Infinity"> + <styleClass> + <String fx:value="primary"/> + <String fx:value="on-primary-text"/> + <String fx:value="title-medium"/> + </styleClass> + </JFXButton> + </VBox> + </VBox> +</AnchorPane> diff --git a/src/main/resources/nl/isygameclient/views/TicTacToe/TicTacToeSinglePlayer.fxml b/src/main/resources/nl/isygameclient/views/TicTacToe/TicTacToeSinglePlayer.fxml @@ -0,0 +1,196 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<?import com.jfoenix.controls.*?> +<?import javafx.geometry.*?> +<?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" + fx:controller="nl.isygameclient.controllers.TicTacToeGame.TicTacToeSinglePlayerController"> + <styleClass> + <String fx:value="surface"/> + </styleClass> + <left> + <VBox prefWidth="200" styleClass="surface-variant" spacing="20" > + <padding> + <Insets topRightBottomLeft="20"/> + </padding> + + <!-- Difficulty Controls --> + <VBox> + <Label text="Difficulty"> + <styleClass> + <String fx:value="headline-small"/> + <String fx:value="on-surface-variant-text"/> + </styleClass> + </Label> + <Separator styleClass="on-surface-variant-text"/> + <JFXComboBox fx:id="difficultyCombo" prefWidth="Infinity" onAction="#onDifficultyComboSelect"> + <styleClass> + <String fx:value="primary"/> + <String fx:value="on-primary-text"/> + <String fx:value="body-large"/> + </styleClass> + </JFXComboBox> + </VBox> + + <!-- Playing As Controls --> + <VBox> + <Label text="Playing As"> + <styleClass> + <String fx:value="headline-small"/> + <String fx:value="on-surface-variant-text"/> + </styleClass> + </Label> + <Separator styleClass="on-surface-variant-text"/> + <JFXComboBox fx:id="playingAsCombo" prefWidth="Infinity" onAction="#onPlayingAsComboSelect"> + <styleClass> + <String fx:value="primary"/>--> + <String fx:value="on-primary-text"/> + <String fx:value="body-large"/> + </styleClass> + </JFXComboBox> + </VBox> + + <!-- Opponents Controls --> + <VBox> + <Label text="Opponent"> + <styleClass> + <String fx:value="headline-small"/> + <String fx:value="on-surface-variant-text"/> + </styleClass> + </Label> + <Separator styleClass="on-surface-variant-text"/> + <JFXComboBox fx:id="opponentCombo" prefWidth="Infinity" onAction="#onOpponentComboSelect"> + <styleClass> + <String fx:value="primary"/>--> + <String fx:value="on-primary-text"/> + <String fx:value="body-large"/> + </styleClass> + </JFXComboBox> + </VBox> + + <!-- Best of Controls --> + <VBox> + <Label text="Best Of"> + <styleClass> + <String fx:value="headline-small"/> + <String fx:value="on-surface-variant-text"/> + </styleClass> + </Label> + <Separator styleClass="on-surface-variant-text"/> + </VBox> + + <!-- Window Controls --> + <Pane VBox.vgrow="ALWAYS"/> + <VBox spacing="10" alignment="CENTER"> + <JFXButton text="New Game" onAction="#onNewGameButtonClick" prefWidth="Infinity"> + <styleClass> + <String fx:value="primary"/> + <String fx:value="on-primary-text"/> + <String fx:value="title-medium"/> + </styleClass> + </JFXButton> + <JFXButton text="Main Menu" onAction="#onMainMenuButtonClick" prefWidth="Infinity"> + <styleClass> + <String fx:value="primary"/> + <String fx:value="on-primary-text"/> + <String fx:value="title-medium"/> + </styleClass> + </JFXButton> + <JFXButton text="Exit" onAction="#onExitButtonClick" prefWidth="Infinity"> + <styleClass> + <String fx:value="primary"/> + <String fx:value="on-primary-text"/> + <String fx:value="title-medium"/> + </styleClass> + </JFXButton> + </VBox> + </VBox> + </left> + <!-- Game Field --> + <center> + <HBox alignment="CENTER"> + <padding> + <Insets topRightBottomLeft="20"/> + </padding> + + <!-- Left --> + <VBox minWidth="150" maxHeight="800" alignment="TOP_CENTER"> + <Label text="Score Player"> + <styleClass> + <String fx:value="headline-medium"/> + <String fx:value="on-surface-text"/> + </styleClass> + </Label> + <Label text="0"> + <styleClass> + <String fx:value="headline-medium"/> + <String fx:value="on-surface-text"/> + </styleClass> + </Label> + <Separator maxWidth="100"/> + </VBox> + + <!-- Center --> + <VBox alignment="CENTER" minWidth="640"> + <HBox alignment="CENTER"> + <padding> + <Insets topRightBottomLeft="5"/> + </padding> + <Label text="Current Player: "> + <styleClass> + <String fx:value="on-surface-text"/> + <String fx:value="headline-small"/> + </styleClass> + </Label> + <Label fx:id="currentPlayer"> + <styleClass> + <String fx:value="on-surface-text"/> + <String fx:value="headline-small"/> + </styleClass> + </Label> + </HBox> + <Separator maxWidth="100"/> + + <StackPane> + <VBox.margin> + <Insets left="20" right="20" top="20"/> + </VBox.margin> + <GridPane fx:id="grid" styleClass="ttt-grid" vgap="10" hgap="10" maxWidth="640" maxHeight="640"> + <padding> + <Insets topRightBottomLeft="10"/> + </padding> + </GridPane> + <Label fx:id="gameOverText" visible="false"> + <padding> + <Insets top="10" bottom="10" left="20" right="20"/> + </padding> + <styleClass> + <String fx:value="surface"/> + <String fx:value="display-large"/> + <String fx:value="on-surface-text"/> + </styleClass> + </Label> + </StackPane> + </VBox> + + <!-- Right --> + <VBox minWidth="150" maxHeight="800" alignment="TOP_CENTER"> + <Label text="Score Opponent"> + <styleClass> + <String fx:value="headline-medium"/> + <String fx:value="on-surface-text"/> + </styleClass> + </Label> + <Label text="0"> + <styleClass> + <String fx:value="headline-medium"/> + <String fx:value="on-surface-text"/> + </styleClass> + </Label> + <Separator maxWidth="100"/> + </VBox> + </HBox> + </center> +</BorderPane> diff --git a/src/main/resources/nl/isygameclient/views/TicTacToeGame.fxml b/src/main/resources/nl/isygameclient/views/TicTacToeGame.fxml @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<?import java.lang.*?> -<?import javafx.scene.layout.*?> - -<?import com.jfoenix.controls.JFXButton?> -<?import javafx.geometry.Insets?> -<AnchorPane stylesheets="@../css/theme.css" xmlns="http://javafx.com/javafx/16" xmlns:fx="http://javafx.com/fxml/1" - fx:controller="nl.isygameclient.controllers.TicTacToeGameController"> - <styleClass> - <String fx:value="surface"/> - </styleClass> - <BorderPane AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" - AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0"> - <left> - <VBox prefWidth="200" styleClass="on-surface" alignment="BOTTOM_CENTER"> - <padding> - <Insets topRightBottomLeft="20"/> - </padding> - <JFXButton text="new game" onAction="#onNewGameButtonClick"> - <styleClass> - <String fx:value="primary-container"/> - <String fx:value="inverse-surface-text"/> - <String fx:value="body-large"/> - <String fx:value="bordered"/> - </styleClass> - </JFXButton> - </VBox> - </left> - <center> - - <GridPane fx:id="grid" alignment="CENTER"> - - </GridPane> - - </center> - </BorderPane> - -</AnchorPane>