Merge branch 'feat/game-ui' into 'main'

Feat/game-ui

See merge request cs108-fs26/Gruppe-13!26

src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/chatui/ChatController.java

@@ -1,13 +1,13 @@
 package ch.unibas.dmi.dbis.cs108.casono.client.ui.chatui;
 
-import javafx.fxml.FXML;
-import javafx.scene.control.Button;
-import javafx.scene.control.TextField;
-import javafx.scene.layout.VBox;
-import javafx.scene.control.Label;
 import java.time.LocalTime;
 import java.time.format.DateTimeFormatter;
+import javafx.fxml.FXML;
+import javafx.scene.control.Button;
+import javafx.scene.control.Label;
 import javafx.scene.control.ScrollPane;
+import javafx.scene.control.TextField;
+import javafx.scene.layout.VBox;
 
 /**
  * Controller-Klasse für das Chat-System innerhalb der Spieloberfläche.
@@ -39,6 +39,8 @@ public class ChatController {
     @FXML
     private ScrollPane chatScrollPane;
 
+    private static final int CHAT_PADDING = 20;
+
     /**
      * Initialisiert den ChatController nach dem Laden der FXML.
      */
@@ -73,7 +75,7 @@ public class ChatController {
         Label label = new Label("[" + time + "] " + player + ": " + message);
         label.getStyleClass().add("info-text");
         label.setWrapText(true); // Zeilenumbruch aktivieren
-        label.maxWidthProperty().bind(chatVBox.widthProperty().subtract(20));
+        label.maxWidthProperty().bind(chatVBox.widthProperty().subtract(CHAT_PADDING));
         chatVBox.getChildren().add(label);
     }
 

src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/gameui/CasinoGameController.java

@@ -1,18 +1,8 @@
 package ch.unibas.dmi.dbis.cs108.casono.client.ui.gameui;
 
-// import javafx.application.Platform;
 import javafx.fxml.FXML;
 import javafx.scene.control.Label;
-// import javafx.scene.control.TextField;
-// import javafx.scene.input.KeyCode;
-// import javafx.scene.input.KeyEvent;
-// import javafx.scene.input.MouseEvent;
-// import javafx.scene.layout.HBox;
-// import javafx.scene.layout.AnchorPane;
 import javafx.scene.layout.VBox;
