Sarazpr/HW-07-JavaFX
1
0
Fork 0
forked from AdvancedProgramming1404/HW-07-JavaFX
Code Pull Requests 1 Activity

Develop #1

Open
Sarazpr wants to merge 4 commits from develop into main
pull from: develop
merge into: :main
Conversation 0 Commits 4 Files Changed 13
+55 -2
2 changed files with 55 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 8ba5069e88 - Show all commits
src/main/java/sbu/javafx/MusicController.java
+1 -1
View File
@@ -44,7 +44,7 @@ public class MusicController {
allSongs.add(new Song("Sing", "Travis", "3:48", "E:\\JavaProjects\\HW-07-JavaFX\\src\\main\\resources\\sbu\\songs\\Sing.mp3"));
allSongs.add(new Song("Akhare Ghesse", "Dang Show", "3:18", "E:\\JavaProjects\\HW-07-JavaFX\\src\\main\\resources\\sbu\\songs\\Akhare-Ghesse.mp3"));
allSongs.add(new Song("Married Life", "Michael Giacchino", "4:10", "E:\\JavaProjects\\HW-07-JavaFX\\src\\main\\resources\\sbu\\songs\\Married Life.mp3"));
allSongs.add(new Song("Married Life", "Michael Giacchino", "4:10", "E:\\JavaProjects\\HW-07-JavaFX\\src\\main\\resources\\sbu\\songs\\Married-Life.mp3"));
nowPlayingLabel.setText("");
src/main/resources/sbu/javafx/App-view.fxml
+54 -1
View File
@@ -1,8 +1,61 @@
<?xml version="1.0" encoding="UTF-8"?>
<?import javafx.scene.layout.VBox?>
<VBox xmlns="http://javafx.com/fxml" alignment="CENTER" spacing="10">
<?import javafx.scene.layout.HBox?>
<?import javafx.scene.control.Label?>
<?import javafx.geometry.Insets?>
<?import javafx.scene.control.Button?>
<VBox alignment="CENTER" spacing="10" xmlns:fx="http://javafx.com/fxml" fx:controller="sbu.javafx.MusicController">
<padding>
<Insets topRightBottomLeft="10"/>
</padding>
<!-- TODO: Add your code here! -->
<HBox alignment="CENTER" spacing="25" HBox.hgrow="ALWAYS" styleClass="main-box">
<VBox prefWidth="125" styleClass="column">
<Label text="Song Title" styleClass="title"/>
<Label text="Sing" styleClass="info"/>
<Label text="Akhare Ghesse" styleClass="info"/>
<Label text="Married Life" styleClass="info"/>
</VBox>
<VBox prefWidth="150" styleClass="column">
<Label text="Artist Name" styleClass="title"/>
<Label text="Travis" styleClass="info"/>
<Label text="Dang Show" styleClass="info"/>
<Label text="Michael Giacchino" styleClass="info"/>
</VBox>
<VBox prefWidth="75" styleClass="column">
<Label text="Duration" styleClass="title"/>
<Label text="3:48" styleClass="info"/>
<Label text="3:18" styleClass="info"/>
<Label text="4:10" styleClass="info"/>
</VBox>
<VBox prefWidth="75" styleClass="column">
<Label text="Play" styleClass="title"/>
<Button text="Play" onAction="#handlePlayAction" fx:id="song01" styleClass="play-btn"/>
<Button text="Play" onAction="#handlePlayAction" fx:id="song02" styleClass="play-btn"/>
<Button text="Play" onAction="#handlePlayAction" fx:id="song03" styleClass="play-btn"/>
</VBox>
<VBox prefWidth="125" styleClass="column">
<Label text="Add to Playlist" styleClass="title"/>
<Button text="Add to Playlist" fx:id="song01P" styleClass="add-btn"/>
<Button text="Add to Playlist" fx:id="song02P" styleClass="add-btn"/>
<Button text="Add to Playlist" fx:id="song03P" styleClass="add-btn"/>
</VBox>
</HBox>
<HBox spacing="15" alignment="CENTER" HBox.hgrow="ALWAYS" styleClass="play-box">
<Label text="Now Playing:" styleClass="title0"/>
<Label text="" fx:id="nowPlayingLabel" styleClass="nowPlaying" HBox.hgrow="ALWAYS" maxWidth="Infinity"/>
<Button text="Open Playlist" onAction="#openPlaylistWindow" styleClass="openP-btn"/>
</HBox>
</VBox>