diff --git a/ChatApp/app/build.gradle b/ChatApp/app/build.gradle index 9a933bf..61f71f8 100644 --- a/ChatApp/app/build.gradle +++ b/ChatApp/app/build.gradle @@ -46,7 +46,7 @@ application { } else if (project.hasProperty('client')) { mainClass = 'ChatAppClient' } else if (project.hasProperty('serverGui')) { - mainClass = 'server.ServerGUI' + mainClass = 'server.ServerGui' } else { mainClass = 'client.ClientGui' } diff --git a/ChatApp/app/src/main/java/client/ClientGui.java b/ChatApp/app/src/main/java/client/ClientGui.java index 5fe956e..988628f 100644 --- a/ChatApp/app/src/main/java/client/ClientGui.java +++ b/ChatApp/app/src/main/java/client/ClientGui.java @@ -1,28 +1,38 @@ package client; import javafx.application.Application; +import javafx.fxml.FXMLLoader; import javafx.scene.Scene; import javafx.scene.control.Label; +import javafx.scene.image.Image; import javafx.scene.layout.StackPane; +import javafx.stage.Screen; import javafx.stage.Stage; +import java.util.Objects; + public class ClientGui extends Application { public static void main(String[] args) { launch(args); } @Override - public void start(Stage primaryStage) throws Exception { - primaryStage.setTitle("JavaFX with Gradle"); - - Label label = new Label("Hello, JavaFX!"); - - StackPane root = new StackPane(label); - - Scene scene = new Scene(root, 640, 480); - - primaryStage.setScene(scene); - - primaryStage.show(); + public void start(Stage stage) throws Exception { + FXMLLoader loader = new FXMLLoader(getClass().getResource("/client/clientLoading.fxml")); + Scene scene = new Scene(loader.load(), 800, 600); + + double screenWidth = Screen.getPrimary().getVisualBounds().getWidth(); + double screenHeight = Screen.getPrimary().getVisualBounds().getHeight(); + + double xPos = screenWidth / 2 - scene.getWidth() / 2; + double yPos = screenHeight / 2 - scene.getHeight() / 2; + + scene.getStylesheets().add(getClass().getResource("clientStyle.css").toExternalForm()); + stage.getIcons().add(new Image(Objects.requireNonNull(getClass().getResourceAsStream("/liscord.png")))); + stage.setTitle("Liscord"); + stage.setScene(scene); + stage.setX(xPos); + stage.setY(yPos); + stage.show(); } } diff --git a/ChatApp/app/src/main/java/client/ClientGuiController.java b/ChatApp/app/src/main/java/client/ClientGuiController.java new file mode 100644 index 0000000..d9c6c24 --- /dev/null +++ b/ChatApp/app/src/main/java/client/ClientGuiController.java @@ -0,0 +1,6 @@ +package client; + +import javafx.fxml.FXML; + +public class ClientGuiController { +} diff --git a/ChatApp/app/src/main/java/client/ClientLoading.java b/ChatApp/app/src/main/java/client/ClientLoading.java new file mode 100644 index 0000000..aa59293 --- /dev/null +++ b/ChatApp/app/src/main/java/client/ClientLoading.java @@ -0,0 +1,19 @@ +package client; + +import javafx.animation.RotateTransition; +import javafx.fxml.FXML; +import javafx.scene.shape.Arc; +import javafx.util.Duration; + +public class ClientLoading { + @FXML + private Arc spinnerArc; + + public void initialize() { + // Création de l'animation de rotation + RotateTransition rotate = new RotateTransition(Duration.seconds(1), spinnerArc); + rotate.setByAngle(360); + rotate.setCycleCount(RotateTransition.INDEFINITE); + rotate.play(); + } +} diff --git a/ChatApp/app/src/main/java/server/ServerGUI.java b/ChatApp/app/src/main/java/server/ServerGui.java similarity index 85% rename from ChatApp/app/src/main/java/server/ServerGUI.java rename to ChatApp/app/src/main/java/server/ServerGui.java index 1cb02d4..8df9e82 100644 --- a/ChatApp/app/src/main/java/server/ServerGUI.java +++ b/ChatApp/app/src/main/java/server/ServerGui.java @@ -10,7 +10,7 @@ import javafx.stage.Screen; import java.io.IOException; import java.util.Objects; -public class ServerGUI extends Application { +public class ServerGui extends Application { @Override public void start(Stage stage) throws IOException { FXMLLoader loader = new FXMLLoader(getClass().getResource("/server/serverVue.fxml")); @@ -22,9 +22,9 @@ public class ServerGUI extends Application { double xPos = screenWidth / 2 - scene.getWidth() / 2; double yPos = screenHeight / 2 - scene.getHeight() / 2; - scene.getStylesheets().add(getClass().getResource("style.css").toExternalForm()); + scene.getStylesheets().add(getClass().getResource("serverStyle.css").toExternalForm()); stage.getIcons().add(new Image(Objects.requireNonNull(getClass().getResourceAsStream("/liscord.png")))); - stage.setTitle("Server"); + stage.setTitle("Liscord Server"); stage.setScene(scene); stage.setX(xPos); stage.setY(yPos); diff --git a/ChatApp/app/src/main/java/server/ServerGUIController.java b/ChatApp/app/src/main/java/server/ServerGuiController.java similarity index 91% rename from ChatApp/app/src/main/java/server/ServerGUIController.java rename to ChatApp/app/src/main/java/server/ServerGuiController.java index 13b4598..0e3e407 100644 --- a/ChatApp/app/src/main/java/server/ServerGUIController.java +++ b/ChatApp/app/src/main/java/server/ServerGuiController.java @@ -8,7 +8,7 @@ import network.IPAddressFinder; import java.net.SocketException; import java.net.UnknownHostException; -public class ServerGUIController { +public class ServerGuiController { @FXML private Label IPAddress; @@ -18,7 +18,7 @@ public class ServerGUIController { private Server server; @FXML - public void initialize() throws UnknownHostException { + public void initialize() { IPAddress.setText("IP Address: " + IPAddressFinder.findIPAddress()); } diff --git a/ChatApp/app/src/main/resources/client/clientLoading.fxml b/ChatApp/app/src/main/resources/client/clientLoading.fxml new file mode 100644 index 0000000..5c5ce8e --- /dev/null +++ b/ChatApp/app/src/main/resources/client/clientLoading.fxml @@ -0,0 +1,12 @@ + + + + + + + + + \ No newline at end of file diff --git a/ChatApp/app/src/main/resources/client/clientStyle.css b/ChatApp/app/src/main/resources/client/clientStyle.css new file mode 100644 index 0000000..e69de29 diff --git a/ChatApp/app/src/main/resources/client/clientVue.fxml b/ChatApp/app/src/main/resources/client/clientVue.fxml new file mode 100644 index 0000000..6830bc8 --- /dev/null +++ b/ChatApp/app/src/main/resources/client/clientVue.fxml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + diff --git a/ChatApp/app/src/main/resources/liscord.png b/ChatApp/app/src/main/resources/liscord.png new file mode 100644 index 0000000..701a32c Binary files /dev/null and b/ChatApp/app/src/main/resources/liscord.png differ diff --git a/ChatApp/app/src/main/resources/server/style.css b/ChatApp/app/src/main/resources/server/serverStyle.css similarity index 100% rename from ChatApp/app/src/main/resources/server/style.css rename to ChatApp/app/src/main/resources/server/serverStyle.css diff --git a/ChatApp/app/src/main/resources/server/serverVue.fxml b/ChatApp/app/src/main/resources/server/serverVue.fxml index d0536df..c9c136e 100644 --- a/ChatApp/app/src/main/resources/server/serverVue.fxml +++ b/ChatApp/app/src/main/resources/server/serverVue.fxml @@ -4,7 +4,7 @@ - +