diff --git a/Happy_Bird/.gradle/7.1.1/executionHistory/executionHistory.bin b/Happy_Bird/.gradle/7.1.1/executionHistory/executionHistory.bin index 5c6dfd4..8795319 100644 Binary files a/Happy_Bird/.gradle/7.1.1/executionHistory/executionHistory.bin and b/Happy_Bird/.gradle/7.1.1/executionHistory/executionHistory.bin differ diff --git a/Happy_Bird/.gradle/7.1.1/fileHashes/fileHashes.bin b/Happy_Bird/.gradle/7.1.1/fileHashes/fileHashes.bin index c7d72d2..f22deff 100644 Binary files a/Happy_Bird/.gradle/7.1.1/fileHashes/fileHashes.bin and b/Happy_Bird/.gradle/7.1.1/fileHashes/fileHashes.bin differ diff --git a/Happy_Bird/build/classes/java/main/com/example/happy_bird/HappyBirdMain.class b/Happy_Bird/build/classes/java/main/com/example/happy_bird/HappyBirdMain.class index f409605..78c4398 100644 Binary files a/Happy_Bird/build/classes/java/main/com/example/happy_bird/HappyBirdMain.class and b/Happy_Bird/build/classes/java/main/com/example/happy_bird/HappyBirdMain.class differ diff --git a/Happy_Bird/build/libs/Happy_Bird-1.0-SNAPSHOT.jar b/Happy_Bird/build/libs/Happy_Bird-1.0-SNAPSHOT.jar index fbf59e5..34e1eb0 100644 Binary files a/Happy_Bird/build/libs/Happy_Bird-1.0-SNAPSHOT.jar and b/Happy_Bird/build/libs/Happy_Bird-1.0-SNAPSHOT.jar differ diff --git a/Happy_Bird/build/resources/main/com/example/happy_bird/happyBird.fxml b/Happy_Bird/build/resources/main/com/example/happy_bird/happyBird.fxml index ac1c9d6..f6f412e 100644 --- a/Happy_Bird/build/resources/main/com/example/happy_bird/happyBird.fxml +++ b/Happy_Bird/build/resources/main/com/example/happy_bird/happyBird.fxml @@ -7,10 +7,4 @@ - - - - - - diff --git a/Happy_Bird/build/tmp/compileJava/previous-compilation-data.bin b/Happy_Bird/build/tmp/compileJava/previous-compilation-data.bin index 4842ba8..64c74e5 100644 Binary files a/Happy_Bird/build/tmp/compileJava/previous-compilation-data.bin and b/Happy_Bird/build/tmp/compileJava/previous-compilation-data.bin differ diff --git a/Happy_Bird/src/main/java/com/example/happy_bird/HappyBirdMain.java b/Happy_Bird/src/main/java/com/example/happy_bird/HappyBirdMain.java index 6a9b44c..66a4f09 100644 --- a/Happy_Bird/src/main/java/com/example/happy_bird/HappyBirdMain.java +++ b/Happy_Bird/src/main/java/com/example/happy_bird/HappyBirdMain.java @@ -9,6 +9,7 @@ import javafx.geometry.Pos; import javafx.scene.Scene; import javafx.scene.control.Button; import javafx.scene.control.Label; +import javafx.scene.control.TextField; import javafx.scene.control.Slider; import javafx.scene.image.*; import javafx.scene.image.Image; @@ -68,6 +69,9 @@ public class HappyBirdMain extends Application { Button startButton = new Button("START"); Button highscoresButton = new Button("HIGHSCORES"); Button settingsButton = new Button("EINSTELLUNGEN"); + Button spielStarten = new Button("SPIEL STARTEN"); + + Button buttons[] = {startButton, highscoresButton, settingsButton, spielStarten}; Button menuButton = new Button("ZURÜCK"); menuButton.setStyle("-fx-background-color: #e86000; " + "-fx-text-fill: #FFFFFF; " + @@ -103,6 +107,68 @@ public class HappyBirdMain extends Application { "-fx-background-radius: 20px;"); } + spielStarten.setVisible(false); + + startButton.setOnAction(event -> { + headline.setText("Start"); + for(Button button : buttons) { + button.setVisible(false); + + } + + Label nameLabel = new Label("Name:"); + Label acronymLabel = new Label("Kürzel:"); + + Label startLabels[] = {nameLabel, acronymLabel}; + + int yPositionStartLabels = 225; + for(Label label : startLabels) { + label.setPrefSize(250, 50); + label.setStyle("-fx-background-color: #DED894; " + + "-fx-text-fill: #000000; " + + "-fx-font-size: 20px; " + + "-fx-border-width: 5px;" + + "-fx-border-color: #543847;" + + "-fx-font-weight: bold;" + + "-fx-alignment: center;" + + "-fx-background-radius: 20px;" + + "-fx-border-radius: 15px;"); + + label.setLayoutX(275); + label.setLayoutY(yPositionStartLabels); + yPositionStartLabels += 150; + + pane.getChildren().add(label); + } + + TextField name = new TextField(); + TextField acronym = new TextField(); + + TextField inputFields[] = {name, acronym}; + + int yPositionInputFields = 290; + for(TextField feld : inputFields) { + feld.setPrefSize(250, 50); + feld.setStyle("-fx-font-size: 20px;" + + "-fx-font-weight: bold;"); + + feld.setLayoutX(275); + feld.setLayoutY(yPositionInputFields); + yPositionInputFields += 150; + + pane.getChildren().add(feld); + } + + spielStarten.setVisible(true); + + spielStarten.setLayoutY(520); + }); + + + startButton.setOnAction(event -> {}); + + + //Slider: Slider soundSlider = new Slider(); pane.getChildren().add(soundSlider); diff --git a/Happy_Bird/src/main/resources/com/example/happy_bird/happyBird.fxml b/Happy_Bird/src/main/resources/com/example/happy_bird/happyBird.fxml index ac1c9d6..2301392 100644 --- a/Happy_Bird/src/main/resources/com/example/happy_bird/happyBird.fxml +++ b/Happy_Bird/src/main/resources/com/example/happy_bird/happyBird.fxml @@ -7,10 +7,13 @@ +<<<<<<< HEAD +======= +>>>>>>> 5db5b6bb195a2b7d1296e7d3f9b98d6c75dba2c2