From a70235815267cafe5db9f812a4a45ae43d8fe514 Mon Sep 17 00:00:00 2001
From: Peter <pt033@hdm-stuttgart.de>
Date: Thu, 22 Feb 2024 23:18:25 +0100
Subject: [PATCH] update(ui): remove local create scene
---
.../Controller/LocalCreateController.java | 58 --------
.../Controller/PlayController.java | 2 +-
.../Controller/SkinSelectionController.java | 2 +-
src/main/resources/fxml/LocalCreate.fxml | 130 ------------------
4 files changed, 2 insertions(+), 190 deletions(-)
delete mode 100644 src/main/java/de/hdm_stuttgart/battlearena/Controller/LocalCreateController.java
delete mode 100644 src/main/resources/fxml/LocalCreate.fxml
diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Controller/LocalCreateController.java b/src/main/java/de/hdm_stuttgart/battlearena/Controller/LocalCreateController.java
deleted file mode 100644
index d2510557..00000000
--- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/LocalCreateController.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package de.hdm_stuttgart.battlearena.Controller;
-
-import de.hdm_stuttgart.battlearena.Controller.Utilities.SceneLoader;
-import de.hdm_stuttgart.battlearena.Model.DataStorage.Classes.Persistence;
-import javafx.fxml.FXML;
-import javafx.fxml.Initializable;
-import javafx.scene.control.Label;
-import javafx.scene.control.TitledPane;
-import javafx.scene.control.ToggleButton;
-import javafx.scene.control.ToggleGroup;
-import javafx.scene.layout.VBox;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
-import java.net.URL;
-import java.util.ResourceBundle;
-
-public class LocalCreateController implements Initializable {
- @FXML
- private VBox parent;
- @FXML
- private TitledPane roundsTitledPane;
- @FXML
- private ToggleGroup rounds;
- @FXML
- private Label errorMsg;
- private final SceneLoader sceneLoader = new SceneLoader();
- private static final Logger log = LogManager.getLogger(Persistence.class);
-
-
- @Override
- public void initialize(URL url, ResourceBundle resourceBundle) {
- rounds.selectedToggleProperty().addListener((observableValue, oldToggle, newToggle) -> {
- if (rounds.getSelectedToggle() != null) {
- ToggleButton selected = (ToggleButton) rounds.getSelectedToggle();
- roundsTitledPane.setText(selected.getText());
- log.info("Match rounds: " + selected.getText());
- }
- });
-// TODO: toggle for time and other items
- }
-
- @FXML
- private void backButton() {
- parent.getChildren().clear();
- parent.getChildren().add(sceneLoader.loadScene("Play"));
- }
-
- @FXML
- private void skinSelectionScene() {
- if (rounds.getSelectedToggle() == null) {
- errorMsg.setText("Please select round");
- } else {
- parent.getChildren().clear();
- parent.getChildren().add(sceneLoader.loadScene("SkinSelection"));
- }
- }
-}
diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Controller/PlayController.java b/src/main/java/de/hdm_stuttgart/battlearena/Controller/PlayController.java
index eae49e62..480e6b05 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/PlayController.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/PlayController.java
@@ -16,7 +16,7 @@ public class PlayController {
@FXML
private void localScene() {
- switchScene("LocalCreate");
+ switchScene("SkinSelection");
}
@FXML
diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Controller/SkinSelectionController.java b/src/main/java/de/hdm_stuttgart/battlearena/Controller/SkinSelectionController.java
index bd7dd2b9..c2c46b70 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/SkinSelectionController.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/SkinSelectionController.java
@@ -84,7 +84,7 @@ public class SkinSelectionController implements Initializable {
@FXML
private void backButton() {
parent.getChildren().clear();
- parent.getChildren().add(new SceneLoader().loadScene("LocalCreate"));
+ parent.getChildren().add(new SceneLoader().loadScene("Play"));
}
@FXML
diff --git a/src/main/resources/fxml/LocalCreate.fxml b/src/main/resources/fxml/LocalCreate.fxml
deleted file mode 100644
index 8096d5ab..00000000
--- a/src/main/resources/fxml/LocalCreate.fxml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.geometry.Insets?>
-<?import javafx.scene.control.Accordion?>
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.control.RadioButton?>
-<?import javafx.scene.control.ScrollPane?>
-<?import javafx.scene.control.TitledPane?>
-<?import javafx.scene.control.ToggleButton?>
-<?import javafx.scene.control.ToggleGroup?>
-<?import javafx.scene.layout.AnchorPane?>
-<?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.Pane?>
-<?import javafx.scene.layout.VBox?>
-<?import javafx.scene.text.Text?>
-
-<VBox fx:id="parent" alignment="BOTTOM_CENTER" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/21" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.hdm_stuttgart.battlearena.Controller.LocalCreateController">
- <children>
- <Pane VBox.vgrow="ALWAYS" />
- <HBox alignment="CENTER" spacing="20.0">
- <children>
- <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Rounds:" />
- <Accordion>
- <panes>
- <TitledPane fx:id="roundsTitledPane" text="Select">
- <content>
- <ScrollPane minViewportHeight="100.0">
- <content>
- <VBox fx:id="boxBox">
- <children>
- <ToggleButton mnemonicParsing="false" styleClass="roundsButton" text="1">
- <toggleGroup>
- <ToggleGroup fx:id="rounds" />
- </toggleGroup>
- <VBox.margin>
- <Insets />
- </VBox.margin>
- </ToggleButton>
- <ToggleButton mnemonicParsing="false" styleClass="roundsButton" text="2" toggleGroup="$rounds" />
- <ToggleButton mnemonicParsing="false" styleClass="roundsButton" text="3" toggleGroup="$rounds" />
- </children>
- </VBox>
- </content>
- </ScrollPane>
- </content>
- </TitledPane>
- </panes>
- </Accordion>
- </children>
- <VBox.margin>
- <Insets />
- </VBox.margin>
- </HBox>
- <Pane VBox.vgrow="ALWAYS" />
- <HBox alignment="CENTER" spacing="20.0">
- <children>
- <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Time:" />
- <Accordion>
- <panes>
- <TitledPane animated="false" text="Select">
- <content>
- <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0" />
- </content>
- </TitledPane>
- </panes>
- </Accordion>
- </children>
- </HBox>
- <Pane VBox.vgrow="ALWAYS" />
- <HBox alignment="TOP_CENTER" spacing="10.0">
- <children>
- <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Players:" />
- <RadioButton mnemonicParsing="false" selected="true" text="2">
- <toggleGroup>
- <ToggleGroup fx:id="group31" />
- </toggleGroup>
- </RadioButton>
- <RadioButton mnemonicParsing="false" text="3" toggleGroup="$group31" />
- <RadioButton mnemonicParsing="false" text="4" toggleGroup="$group31" />
- </children>
- </HBox>
- <Pane VBox.vgrow="ALWAYS" />
- <HBox alignment="TOP_CENTER" spacing="10.0">
- <children>
- <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Text:" />
- <RadioButton mnemonicParsing="false" text="Yes">
- <toggleGroup>
- <ToggleGroup fx:id="group1" />
- </toggleGroup>
- </RadioButton>
- <RadioButton mnemonicParsing="false" selected="true" text="No" toggleGroup="$group1" />
- </children>
- </HBox>
- <Pane VBox.vgrow="ALWAYS" />
- <HBox alignment="TOP_CENTER" spacing="10.0">
- <children>
- <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Text:" />
- <RadioButton mnemonicParsing="false" text="Yes">
- <toggleGroup>
- <ToggleGroup fx:id="group2" />
- </toggleGroup>
- </RadioButton>
- <RadioButton mnemonicParsing="false" selected="true" text="No" toggleGroup="$group2" />
- </children>
- </HBox>
- <Pane VBox.vgrow="ALWAYS" />
- <HBox alignment="TOP_CENTER" spacing="10.0">
- <children>
- <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Text:" />
- <RadioButton mnemonicParsing="false" text="Yes">
- <toggleGroup>
- <ToggleGroup fx:id="group3" />
- </toggleGroup>
- </RadioButton>
- <RadioButton mnemonicParsing="false" selected="true" text="No" toggleGroup="$group3" />
- </children>
- </HBox>
- <Pane VBox.vgrow="ALWAYS" />
- <Label fx:id="errorMsg" />
- <Pane VBox.vgrow="ALWAYS" />
- <Button mnemonicParsing="false" onAction="#skinSelectionScene" text="Next" />
- <Pane VBox.vgrow="ALWAYS" />
- <Button mnemonicParsing="false" onAction="#backButton" text="Back">
- <VBox.margin>
- <Insets />
- </VBox.margin>
- </Button>
- </children>
-</VBox>
--
GitLab