Merge pull request #16 from schlunzis/2-main-menu-redesign

2 main menu redesign
schlunzis · Oct 27, 2023 · 3abbb15 · 3abbb15
2 parents 2fc7b3e + 66aec43
commit 3abbb15
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 2 deletions.
diff --git a/client/src/main/java/de/schlunzis/client/controller/MainMenuController.java b/client/src/main/java/de/schlunzis/client/controller/MainMenuController.java
@@ -1,7 +1,9 @@
 package de.schlunzis.client.controller;
 
 import com.google.common.eventbus.EventBus;
+import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
+import javafx.scene.control.ListView;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
@@ -11,6 +13,9 @@ public class MainMenuController {
 
     private final EventBus eventBus;
 
+    @FXML
+    private ListView lobbiesListView; // TODO implement
+
     public MainMenuController(EventBus eventBus) {
         this.eventBus = eventBus;
         eventBus.register(this);
@@ -22,4 +27,19 @@ private void logout() {
         // TODO implement, see issue
     }
 
+    @FXML
+    private void settings(ActionEvent actionEvent) {
+        // TODO implement
+    }
+
+    @FXML
+    private void joinLobby(ActionEvent actionEvent) {
+        // TODO implement
+    }
+
+    @FXML
+    private void createLobby(ActionEvent actionEvent) {
+        // TODO implement
+    }
+
 }
diff --git a/client/src/main/resources/fxml/main.fxml b/client/src/main/resources/fxml/main.fxml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 <?import java.net.URL?>
 <GridPane xmlns:fx="http://javafx.com/fxml" xmlns="http://javafx.com/javafx/17.0.2-ea"
@@ -22,7 +22,15 @@
     <fx:include source="chat.fxml" GridPane.columnIndex="0" GridPane.rowIndex="1"/>
     <VBox GridPane.columnIndex="0" GridPane.rowIndex="0">
         <Button mnemonicParsing="false" onAction="#logout" text="Logout"/>
-        <Button mnemonicParsing="false" text="CreateLobby"/>
+        <Button mnemonicParsing="false" onAction="#settings" text="Settings"/>
+    </VBox>
+
+    <VBox GridPane.columnIndex="1" GridPane.rowIndex="0">
+        <ListView fx:id="lobbiesListView"/>
+        <HBox>
+            <Button mnemonicParsing="false" onAction="#joinLobby" text="Join Lobby"/>
+            <Button mnemonicParsing="false" onAction="#createLobby" text="CreateLobby"/>
+        </HBox>
     </VBox>
 
 </GridPane>