From 8ba5069e88eebad9a6bab0c4b93239678c10ea17 Mon Sep 17 00:00:00 2001
From: SaraZoveydavian <sara.zprr@gmail.com>
Date: Fri, 29 May 2026 13:55:54 +0330
Subject: [PATCH] update MusicController Class & fxml

---
 src/main/java/sbu/javafx/MusicController.java |  2 +-
 src/main/resources/sbu/javafx/App-view.fxml   | 55 ++++++++++++++++++-
 2 files changed, 55 insertions(+), 2 deletions(-)

diff --git a/src/main/java/sbu/javafx/MusicController.java b/src/main/java/sbu/javafx/MusicController.java
index 12b8212..8e3cde1 100644
--- a/src/main/java/sbu/javafx/MusicController.java
+++ b/src/main/java/sbu/javafx/MusicController.java
@@ -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("");
 
diff --git a/src/main/resources/sbu/javafx/App-view.fxml b/src/main/resources/sbu/javafx/App-view.fxml
index 306c8d3..2215edf 100644
--- a/src/main/resources/sbu/javafx/App-view.fxml
+++ b/src/main/resources/sbu/javafx/App-view.fxml
@@ -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>