commit eb3c2f4ea4a544109e30fbafa0224f5e5f7b3192 parent 9f7fdf4423cbe363498307a38081d428b67c3a4a Author: A Koens <[email protected]> Date: Wed, 5 Oct 2022 15:20:19 +0200 Squashed commit of the following: commit db2d2efd9c560594cc576fd4b772671fd1a92d77 Author: A Koens <[email protected]> Date: Wed Oct 5 15:19:13 2022 +0200 Delete ISYGameClient.iml commit 738e3e8a4d3ad7620835d6eaef04de6b582dfbc0 Author: Friedel Schön <[email protected]> Date: Wed Oct 5 14:48:12 2022 +0200 change com.example.isygameclient to nl.isygameclient numero dos commit 4e050b6a242c6c5e5e5bb1fd3ba8ccad0ddc5c3e Author: Friedel Schön <[email protected]> Date: Wed Oct 5 14:38:36 2022 +0200 change com.example.isygameclient to nl.isygameclient commit 2311f65da3662e6865b5933be9b3a6960d477000 Author: A Koens <[email protected]> Date: Tue Sep 27 18:27:04 2022 +0200 Update Settings Settings refactoring, optimized it to allow for easier adding of settings. commit 52bcd6764df8b7ed35ccafd9b7277b7ce4699975 Author: A Koens <[email protected]> Date: Fri Sep 16 09:15:50 2022 +0200 Some Settings commit 53abf1aa95e24d2e2fa98bdafcb815d64760ebcc Author: A Koens <[email protected]> Date: Fri Sep 9 11:43:05 2022 +0200 Update .gitignore commit dbc8344e4b3f5cbbdaef35b5261313f9d7330bab Author: A Koens <[email protected]> Date: Fri Sep 9 11:40:48 2022 +0200 Create ISYGameClient.iml Diffstat:
19 files changed, 237 insertions(+), 65 deletions(-)
diff --git a/.gitignore b/.gitignore @@ -6,6 +6,9 @@ out/ target/ +# Maven Configuration Files +*.iml + # Compiled class file *.class @@ -30,3 +33,5 @@ target/ # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml hs_err_pid* replay_pid* + +.DS_Store +\ No newline at end of file diff --git a/pom.xml b/pom.xml @@ -4,16 +4,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <groupId>com.example</groupId> + <groupId>nl.isygameclient</groupId> <artifactId>ISYGameClient</artifactId> <version>1.0-SNAPSHOT</version> <name>ISYGameClient</name> - <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <junit.version>5.9.0</junit.version> </properties> - <dependencies> <dependency> <groupId>org.openjfx</groupId> @@ -47,6 +45,12 @@ <version>${junit.version}</version> <scope>test</scope> </dependency> + <dependency> + <groupId>org.projectlombok</groupId> + <artifactId>lombok</artifactId> + <version>1.18.24</version> + <scope>provided</scope> + </dependency> </dependencies> <build> @@ -69,13 +73,20 @@ <!-- Default configuration for running with: mvn clean javafx:run --> <id>default-cli</id> <configuration> - <mainClass>com.example.isygameclient/com.example.isygameclient.Application</mainClass> + <mainClass>nl.isygameclient/nl.isygameclient.Application</mainClass> <launcher>app</launcher> <jlinkZipName>app</jlinkZipName> <jlinkImageName>app</jlinkImageName> <noManPages>true</noManPages> <stripDebug>true</stripDebug> <noHeaderFiles>true</noHeaderFiles> + <annotationProcessorPaths> + <path> + <groupId>org.projectlombok</groupId> + <artifactId>lombok</artifactId> + <version>1.18.24</version> + </path> + </annotationProcessorPaths> </configuration> </execution> </executions> diff --git a/settings.properties b/settings.properties @@ -0,0 +1,6 @@ +#Application Settings +#Wed Oct 05 14:47:58 CEST 2022 +fullscreen=false +screenHeight=480 +screenWidth=680 +title=ISY Game Client diff --git a/src/main/java/com/example/isygameclient/Application.java b/src/main/java/com/example/isygameclient/Application.java @@ -1,22 +0,0 @@ -package com.example.isygameclient; - -import javafx.fxml.FXMLLoader; -import javafx.scene.Scene; -import javafx.stage.Stage; - -import java.io.IOException; - -public class Application extends javafx.application.Application { - @Override - public void start(Stage stage) throws IOException { - FXMLLoader fxmlLoader = new FXMLLoader(Application.class.getResource("views/hello-view.fxml")); - Scene scene = new Scene(fxmlLoader.load(), 320, 240); - stage.setTitle("Hello!"); - stage.setScene(scene); - stage.show(); - } - - public static void main(String[] args) { - launch(); - } -} -\ No newline at end of file diff --git a/src/main/java/com/example/isygameclient/controllers/HelloController.java b/src/main/java/com/example/isygameclient/controllers/HelloController.java @@ -1,14 +0,0 @@ -package com.example.isygameclient.controllers; - -import javafx.fxml.FXML; -import javafx.scene.control.Label; - -public class HelloController { - @FXML - private Label welcomeText; - - @FXML - protected void onHelloButtonClick() { - welcomeText.setText("Welcome to JavaFX Application!"); - } -} -\ No newline at end of file diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java @@ -1,12 +1,15 @@ -module com.example.isygameclient { - requires javafx.controls; - requires javafx.fxml; +module nl.isygameclient { + requires javafx.controls; + requires javafx.fxml; - requires org.controlsfx.controls; - requires org.kordamp.bootstrapfx.core; + requires org.controlsfx.controls; + requires org.kordamp.bootstrapfx.core; - opens com.example.isygameclient to javafx.fxml; - exports com.example.isygameclient; - exports com.example.isygameclient.controllers; - opens com.example.isygameclient.controllers to javafx.fxml; + requires static lombok; + + exports nl.isygameclient; + exports nl.isygameclient.controllers; + + opens nl.isygameclient to javafx.fxml; + opens nl.isygameclient.controllers 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 @@ -0,0 +1,27 @@ +package nl.isygameclient; + +import java.io.IOException; +import javafx.fxml.FXMLLoader; +import javafx.scene.Scene; +import javafx.stage.Stage; +import nl.isygameclient.util.SettingsHandler; + +public class Application extends javafx.application.Application { + @Override + public void start(Stage primaryStage) throws IOException { + FXMLLoader fxmlLoader = new FXMLLoader(getClass().getResource("views/hello-view.fxml")); + Scene scene = new Scene(fxmlLoader.load(), SettingsHandler.getSettings().getScreenWidth(), SettingsHandler.getSettings().getScreenHeight()); + primaryStage.setTitle(SettingsHandler.getSettings().getTitle()); + primaryStage.setScene(scene); + primaryStage.setFullScreen(SettingsHandler.getSettings().isFullscreen()); + primaryStage.show(); + primaryStage.setOnCloseRequest((windowEvent) -> { + SettingsHandler.saveProperties(); + }); + } + + + public static void main(String[] args) { + launch(); + } +} +\ No newline at end of file diff --git a/src/main/java/nl/isygameclient/NetworkClient.java b/src/main/java/nl/isygameclient/NetworkClient.java @@ -0,0 +1,4 @@ +package nl.isygameclient; + +public interface NetworkClient { +} diff --git a/src/main/java/nl/isygameclient/controllers/HelloController.java b/src/main/java/nl/isygameclient/controllers/HelloController.java @@ -0,0 +1,21 @@ +package nl.isygameclient.controllers; + +import javafx.fxml.FXML; +import javafx.scene.control.Button; +import javafx.scene.control.Label; +import javafx.stage.Stage; +import nl.isygameclient.util.SettingsHandler; + +public class HelloController { + @FXML + private Label welcomeText; + + @FXML + private Button welcomeButton; + + @FXML + protected void onHelloButtonClick() { + welcomeText.setText(SettingsHandler.getSettings().getTitle()); + ((Stage) welcomeButton.getScene().getWindow()).setFullScreen(true); + } +} +\ No newline at end of file diff --git a/src/main/java/nl/isygameclient/models/SimpleCalculator.java b/src/main/java/nl/isygameclient/models/SimpleCalculator.java @@ -0,0 +1,8 @@ +package nl.isygameclient.models; + +public class SimpleCalculator { + + public int add(int numberA, int numberB) { + return numberA + numberB; + } +} diff --git a/src/main/java/nl/isygameclient/util/Settings.java b/src/main/java/nl/isygameclient/util/Settings.java @@ -0,0 +1,13 @@ +package nl.isygameclient.util; + +import lombok.Data; + + +@Data +public class Settings { + + private String title = "ISY Game Client"; + private boolean fullscreen = true; + private int screenHeight = 1080; + private int screenWidth = 1920; +} diff --git a/src/main/java/nl/isygameclient/util/SettingsHandler.java b/src/main/java/nl/isygameclient/util/SettingsHandler.java @@ -0,0 +1,75 @@ +package nl.isygameclient.util; + + +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.lang.reflect.Field; +import java.util.Properties; + +public abstract class SettingsHandler { + + private static Settings settings; + + public static Settings getSettings() { + if (settings == null) { + settings = new Settings(); + SettingsHandler.loadPropertiesIntoSettings(); + } + return settings; + } + + private static Properties loadPropertiesFromFile() throws IOException { + Properties properties = new Properties(); + InputStream is = new FileInputStream("settings.properties"); + properties.load(is); + return properties; + } + + public static void loadPropertiesIntoSettings() { + try { + Properties properties = loadPropertiesFromFile(); + Field[] fields = settings.getClass().getDeclaredFields(); + for (Field field : fields) { + field.setAccessible(true); + Object value; + if (field.getType().equals(String.class)) { + value = String.valueOf(properties.getProperty(field.getName())); + } else if (field.getType().equals(int.class)) { + value = Integer.parseInt(properties.getProperty(field.getName())); + } else if (field.getType().equals(float.class)) { + value = Float.parseFloat(properties.getProperty(field.getName())); + } else if (field.getType().equals(boolean.class)) { + value = Boolean.parseBoolean(properties.getProperty(field.getName())); + } else { + return; + } + field.set(settings, value); + field.setAccessible(false); + } + } catch (IllegalAccessException | NumberFormatException | IOException e) { + System.out.println("ERROR: Unable to load properties from file"); + e.printStackTrace(); + } + } + + public static void saveProperties() { + try { + FileOutputStream fos = new FileOutputStream("settings.properties"); + Properties properties = new Properties(); + Field[] fields = settings.getClass().getDeclaredFields(); + for (Field field : fields) { + field.setAccessible(true); + properties.put(field.getName(), String.valueOf(field.get(settings))); + } + properties.store(fos, "Application Settings"); + fos.flush(); + fos.close(); + + } catch (IOException | IllegalAccessException e) { + System.out.println("ERROR: Unable to save to properties file"); + e.printStackTrace(); + } + } +} diff --git a/src/main/resources/com/example/isygameclient/views/hello-view.fxml b/src/main/resources/com/example/isygameclient/views/hello-view.fxml @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<?import javafx.geometry.*?> -<?import javafx.scene.control.*?> -<?import javafx.scene.layout.*?> - -<VBox alignment="CENTER" spacing="20.0" stylesheets="@../css/hello.css" xmlns:fx="http://javafx.com/fxml/1" xmlns="http://javafx.com/javafx/16" fx:controller="com.example.isygameclient.controllers.HelloController"> - <padding> - <Insets bottom="20.0" left="20.0" right="20.0" top="20.0" /> - </padding> - - <Label fx:id="welcomeText" /> - <Button onAction="#onHelloButtonClick" text="Hello!" /> -</VBox> diff --git a/src/main/resources/com/example/isygameclient/css/hello.css b/src/main/resources/nl/isygameclient/css/hello.css diff --git a/src/main/resources/com/example/isygameclient/images/reversie_logo.png b/src/main/resources/nl/isygameclient/images/reversie_logo.png Binary files differ. diff --git a/src/main/resources/com/example/isygameclient/images/tictactoe_logo.png b/src/main/resources/nl/isygameclient/images/tictactoe_logo.png Binary files differ. diff --git a/src/main/resources/nl/isygameclient/views/hello-view.fxml b/src/main/resources/nl/isygameclient/views/hello-view.fxml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<?import javafx.geometry.*?> +<?import javafx.scene.control.*?> +<?import javafx.scene.layout.*?> + +<VBox alignment="CENTER" spacing="20.0" stylesheets="@../css/hello.css" xmlns:fx="http://javafx.com/fxml/1" xmlns="http://javafx.com/javafx/16" fx:controller="nl.isygameclient.controllers.HelloController"> + <padding> + <Insets bottom="20.0" left="20.0" right="20.0" top="20.0" /> + </padding> + + <Label fx:id="welcomeText" /> + <Button fx:id="welcomeButton" onAction="#onHelloButtonClick" text="Hello!" /> +</VBox> diff --git a/src/test/java/nl/isygameclient/models/SimpleCalculatorTest.java b/src/test/java/nl/isygameclient/models/SimpleCalculatorTest.java @@ -0,0 +1,19 @@ +package nl.isygameclient.models; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +import org.junit.jupiter.api.Test; + +class SimpleCalculatorTest { + @Test + void twoPlusTwoShouldEqualFour() { + var calculator = new SimpleCalculator(); + assertEquals(4, calculator.add(2, 2)); + } + + @Test + void ThreePlusSevenShouldEqualTen() { + var calculator = new SimpleCalculator(); + assertEquals(10, calculator.add(3, 7)); + } +} +\ No newline at end of file diff --git a/src/test/java/nl/isygameclient/util/SettingsTest.java b/src/test/java/nl/isygameclient/util/SettingsTest.java @@ -0,0 +1,13 @@ +package nl.isygameclient.util; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +import org.junit.jupiter.api.Test; + +class SettingsTest { + + @Test + void ShouldGiveTitle() { + assertEquals(String.class, SettingsHandler.getSettings().getTitle().getClass()); + } +} +\ No newline at end of file