-// import javafx.stage.Stage;
-// import javafx.scene.Scene;
-// import javafx.scene.web.WebView;
 
 /**
  * Controller für die Casino-Spielfläche.
@@ -32,7 +22,8 @@ public class CasinoGameController {
     @FXML private Label welcomeText;
     @FXML private VBox casinoTable;
 
-    // TODO: Test-Logik: wird durch echte Spielinteraktionen ersetzt, sobald die GameEngine fertig ist
+    // TODO: Test-Logik: wird durch echte Spielinteraktionen ersetzt,
+    // sobald die GameEngine fertig ist
     @FXML
     public void onTableClick() {
         welcomeText.setText("Einsatz akzeptiert!");

src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/gameui/CasinoGameUI.java

@@ -1,12 +1,11 @@
 package ch.unibas.dmi.dbis.cs108.casono.client.ui.gameui;
 
+import java.io.IOException;
 import javafx.application.Application;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Scene;
 import javafx.stage.Stage;
 
-import java.io.IOException;
-
 /**
  * Hauptklasse für das Casino-Spiel-UI.
  *
@@ -20,6 +19,9 @@ import java.io.IOException;
  */
 public class CasinoGameUI extends Application {
 
+    private static final int DEFAULT_WIDTH = 1200;
+    private static final int DEFAULT_HEIGHT = 800;
+
     /**
      * Startet die Haupt-Stage der Anwendung.
      *
@@ -28,11 +30,13 @@ public class CasinoGameUI extends Application {
      */
     @Override
     public void start(Stage stage) throws IOException {
-        FXMLLoader fxmlLoader = new FXMLLoader(CasinoGameUI.class.getResource("/ui-structure/casinogameui.fxml"));
+        FXMLLoader fxmlLoader =
-        Scene scene = new Scene(fxmlLoader.load(), 1200, 800);
+                new FXMLLoader(CasinoGameUI.class.getResource("/ui-structure/casinogameui.fxml"));
+        Scene scene = new Scene(fxmlLoader.load(), DEFAULT_WIDTH, DEFAULT_HEIGHT);
         stage.setTitle("Casono (GAME)");
 
-        stage.getIcons().add(new javafx.scene.image.Image(getClass().getResource("/images/logoinverted.png").toExternalForm()));
+        String iconPath = getClass().getResource("/images/logoinverted.png").toExternalForm();
+        stage.getIcons().add(new javafx.scene.image.Image(iconPath));
         stage.setScene(scene);
         stage.setFullScreen(true);
         stage.show();

src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/gameui/gameuicomponents/CasinoBrowserController.java

@@ -1,23 +1,33 @@
 package ch.unibas.dmi.dbis.cs108.casono.client.ui.gameui.gameuicomponents;
 
+import java.net.CookieHandler;
+import java.net.CookieManager;
+import java.net.CookiePolicy;
+import java.net.URI;
+import java.util.HashSet;
+import java.util.Optional;
+import java.util.Set;
 import javafx.application.Platform;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
 import javafx.scene.Scene;
-import javafx.scene.control.*;
+import javafx.scene.control.Alert;
+import javafx.scene.control.Button;
+import javafx.scene.control.ButtonType;
+import javafx.scene.control.Label;
+import javafx.scene.control.TextField;
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
-import javafx.scene.layout.*;
+import javafx.scene.input.KeyCode;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.Priority;
+import javafx.scene.layout.StackPane;
+import javafx.scene.layout.VBox;
 import javafx.scene.shape.Rectangle;
 import javafx.scene.web.WebEngine;
 import javafx.scene.web.WebView;
 import javafx.stage.Stage;
 
-import java.net.*;
-import java.util.HashSet;
-import java.util.Optional;
-import java.util.Set;
-
 /**
  * Experimenteller integrierter Browser für Casono.
  *
@@ -49,10 +59,27 @@ import java.util.Set;
  * - Automatische Cookie-Löschung beim Schließen
  */
 public class CasinoBrowserController {
+
     private static final Set<String> TRUSTED_DOMAINS = new HashSet<>();
+
     private static final CookieManager COOKIE_MANAGER =
             new CookieManager(null, CookiePolicy.ACCEPT_ORIGINAL_SERVER);
 
+    private static final org.apache.logging.log4j.Logger LOGGER =
+            org.apache.logging.log4j.LogManager.getLogger(CasinoBrowserController.class);
+
+    private static final int LOGO_HEIGHT = 40;
+    private static final int CORNER_RADIUS = 40;
+    private static final int HBOX_SPACIN = 10;
+    private static final int VBOX_SPACING = 10;
+    private static final int PADDING_SIZE = 10;
+    private static final int WINDOW_WIDTH = 1200;
+    private static final int WINDOW_HEIGHT = 800;
+    private static final int ALERT_WIDTH = 600;
+    private static final int ALERT_HEIGHT = 300;
+    private static final String LOGO_PATH = "/images/logoinverted.png";
+    private static final String LOGO_PATH_MAIN = "/images/logo.png";
+
     static {
         CookieHandler.setDefault(COOKIE_MANAGER);
 
@@ -104,7 +131,72 @@ public class CasinoBrowserController {
 
             engine.setJavaScriptEnabled(false);
 
-            // Popup Blocker
+            configurePopupBlocker(engine);
+
+            webView.getStyleClass().add("web-view");
+
+            StackPane webContainer = createWebContainer(webView);
+
+            Rectangle clip = new Rectangle();
+            clip.setArcWidth(CORNER_RADIUS);
+            clip.setArcHeight(CORNER_RADIUS);
+            webView.setClip(clip);
+
+            webView.widthProperty().addListener((o, a, b) ->
+                    clip.setWidth(b.doubleValue()));
+            webView.heightProperty().addListener((o, a, b) ->
+                    clip.setHeight(b.doubleValue()));
+
+            ImageView browserLogo = loadLogos(stage);
+
+            TextField urlField = createUrlField(url);
+            Label securityLabel = createSecurityLabel();
+
+            Button jsToggle = createJsToggle(engine);
+            Button backBtn = createBackButton(engine);
+            Button fwdBtn = createForwardButton(engine);
+            Button reloadBtn = createReloadButton(engine);
+            Button closeBtn = createCloseButton(stage, webView);
+            configureUrlEvents(engine, urlField, securityLabel);
+
+            HBox taskbar = new HBox(HBOX_SPACIN, browserLogo, backBtn, fwdBtn,
+                    reloadBtn, urlField, jsToggle, securityLabel, closeBtn
+            );
+
+            taskbar.getStyleClass().add("taskbar-browser");
+            taskbar.setAlignment(Pos.CENTER_LEFT);
+
+            Scene scene = createScene(taskbar, webContainer);
+
+            configureKeyEvents(scene, engine);
+
+            stage.setScene(scene);
+            stage.setTitle("Casono Browser");
+            loadUrlSafely(engine, url, securityLabel);
+            stage.show();
+        });
+    }
+
+    /**
+     * WebView Container
+     *
+     * @param webView WebView Inhalt
+     * @return StackPane Container
+     */
+    public static StackPane createWebContainer(WebView webView) {
+        StackPane webContainer = new StackPane(webView);
+        webContainer.getStyleClass().add("browser-web-view");
+        VBox.setVgrow(webContainer, Priority.ALWAYS);
+
+        return webContainer;
+    }
+
+    /**
+     * Popup Blocker
+     *
+     * @param engine WebEngine nutzen
+     */
+    public static void configurePopupBlocker(WebEngine engine) {
         engine.setCreatePopupHandler(config -> {
             Alert alert = new Alert(Alert.AlertType.WARNING);
             alert.setTitle("Popup blockiert");
@@ -112,10 +204,13 @@ public class CasinoBrowserController {
             alert.setContentText("Popup wurde aus Sicherheitsgründen blockiert.");
 
             try {
-                    Image logo =
+                var stream = CasinoBrowserController.class.getResourceAsStream(LOGO_PATH);
-                            new Image(CasinoBrowserController.class.getResourceAsStream("/images/logoinverted.png"));
+                Image logo = new Image(stream);
-                    Image logomain =
+
-                            new Image(CasinoBrowserController.class.getResourceAsStream("/images/logo.png"));
+                // Variable 'streamM' abgekürzt, um das 100-Zeichen-Limit (LineLength)
+                // einzuhalten
+                var streamM = CasinoBrowserController.class.getResourceAsStream(LOGO_PATH_MAIN);
+                Image logomain = new Image(streamM);
 
                 if (logo != null) {
                     Stage alertStage = (Stage) alert.getDialogPane().getScene().getWindow();
@@ -126,39 +221,36 @@ public class CasinoBrowserController {
 
                 if (logomain != null) {
                     ImageView logoView = new ImageView(logomain);
-                        logoView.setFitHeight(40);
+                    logoView.setFitHeight(LOGO_HEIGHT);
                     logoView.setPreserveRatio(true);
                     alert.setGraphic(logoView);
                 }
             } catch (Exception e) {
-                    System.err.println("Logo konnte nicht geladen werden");
+                LOGGER.error("Logo konnte nicht geladen werden");
             }
 
             alert.showAndWait();
             return null;
         });
+    }
 
-            webView.getStyleClass().add("web-view");
+    /**
-
+     * Logos laden
-            StackPane webContainer = new StackPane(webView);
+     *
-            webContainer.getStyleClass().add("browser-web-view");
+     * @param stage Fenster Stage
-            VBox.setVgrow(webContainer, Priority.ALWAYS);
+     * @return ImageView Logo
-
+     */
-            Rectangle clip = new Rectangle();
+    private static ImageView loadLogos(Stage stage) {
-            clip.setArcWidth(40);
-            clip.setArcHeight(40);
-            webView.setClip(clip);
-
-            webView.widthProperty().addListener((o,a,b)->clip.setWidth(b.doubleValue()));
-            webView.heightProperty().addListener((o,a,b)->clip.setHeight(b.doubleValue()));
-
         ImageView browserLogo = new ImageView();
 
         try {
-                Image logo =
+            var stream = CasinoBrowserController.class.getResourceAsStream(LOGO_PATH);
-                        new Image(CasinoBrowserController.class.getResourceAsStream("/images/logoinverted.png"));
+            Image logo = new Image(stream);
-                Image logomain =
+
-                        new Image(CasinoBrowserController.class.getResourceAsStream("/images/logo.png"));
+            // Variable 'streamM' abgekürzt, um das 100-Zeichen-Limit (LineLength)
+            // einzuhalten
+            var streamM = CasinoBrowserController.class.getResourceAsStream(LOGO_PATH_MAIN);
+            Image logomain = new Image(streamM);
 
             if (logo != null) {
                 stage.getIcons().add(logo);
@@ -166,22 +258,49 @@ public class CasinoBrowserController {
 
             if (logomain != null) {
                 browserLogo.setImage(logomain);
-                    browserLogo.setFitHeight(30);
+                browserLogo.setFitHeight(LOGO_HEIGHT);
                 browserLogo.setPreserveRatio(true);
             }
         } catch (Exception e) {
-                System.err.println("Logo konnte nicht geladen werden");
+            LOGGER.error("Logo konnte nicht geladen werden");
         }
 
-            // URL Feld
+        return browserLogo;
+    }
+
+    /**
+     * URL Feld
+     *
+     * @param url Start URL
+     * @return TextField Eingabe
+     */
+    public static TextField createUrlField(String url) {
         TextField urlField = new TextField(url);
         urlField.getStyleClass().add("gray-input-field");
         HBox.setHgrow(urlField, Priority.ALWAYS);
 
+        return urlField;
+    }
+
+    /**
+     * Sicherheits Label
+     *
+     * @return Label Anzeige
+     */
+    public static Label createSecurityLabel() {
         Label securityLabel = new Label("SICHER");
         securityLabel.getStyleClass().add("security-label");
 
-            // JS Toggle
+        return securityLabel;
+    }
+
+    /**
+     * JS Toggle
+     *
+     * @param engine WebEngine nutzen
+     * @return Button Umschalten
+     */
+    public static Button createJsToggle(WebEngine engine){
         Button jsToggle = new Button("JS EINSCHALTEN");
         jsToggle.getStyleClass().add("red-button");
 
@@ -201,7 +320,16 @@ public class CasinoBrowserController {
             }
         });
 
-            // Navigation
+        return jsToggle;
+    }
+
+    /**
+     * Zurück Button
+     *
+     * @param engine WebEngine nutzen
+     * @return Button Zurück
+     */
+    public static Button createBackButton(WebEngine engine) {
         Button backBtn = new Button("<");
         backBtn.getStyleClass().add("gray-button");
         backBtn.setOnAction(e -> {
@@ -210,6 +338,16 @@ public class CasinoBrowserController {
             }
         });
 
+        return backBtn;
+    }
+
+    /**
+     * Vorwärts Button
+     *
+     * @param engine WebEngine nutzen
+     * @return Button Vorwärts
+     */
+    public static Button createForwardButton(WebEngine engine) {
         Button fwdBtn = new Button(">");
         fwdBtn.getStyleClass().add("gray-button");
         fwdBtn.setOnAction(e -> {
@@ -219,12 +357,30 @@ public class CasinoBrowserController {
             }
         });
 
-            // Reload Button
+        return fwdBtn;
+    }
+
+    /**
+     * Reload Button
+     *
+     * @param engine WebEngine nutzen
+     * @return Button Reload
+     */
+    public static Button createReloadButton(WebEngine engine) {
         Button reloadBtn = new Button("⟳");
         reloadBtn.getStyleClass().add("gray-button");
         reloadBtn.setOnAction(e -> engine.reload());
+        return reloadBtn;
+    }
 
-            // Close
+    /**
+     * Close Button
+     *
+     * @param stage Fenster Stage
+     * @param webView WebView Inhalt
+     * @return Button Schließen
+     */
+    public static Button createCloseButton(Stage stage, WebView webView) {
         Button closeBtn = new Button("X");
         closeBtn.getStyleClass().add("red-button");
         closeBtn.setOnAction(e -> {
@@ -234,49 +390,60 @@ public class CasinoBrowserController {
 
         });
 
-            // URL Enter
+        return closeBtn;
+    }
+
+    /**
+     * URL Events
+     *
+     * @param engine WebEngine nutzen
+     * @param urlField URL Textfeld
+     * @param securityLabel Sicherheits Label
+     */
+    public static void configureUrlEvents(WebEngine engine,
+                                          TextField urlField,
+                                          Label securityLabel) {
         urlField.setOnAction(e ->
                 loadUrlSafely(engine, urlField.getText(), securityLabel));
-            engine.locationProperty().addListener((obs,o,n)->urlField.setText(n));
+        engine.locationProperty().addListener((obs, o, n) ->
+                urlField.setText(n));
+    }
 
-            // Taskbar
+    /**
-            HBox taskbar = new HBox(
+     * Scene erstellen
-                    10,
+     *
-                    browserLogo,
+     * @param taskbar Taskbar HBox
-                    backBtn,
+     * @param webContainer Web Container
-                    fwdBtn,
+     * @return Scene Fenster
-                    reloadBtn,
+     */
-                    urlField,
+    public static Scene createScene(HBox taskbar, StackPane webContainer) {
-                    jsToggle,
+        VBox root = new VBox(VBOX_SPACING, taskbar, webContainer);
-                    securityLabel,
-                    closeBtn
-            );
-
-            taskbar.getStyleClass().add("taskbar-browser");
-            taskbar.setAlignment(Pos.CENTER_LEFT);
-
-            // Root
-            VBox root = new VBox(10, taskbar, webContainer);
         root.getStyleClass().add("browser-root");
-            root.setPadding(new Insets(10));
+        root.setPadding(new Insets(PADDING_SIZE));
-            Scene scene = new Scene(root,1200,800);
+
-            var css = CasinoBrowserController.class.getResource("/ui-structure/casinogameui.css");
+        Scene scene = new Scene(root, WINDOW_WIDTH, WINDOW_HEIGHT);
+
+        var css = CasinoBrowserController.class
+                .getResource("/ui-structure/casinogameui.css");
 
         if (css != null) {
             scene.getStylesheets().add(css.toExternalForm());
         }
 
-            // F5 Reload
+        return scene;
-            scene.setOnKeyPressed(event -> {
-                switch (event.getCode()) {
-                    case F5 -> engine.reload();
     }
-            });
 
-            stage.setScene(scene);
+    /**
-            stage.setTitle("Casono Browser");
+     * Key Events
-            loadUrlSafely(engine, url, securityLabel);
+     *
-            stage.show();
+     * @param scene Scene Fenster
+     * @param engine WebEngine nutzen
+     */
+    public static void configureKeyEvents(Scene scene, WebEngine engine) {
+        scene.setOnKeyPressed(event -> {
+            if (event.getCode() == KeyCode.F5) {
+                engine.reload();
+            }
         });
     }
 
@@ -322,43 +489,56 @@ public class CasinoBrowserController {
                     host.equals(domain) || host.endsWith("." + domain));
 
             if (!trusted) {
+                if (!showUnknownWebsiteAlert(host)) {
+                    securityLabel.setText("BLOCKIERT");
+                    return;
+                }
+                securityLabel.setText("UNBEKANNT");
+            } else {
+                securityLabel.setText("SICHER");
+            }
+            engine.load(uri.toString());
+        } catch (Exception e) {
+            securityLabel.setText("ERROR");
+        }
+    }
+
+    /**
+     * Zeigt Warnung an.
+     *
+     * @param host Website Host
+     * @return OK gedrückt
+     */
+    private static boolean showUnknownWebsiteAlert(String host) {
         Alert alert = new Alert(Alert.AlertType.CONFIRMATION);
 
         alert.setTitle("Unbekannte Website");
         alert.setHeaderText("Diese Website ist nicht bekannt");
         alert.setContentText(
-                        host + "\n\nDiese Seite ist nicht vom Casono Browser verifiziert.\nMöchten Sie sie trotzdem öffnen?"
+                host + "\n\nDiese Seite ist nicht vom " +
+                        "Casono Browser verifiziert.\nMöchten Sie sie trotzdem öffnen?"
         );
 
-                Image logo = new Image(CasinoBrowserController.class.getResourceAsStream("/images/logoinverted.png"));
+        var stream = CasinoBrowserController.class.getResourceAsStream(LOGO_PATH);
+        Image logo = new Image(stream);
         if (logo != null) {
             Stage stage = (Stage) alert.getDialogPane().getScene().getWindow();
             if (stage != null) {
                 stage.getIcons().add(logo);
             }
             ImageView logomain = new ImageView(logo);
-                    logomain.setFitHeight(50);
+            logomain.setFitHeight(LOGO_HEIGHT);
             logomain.setPreserveRatio(true);
             alert.setGraphic(logomain);
         }
 
-                alert.getDialogPane().setPrefSize(600,300);
+        alert.getDialogPane().setPrefSize(ALERT_WIDTH, ALERT_HEIGHT);
         Optional<ButtonType> result = alert.showAndWait();
 
         if (result.isEmpty() || result.get() != ButtonType.OK) {
-                    securityLabel.setText("BLOCKIERT");
+            return false;
-                    return;
         }
 
-                securityLabel.setText("UNBEKANNT");
+        return true;
-            } else {
-                securityLabel.setText("SICHER");
-            }
-            engine.load(uri.toString());
-        }
-
-        catch (Exception e) {
-            securityLabel.setText("ERROR");
-        }
     }
 }

src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/gameui/gameuicomponents/TaskbarController.java

@@ -18,11 +18,18 @@ import javafx.scene.layout.HBox;
  */
 public class TaskbarController {
 
+    private static final org.apache.logging.log4j.Logger LOGGER =
+            org.apache.logging.log4j.LogManager.getLogger(CasinoBrowserController.class);
+
     @FXML private HBox taskbar;
     @FXML private TextField taskbarInput;
 
     private double xOffset = 0;
     private double yOffset = 0;
+    private static final double TASKBAR_SCALE = 0.9;
+    private static final int MIN_CREDITS = 5;
+    private static final int MAX_CREDITS = 100000;
+    private static final int CREDIT_STEP = 5;
 
     /**
      * Wird aufgerufen, wenn die Taskleiste mit der Maus gedrückt wird.
@@ -40,7 +47,8 @@ public class TaskbarController {
      * Wird aufgerufen, während die Taskleiste mit der Maus gezogen wird.
      * Aktualisiert die Position und skaliert die Taskleiste leicht zur visuellen Rückmeldung.
      *
-     * TODO: Es muss noch gefixt werden, dass die Taskleiste nicht aus dem Fenster verschwinden kann.
+     * TODO: Es muss noch gefixt werden, dass die Taskleiste nicht aus dem
+     * Fenster verschwinden kann.
      *
      * @param event Das Mausereignis
      */
@@ -49,8 +57,8 @@ public class TaskbarController {
         taskbar.setLayoutX(event.getSceneX() - xOffset);
         taskbar.setLayoutY(event.getSceneY() - yOffset);
 
-        taskbar.setScaleX(0.9);
+        taskbar.setScaleX(TASKBAR_SCALE);
-        taskbar.setScaleY(0.9);
+        taskbar.setScaleY(TASKBAR_SCALE);
     }
 
     /**
@@ -108,15 +116,15 @@ public class TaskbarController {
         try {
             int credits = Integer.parseInt(input.trim());
 
-            if (credits >= 5 && credits <= 100000 && credits % 5 == 0) {
+            if (credits >= MIN_CREDITS && credits <= MAX_CREDITS && credits % CREDIT_STEP == 0) {
                 // TODO: Credits müssen an die GameEngine gesendet werden
-                System.out.println("Einsatz gesetzt: " + credits + " Casono Credits");
+                LOGGER.info("Einsatz gesetzt: {} Casono Credits", credits);
                 taskbarInput.clear();
             } else {
-                System.out.println("Fehler: Nur 5er-Schritte (5, 10, ... 100.000) erlaubt!");
+                LOGGER.info("Fehler: Nur 5er-Schritte (5, 10, ... 100.000) erlaubt!");
             }
         } catch (NumberFormatException e) {
-            System.out.println("Fehler: Bitte nur eine Zahl eingeben!");
+            LOGGER.info("Fehler: Bitte nur eine Zahl eingeben!");
         }
     }