Fixen kleiner Bugs

Happy_Bird/build/resources/main/com/example/happy_bird/happyBird.fxml

@@ -7,4 +7,13 @@
 
 <StackPane prefHeight="800.0" prefWidth="700.0" xmlns="http://javafx.com/javafx/11.0.2" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.example.happy_bird.HappyBird" back >
 
+<<<<<<< HEAD
+=======
+    <ImageView>
+        <image>
+            <Image url="@pics/Background.png"></Image>
+        </image>
+    </ImageView>
+
+>>>>>>> 5db5b6bb195a2b7d1296e7d3f9b98d6c75dba2c2
 </StackPane>

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 spielStarten = new Button("SPIEL STARTEN");
+        Button startGame = new Button("SPIEL STARTEN");
 
-        Button buttons[] = {startButton, highscoresButton, settingsButton, spielStarten};
+        Button buttons[] = {startButton, highscoresButton, settingsButton, startGame};
         Button menuButton = new Button("ZURÜCK");
         menuButton.setStyle("-fx-background-color: #e86000; " +
                 "-fx-text-fill: #FFFFFF; " +
@@ -86,8 +86,7 @@ public class HappyBirdMain extends Application {
         menuButton.setLayoutX(575);
         menuButton.setLayoutY(625);
         menuButton.setVisible(false);
-
+        startGame.setVisible(false);
-        Button buttons[] = {startButton, highscoresButton, settingsButton};
 
         int yPosition = 225;
         for (Button button : buttons) {
@@ -107,7 +106,52 @@ public class HappyBirdMain extends Application {
                     "-fx-background-radius: 20px;");
         }
 
-        spielStarten.setVisible(false);
+        startGame.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);
+            label.setVisible(false);
+        }
+
+        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");
@@ -116,56 +160,21 @@ public class HappyBirdMain extends Application {
 
             }
 
-            Label nameLabel = new Label("Name:");
+            startGame.setVisible(true);
-            Label acronymLabel = new Label("Kürzel:");
+            menuButton.setVisible(true);
+            startGame.setLayoutY(520);
 
-            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.setVisible(true);
-                feld.setStyle("-fx-font-size: 20px;" +
+            }
-                        "-fx-font-weight: bold;");
+            for (Label label : startLabels )
-
+            {
-                feld.setLayoutX(275);
+                label.setVisible(true);
-                feld.setLayoutY(yPositionInputFields);
-                yPositionInputFields += 150;
-
-                pane.getChildren().add(feld);
             }
-
-            spielStarten.setVisible(true);
-
-            spielStarten.setLayoutY(520);
         });
 
 
-        startButton.setOnAction(event ->  {});
+        startGame.setOnAction(event ->  {});
 
 
 
@@ -221,6 +230,14 @@ 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();