Move UI into separate entrypoint

logandhillon · Sep 20, 2024 · 2f28a7c · 2f28a7c
1 parent 393a08d
commit 2f28a7c
Show file tree

Hide file tree

Showing 7 changed files with 56 additions and 44 deletions.
diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,7 @@ plugins {
 }
 
 group 'net.logandhillon'
-version '0.9.1-ALPHA'
+version '0.9.2-ALPHA'
 
 repositories {
     mavenCentral()

diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
@@ -4,4 +4,5 @@
     requires java.desktop;
 
     exports net.logandhillon.icx;
+    exports net.logandhillon.icx.ui to javafx.graphics;
 }
diff --git a/src/main/java/net/logandhillon/icx/ICX.java b/src/main/java/net/logandhillon/icx/ICX.java
@@ -1,26 +1,12 @@
 package net.logandhillon.icx;
 
-import javafx.application.Application;
-import javafx.scene.Scene;
-import javafx.stage.Stage;
 import net.logandhillon.icx.server.ICXServer;
-import net.logandhillon.icx.ui.view.LoginView;
+import net.logandhillon.icx.ui.UI;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.core.LoggerContext;
 
-public class ICX extends Application {
+public class ICX {
     private static final Logger LOG = LoggerContext.getContext().getLogger(ICX.class);
-    public static Stage stage;
-
-    @Override
-    public void start(Stage stage) {
-        ICX.stage = stage;
-        LOG.info("Initializing UI views");
-        Scene scene = new Scene(new LoginView());
-        stage.setTitle("ICX");
-        stage.setScene(scene);
-        stage.show();
-    }
 
     public static void main(String[] args) {
         boolean isServer = false;
@@ -31,14 +17,11 @@ public static void main(String[] args) {
             }
 
         if (isServer) serverMain();
-        else clientMain();
+        else UI.startClient();
         System.exit(0);
     }
 
-    private static void clientMain() {
-        LOG.info("Starting ICX client");
-        launch();
-    }
+
 
     private static void serverMain() {
         LOG.info("Starting ICX server");

diff --git a/src/main/java/net/logandhillon/icx/client/S2CHandler.java b/src/main/java/net/logandhillon/icx/client/S2CHandler.java
@@ -3,8 +3,8 @@
 import javafx.application.Platform;
 import javafx.scene.Scene;
 import javafx.scene.control.Alert;
-import net.logandhillon.icx.ICX;
 import net.logandhillon.icx.common.ICXPacket;
+import net.logandhillon.icx.ui.UI;
 import net.logandhillon.icx.ui.view.ChatView;
 import net.logandhillon.icx.ui.view.LoginView;
 import org.apache.logging.log4j.Logger;
@@ -43,18 +43,13 @@ public void run() {
                     LOG.debug("Incoming: {}", packet);
 
                     switch (packet.command()) {
-                        case SRV_KICK -> Platform.runLater(() -> {
-                            ICX.stage.close();
-
+                        case SRV_KICK -> Platform.runLater(() -> UI.reloadScene(new Scene(new LoginView()), () -> {
                             Alert alert = new Alert(Alert.AlertType.WARNING);
                             alert.setTitle("Kicked from server");
                             alert.setHeaderText("You have been kicked from " + ICXClient.getServerAddr());
                             alert.setContentText("Reason: " + packet.content());
                             alert.showAndWait();
-
-                            ICX.stage.setScene(new Scene(new LoginView()));
-                            ICX.stage.show();
-                        });
+                        }));
                         case SEND -> Platform.runLater(() -> ChatView.postMessage(packet.sender(), packet.content()));
                         case JOIN -> Platform.runLater(() -> ChatView.postAlert(String.format("Welcome, %s!", packet.sender())));
                         case EXIT -> Platform.runLater(() -> ChatView.postAlert(String.format("Farewell, %s!", packet.sender())));

diff --git a/src/main/java/net/logandhillon/icx/ui/UI.java b/src/main/java/net/logandhillon/icx/ui/UI.java
@@ -0,0 +1,41 @@
+package net.logandhillon.icx.ui;
+
+import javafx.application.Application;
+import javafx.scene.Scene;
+import javafx.stage.Stage;
+import net.logandhillon.icx.ui.view.LoginView;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.core.LoggerContext;
+
+public class UI extends Application {
+    private static final Logger LOG = LoggerContext.getContext().getLogger(UI.class);
+    public static Stage stage;
+
+    @Override
+    public void start(Stage stage) {
+        UI.stage = stage;
+        LOG.info("Initializing UI views");
+        Scene scene = new Scene(new LoginView());
+        stage.setTitle("ICX");
+        stage.setScene(scene);
+        stage.show();
+    }
+
+    public static void startClient() {
+        LOG.info("Starting ICX client");
+        launch();
+    }
+
+    public static void reloadScene(Scene newScene, Runnable silentAction) {
+        stage.close();
+        silentAction.run();
+        stage.setScene(newScene);
+        stage.show();
+    }
+
+    public static void reloadScene(Scene newScene) {
+        stage.close();
+        stage.setScene(newScene);
+        stage.show();
+    }
+}
diff --git a/src/main/java/net/logandhillon/icx/ui/view/ChatView.java b/src/main/java/net/logandhillon/icx/ui/view/ChatView.java
@@ -9,9 +9,9 @@
 import javafx.scene.paint.Color;
 import javafx.scene.text.Font;
 import javafx.scene.text.FontWeight;
-import net.logandhillon.icx.ICX;
 import net.logandhillon.icx.client.ICXClient;
 import net.logandhillon.icx.common.ICXPacket;
+import net.logandhillon.icx.ui.UI;
 import net.logandhillon.icx.ui.component.MessageAlertComponent;
 import net.logandhillon.icx.ui.component.MessageComponent;
 
@@ -47,21 +47,15 @@ public ChatView() {
 
     private static HBox getHeader(Label screenName) {
         Button leaveBtn = new Button("Exit");
-        leaveBtn.setOnAction(_e -> {
+        leaveBtn.setOnAction(_e -> UI.reloadScene(new Scene(new LoginView()), () -> {
             try {
-                ICX.stage.close();
-
                 ICXClient.disconnect();
-                MESSAGES.getChildren().clear();
-
-                ICX.stage.setScene(new Scene(new LoginView()));
-                ICX.stage.show();
             } catch (IOException e) {
                 Alert alert = new Alert(Alert.AlertType.ERROR, "Failed to disconnect: " + e.getMessage());
                 alert.showAndWait();
             }
-
-        });
+            MESSAGES.getChildren().clear();
+        }));
 
         Region spacer = new Region();
         HBox.setHgrow(spacer, Priority.ALWAYS);

diff --git a/src/main/java/net/logandhillon/icx/ui/view/LoginView.java b/src/main/java/net/logandhillon/icx/ui/view/LoginView.java
@@ -9,8 +9,8 @@
 import javafx.scene.layout.VBox;
 import javafx.scene.text.Font;
 import javafx.scene.text.FontWeight;
-import net.logandhillon.icx.ICX;
 import net.logandhillon.icx.client.ICXClient;
+import net.logandhillon.icx.ui.UI;
 
 import java.io.IOException;
 import java.net.InetAddress;
@@ -48,9 +48,7 @@ private VBox getWrapper() {
                     return;
                 }
                 ICXClient.connect(inpName.getText(), InetAddress.getByName(inpServerAddr.getText()));
-                ICX.stage.close();
-                ICX.stage.setScene(new Scene(new ChatView()));
-                ICX.stage.show();
+                UI.reloadScene(new Scene(new ChatView()));
             } catch (IOException ex) {
                 status.setText(ex.getMessage());
             }