Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui

Projekte/monopoly/client/src/main/java/pp/monopoly/client/NetworkSupport.java

@@ -25,7 +25,7 @@ import java.lang.System.Logger.Level;
 import static pp.monopoly.Resources.lookup;
 
 /**
- * Manages the network connection for the Battleship application.
+ * Manages the network connection for the Monopoly application.
  * Handles connecting to and disconnecting from the server, and sending messages.
  */
 public class NetworkSupport implements MessageListener<Client>, ClientStateListener, ServerConnection {
@@ -34,9 +34,9 @@ public class NetworkSupport implements MessageListener<Client>, ClientStateListe
     private Client client;
 
     /**
-     * Constructs a NetworkSupport instance for the given Battleship application.
+     * Constructs a NetworkSupport instance for the given Monopoly application.
      *
-     * @param app The Battleship application instance.
+     * @param app The Monopoly application instance.
      */
     public NetworkSupport(MonopolyApp app) {
         this.app = app;
@@ -44,6 +44,7 @@ public class NetworkSupport implements MessageListener<Client>, ClientStateListe
 
     /**
      * Return the client connections Id
+     *
      * @return the client id
      */
     public int getId() {
@@ -52,9 +53,9 @@ public class NetworkSupport implements MessageListener<Client>, ClientStateListe
     }
 
     /**
-     * Returns the Battleship application instance.
+     * Returns the Monopoly application instance.
      *
-     * @return Battleship application instance
+     * @return Monopoly application instance
      */
     public MonopolyApp getApp() {
         return app;

Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/TradeMenu.java

@@ -84,24 +84,6 @@ public class TradeMenu extends Dialog {
         mainContent.addChild(createMiddleSection());
         mainContent.addChild(createTradeColumn("Wähle Zielobjekt:", false));
 
-        Container buttons = mainContent.addChild(new Container(new SpringGridLayout()));
-        Button cancel = new Button("Abbrechen");
-        cancel.addClickCommands(s -> ifTopDialog(() -> {
-            close();
-            app.getGameLogic().playSound(Sound.BUTTON);
-        }));
-
-        Button trade = new Button("Handeln");
-        trade.addClickCommands(s -> ifTopDialog(() -> {
-            app.getGameLogic().playSound(Sound.BUTTON);
-            setTrades();
-            app.getGameLogic().send(new TradeOffer(tradeHandler));
-            close();
-        }));
-
-        buttons.addChild(cancel);
-        buttons.addChild(trade);
-
         return mainContent;
     }
 
@@ -196,16 +178,30 @@ public class TradeMenu extends Dialog {
         leftSelectionsField = middleSection.addChild(new TextField(""));
         leftSelectionsField.setPreferredSize(new Vector3f(600, 50, 0));
 
-        Label arrows = middleSection.addChild(new Label("⇅"));
+        Container buttons = middleSection.addChild(new Container(new SpringGridLayout()));
-        arrows.setFontSize(40);
+        Button cancel = new Button("Abbrechen");
+        cancel.addClickCommands(s -> ifTopDialog(() -> {
+            close();
+            app.getGameLogic().playSound(Sound.BUTTON);
+        }));
 
-        rightSelectionsField = middleSection.addChild(new TextField(""));
+        Button trade = new Button("Handeln");
-        rightSelectionsField.setPreferredSize(new Vector3f(600, 50, 0));
+        trade.addClickCommands(s -> ifTopDialog(() -> {
+            app.getGameLogic().playSound(Sound.BUTTON);
+            setTrades();
+            app.getGameLogic().send(new TradeOffer(tradeHandler));
+            close();
+        }));
+
+        buttons.addChild(cancel);
+        buttons.addChild(trade);
 
         Label middleLabelBottom = middleSection.addChild(new Label("Gebäude:        Währung:        Sonderkarten:"));
         middleLabelBottom.setFontSize(24);
         middleLabelBottom.setInsets(new Insets3f(5, 5, 5, 5));
 
+        rightSelectionsField = middleSection.addChild(new TextField(""));
+        rightSelectionsField.setPreferredSize(new Vector3f(600, 50, 0));
         return middleSection;
     }
 
@@ -217,6 +213,7 @@ public class TradeMenu extends Dialog {
     private void styleTextField(TextField textField) {
         textField.setInsets(new Insets3f(5, 10, 5, 10));
         textField.setBackground(new QuadBackgroundComponent(ColorRGBA.Black));
+        textField.setPreferredSize(new Vector3f(300, 30, 0));
     }
 
     private void assignSelectors(Selector<String> buildingSelector, Selector<String> specialCardSelector, TextField currencyInput, boolean isLeft) {
@@ -281,7 +278,6 @@ public class TradeMenu extends Dialog {
             }
             for (String  property : leftselBuildings) {
                 buildingText.append(property);
-                buildingText.append(", ");
             }
         } else {
             if (rightselBuildings.contains(building.getSelectedItem())) {
@@ -291,7 +287,6 @@ public class TradeMenu extends Dialog {
             }
             for (String  property : rightselBuildings) {
                 buildingText.append(property);
-                buildingText.append(", ");
             }
         }
 

Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/popups/WinnerPopUp.java

@@ -53,7 +53,7 @@ public class WinnerPopUp extends Dialog {
         backgroundContainer.setPreferredSize(WinnerContainer.getPreferredSize().addLocal(padding, padding, 0));
 
         // Titel
-        Label winnerTitle = WinnerContainer.addChild(new Label("Herlichen Glückwunsch, du bist der neue Monopoly Champion!", new ElementId("header")));
+        Label winnerTitle = WinnerContainer.addChild(new Label("Herzlichen Glückwunsch, du bist der neue Monopoly Champion!", new ElementId("header")));
         winnerTitle.setFontSize(25);
        // winnerTitle.setColor(ColorRGBA.Black);
         // Create the image container