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 69648e2..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 @@ -1,5 +1,7 @@ + + 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 9252031..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 @@ -10,6 +10,7 @@ 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; import javafx.scene.layout.*; @@ -33,6 +34,7 @@ public class HappyBirdMain extends Application { stage.setTitle("Happy Bird"); stage.setScene(scene); + //Backgroundimage Image image = new Image("file:src/main/resources/com/example/happy_bird/pics/Background.png"); BackgroundImage backgroundImageImg = new BackgroundImage( image, @@ -45,6 +47,7 @@ public class HappyBirdMain extends Application { Background background = new Background(backgroundImageImg); pane.setBackground(background); + //Headline-Label Label headline = new Label("Happy Bird"); headline.setPrefSize(300, 75); headline.setTextAlignment(TextAlignment.CENTER); @@ -60,14 +63,31 @@ public class HappyBirdMain extends Application { headline.setLayoutX(250); headline.setLayoutY(100); - pane.getChildren().addAll(headline); + pane.getChildren().add(headline); + //Buttons: 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; " + + "-fx-font-size: 20px; " + + "-fx-border-width: 5px;" + + "-fx-border-color: #FFFFFF;" + + "-fx-font-weight: bold;" + + "-fx-border-radius: 15px;" + + "-fx-background-radius: 20px;"); + pane.getChildren().add(menuButton); + menuButton.setPrefSize(200, 50); + menuButton.setLayoutX(575); + menuButton.setLayoutY(625); + menuButton.setVisible(false); + + Button buttons[] = {startButton, highscoresButton, settingsButton}; int yPosition = 225; for (Button button : buttons) { @@ -145,10 +165,62 @@ public class HappyBirdMain extends Application { }); - startButton.setOnAction(event -> { + startButton.setOnAction(event -> {}); + //Slider: + Slider soundSlider = new Slider(); + pane.getChildren().add(soundSlider); + soundSlider.setPrefSize(200, 5); + soundSlider.setLayoutX(300); + soundSlider.setLayoutY(295); + soundSlider.setVisible(false); + + Label soundLabel = new Label("SOUND"); + soundLabel.setPrefSize(200, 55); + soundLabel.setTextAlignment(TextAlignment.CENTER); + soundLabel.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;"); + soundLabel.setLayoutX(300); + soundLabel.setLayoutY(225); + + pane.getChildren().add(soundLabel); + soundLabel.setVisible(false); + + settingsButton.setOnAction(event -> { + headline.setText("EINSTELLUNGEN"); + startButton.setVisible(false); + highscoresButton.setVisible(false); + settingsButton.setVisible(false); + menuButton.setVisible(true); + soundSlider.setVisible(true); + soundLabel.setVisible(true); + }); + + highscoresButton.setOnAction(event -> { + headline.setText("HIGHSCORES"); + startButton.setVisible(false); + highscoresButton.setVisible(false); + settingsButton.setVisible(false); + menuButton.setVisible(true); + }); + + menuButton.setOnAction(event -> { + headline.setText("HAPPY BIRD"); + startButton.setVisible(true); + highscoresButton.setVisible(true); + settingsButton.setVisible(true); + menuButton.setVisible(false); + soundSlider.setVisible(false); + soundLabel.setVisible(false); }); stage.show(); 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 69648e2..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 @@ -1,8 +1,19 @@ + + +<<<<<<< HEAD +======= + + + + + + +>>>>>>> 5db5b6bb195a2b7d1296e7d3f9b98d6c75dba2c2 diff --git a/gitignore b/gitignore new file mode 100644 index 0000000..769335f --- /dev/null +++ b/gitignore @@ -0,0 +1,82 @@ +# Mobile Tools for Java (J2ME) +.mtj.tmp/ + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* + +### JetBrains template +# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio + + +*.iml + +## Directory-based project format: +.idea/ +# if you remove the above rule, at least ignore the following: + + +# User-specific stuff: +# .idea/workspace.xml +# .idea/tasks.xml +# .idea/dictionaries + + +# Sensitive or high-churn files: +# .idea/dataSources.ids +# .idea/dataSources.xml +# .idea/sqlDataSources.xml +# .idea/dynamic.xml +# .idea/uiDesigner.xml + +# Gradle: +# .idea/gradle.xml +# .idea/libraries + + +# Mongo Explorer plugin: +# .idea/mongoSettings.xml + +## File-based project format: +*.ipr +*.iws + +## Plugin-specific files: + +# IntelliJ +/out/ + +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Crashlytics plugin (for Android Studio and IntelliJ) +com_crashlytics_export_strings.xml +crashlytics.properties +crashlytics-build.properties + + +# Created by .ignore support plugin (hsz.mobi) + + +# Compiled class file +*.class + +# Log file +*.log + + +# Package Files # +*.jar +*.war +*.nar +*.ear +*.zip +*.tar.gz +*.rar + +Happy_Bird/.gradle/ +Happy_Bird/app/build/ +Happy_Bird/data/build/ +Happy_Bird/.gradle/buildOutputCleanup/ \ No newline at end of file