Happy_Bird/src/main/java/com/example/happy_bird/HappyBirdMain.java

@@ -69,9 +69,9 @@ public class HappyBirdMain extends Application {
         Button startButton = new Button("START");
         Button highscoresButton = new Button("HIGHSCORES");
         Button settingsButton = new Button("EINSTELLUNGEN");
-        Button startGame = new Button("SPIEL STARTEN");
+        Button spielStarten = new Button("SPIEL STARTEN");
 
-        Button buttons[] = {startButton, highscoresButton, settingsButton, startGame};
+        Button buttons[] = {startButton, highscoresButton, settingsButton, spielStarten};
         Button menuButton = new Button("ZURÜCK");
         menuButton.setStyle("-fx-background-color: #e86000; " +
                 "-fx-text-fill: #FFFFFF; " +
@@ -86,12 +86,8 @@ public class HappyBirdMain extends Application {
         menuButton.setLayoutX(575);
         menuButton.setLayoutY(625);
         menuButton.setVisible(false);
-<<<<<<< HEAD
-        startGame.setVisible(false);
-=======
 
         //Button buttons[] = {startButton, highscoresButton, settingsButton};
->>>>>>> c82816957310f4cb126c980ad371abcdaba0d6de
 
         int yPosition = 225;
         for (Button button : buttons) {
@@ -111,88 +107,65 @@ public class HappyBirdMain extends Application {
                     "-fx-background-radius: 20px;");
         }
 
-        startGame.setVisible(false);
+        spielStarten.setVisible(false);
 
-<<<<<<< HEAD
-        Label nameLabel = new Label("Name:");
-        Label acronymLabel = new Label("Kürzel:");
-
-        Label startLabels[] = {nameLabel, acronymLabel};
-=======
         startButton.setOnAction(event ->  {
             headline.setText("Start");
             for(Button button : buttons) {
                 button.setVisible(false);
                 menuButton.setVisible(true);
             }
->>>>>>> c82816957310f4cb126c980ad371abcdaba0d6de
 
-        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 nameLabel = new Label("Name:");
+            Label acronymLabel = new Label("Kürzel:");
 
-            label.setLayoutX(275);
-            label.setLayoutY(yPositionStartLabels);
-            yPositionStartLabels += 150;
+            Label startLabels[] = {nameLabel, acronymLabel};
 
-            pane.getChildren().add(label);
-            label.setVisible(false);
-        }
+            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;");
 
-        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);
-            feld.setVisible(false);
-        }
-
-        startButton.setOnAction(event ->  {
-            headline.setText("Start");
-            for(Button button : buttons) {
-                button.setVisible(false);
+                label.setLayoutX(275);
+                label.setLayoutY(yPositionStartLabels);
+                yPositionStartLabels += 150;
 
+                pane.getChildren().add(label);
             }
 
-            startGame.setVisible(true);
-            menuButton.setVisible(true);
-            startGame.setLayoutY(520);
+            TextField name = new TextField();
+            TextField acronym = new TextField();
 
+            TextField inputFields[] = {name, acronym};
+
+            int yPositionInputFields = 290;
             for(TextField feld : inputFields) {
-                feld.setVisible(true);
-            }
-            for (Label label : startLabels )
-            {
-                label.setVisible(true);
+                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);
         });
 
 
-<<<<<<< HEAD
-        startGame.setOnAction(event ->  {});
-=======
         //startButton.setOnAction(event ->  {});
->>>>>>> c82816957310f4cb126c980ad371abcdaba0d6de
 
 
 
@@ -248,14 +221,6 @@ public class HappyBirdMain extends Application {
             menuButton.setVisible(false);
             soundSlider.setVisible(false);
             soundLabel.setVisible(false);
-            startGame.setVisible(false);
-            for(TextField feld : inputFields) {
-                feld.setVisible(false);
-            }
-            for (Label label : startLabels )
-            {
-                label.setVisible(false);
-            }
         });
 
         stage.show();