diff --git a/src/main/java/sbu/javafx/Main.java b/src/main/java/sbu/javafx/Main.java index a4f0da4..b5bf9a3 100644 --- a/src/main/java/sbu/javafx/Main.java +++ b/src/main/java/sbu/javafx/Main.java @@ -16,17 +16,15 @@ public class Main extends Application { MusicController controller = loader.getController(); controller.musicsListView.getItems().addAll( - new Song("Blinding Lights", "The Weeknd"), - new Song("Flowers", "Miley Cyrus"), - new Song("As It Was", "Harry Styles"), - new Song("Comme des enfants", "Coert De Pirate"), - new Song("Slow Down", "GRAE"), - new Song("Cigarettes out the window", "TV Girl"), - new Song("Shape of My Heart", "Sting"), - new Song("deja vu", "Olivia Rodirgo"), - new Song("Do It To It", "Acraze"), - new Song("Bones", "Imagine Dragons"), - new Song("Bunker", "Balthazar") + new Song("Blinding Lights", "The Weeknd","/musics/The-Weeknd-Blinding-Lights-128.mp3"), + new Song("Comme des enfants", "Coert De Pirate","/musics/Coeur-De-Pirate-Comme-des-enfants-128.pm3"), + new Song("Slow Down", "GRAE", "/musics/GRAE-Slow-Down-128.mp3"), + new Song("Cigarettes out the Window", "TV Girl", "/music/TV-Girl-Cigarettes-out-the-Window-128.mp3"), + new Song("deja vu", "Olivia Rodirgo", "/musics/Olivia-Rodrigo-deja-vu-320.mp3"), + new Song("The Line", "Twoenty One Pilots", "/musics/Twenty-One-Pilots-The-Line-128.mp3"), + new Song("Bones", "Imagine Dragons", "/musics/Imagine-Dragons-Bones-128.mp3"), + new Song("Bunker", "Balthazar", "/musics/Balthazar-Bunker-128.mp3"), + new Song("As It Was", "Harry Styles", "/musics/Harry-Styles-As-It-Was-320.mp3") ); controller.setupListView(controller.musicsListView); diff --git a/src/main/java/sbu/javafx/MusicController.java b/src/main/java/sbu/javafx/MusicController.java index b2a0170..61d19bb 100644 --- a/src/main/java/sbu/javafx/MusicController.java +++ b/src/main/java/sbu/javafx/MusicController.java @@ -184,7 +184,7 @@ public class MusicController { @FXML public void mute(ActionEvent e){ isMute=!isMute; - if(isMute){ + if(!isMute){ audioBtn.setGraphic(audioIcon); }else{ audioBtn.setGraphic(muteIcon); diff --git a/src/main/java/sbu/javafx/Song.java b/src/main/java/sbu/javafx/Song.java index 3cf0528..5dce70a 100644 --- a/src/main/java/sbu/javafx/Song.java +++ b/src/main/java/sbu/javafx/Song.java @@ -3,10 +3,12 @@ package sbu.javafx; public class Song { private String name; private String singer; - public Song(String name, String singer) + private String path; + public Song(String name, String singer, String path) { this.name=name; this.singer=singer; + this.path=path; } @Override @@ -20,4 +22,5 @@ public class Song { public String getSinger() { return singer; } + public String getPath(){return path;} } diff --git a/src/main/resources/musics/Balthazar-Bunker-128.mp3 b/src/main/resources/musics/Balthazar-Bunker-128.mp3 new file mode 100644 index 0000000..a23a262 Binary files /dev/null and b/src/main/resources/musics/Balthazar-Bunker-128.mp3 differ diff --git a/src/main/resources/musics/Coeur-De-Pirate-Comme-des-enfants-128.mp3 b/src/main/resources/musics/Coeur-De-Pirate-Comme-des-enfants-128.mp3 new file mode 100644 index 0000000..b2207a3 Binary files /dev/null and b/src/main/resources/musics/Coeur-De-Pirate-Comme-des-enfants-128.mp3 differ diff --git a/src/main/resources/musics/GRAE-Slow-Down-128.mp3 b/src/main/resources/musics/GRAE-Slow-Down-128.mp3 new file mode 100644 index 0000000..97d8c43 Binary files /dev/null and b/src/main/resources/musics/GRAE-Slow-Down-128.mp3 differ diff --git a/src/main/resources/musics/Harry-Styles-As-It-Was-320.mp3 b/src/main/resources/musics/Harry-Styles-As-It-Was-320.mp3 new file mode 100644 index 0000000..605d88a Binary files /dev/null and b/src/main/resources/musics/Harry-Styles-As-It-Was-320.mp3 differ diff --git a/src/main/resources/musics/Imagine-Dragons-Bones-128.mp3 b/src/main/resources/musics/Imagine-Dragons-Bones-128.mp3 new file mode 100644 index 0000000..f10c84b Binary files /dev/null and b/src/main/resources/musics/Imagine-Dragons-Bones-128.mp3 differ diff --git a/src/main/resources/musics/Olivia-Rodrigo-deja-vu-320.mp3 b/src/main/resources/musics/Olivia-Rodrigo-deja-vu-320.mp3 new file mode 100644 index 0000000..8ff93fc Binary files /dev/null and b/src/main/resources/musics/Olivia-Rodrigo-deja-vu-320.mp3 differ diff --git a/src/main/resources/musics/TV-Girl-Cigarettes-out-the-Window-128.mp3 b/src/main/resources/musics/TV-Girl-Cigarettes-out-the-Window-128.mp3 new file mode 100644 index 0000000..82171e5 Binary files /dev/null and b/src/main/resources/musics/TV-Girl-Cigarettes-out-the-Window-128.mp3 differ diff --git a/src/main/resources/musics/The-Weeknd-Blinding-Lights-128.mp3 b/src/main/resources/musics/The-Weeknd-Blinding-Lights-128.mp3 new file mode 100644 index 0000000..535b299 Binary files /dev/null and b/src/main/resources/musics/The-Weeknd-Blinding-Lights-128.mp3 differ diff --git a/src/main/resources/musics/Twenty-One-Pilots-The-Line-128.mp3 b/src/main/resources/musics/Twenty-One-Pilots-The-Line-128.mp3 new file mode 100644 index 0000000..5be17e5 Binary files /dev/null and b/src/main/resources/musics/Twenty-One-Pilots-The-Line-128.mp3 differ diff --git a/src/main/resources/sbu/javafx/App-view.fxml b/src/main/resources/sbu/javafx/App-view.fxml index 6d356ff..33ba601 100644 --- a/src/main/resources/sbu/javafx/App-view.fxml +++ b/src/main/resources/sbu/javafx/App-view.fxml @@ -38,9 +38,16 @@