commit 88c19290b714673c129fef206c5a0be28801a925 Author: Markil3 <75867393+Markil3@users.noreply.github.com> Date: Mon Jul 5 12:01:12 2021 -0600 Initial commit diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..1182a14 --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +/.gradle/ +/.idea/ +/build/ +/*/build/ +/local.properties diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..4a3fb55 --- /dev/null +++ b/build.gradle @@ -0,0 +1,12 @@ +/* + * Copyright (c) 2021 William Hubbard. All Rights Reserved. + */ + +/* + * This build file was generated by the Gradle 'init' task. + * + * This generated file contains a commented-out sample Java project to get you started. + * For more details take a look at the Java Quickstart chapter in the Gradle + * user guide available at https://docs.gradle.org/4.4.1/userguide/tutorial_java_projects.html + */ +ext.defaultPackage = "edu.regis" diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..e708b1c Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..a47de33 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,9 @@ +# +# Copyright (c) 2021 William Hubbard. All Rights Reserved. +# + +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..4f906e0 --- /dev/null +++ b/gradlew @@ -0,0 +1,185 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=`expr $i + 1` + done + case $i in + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=`save "$@"` + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..107acd3 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/interface/build.gradle b/interface/build.gradle new file mode 100644 index 0000000..833a689 --- /dev/null +++ b/interface/build.gradle @@ -0,0 +1,28 @@ +plugins { + id 'java' + id 'application' +} + +/* + * Copyright (c) 2021 William Hubbard. All Rights Reserved. + */ + +// In this section you declare where to find the dependencies of your project +repositories { + mavenCentral() +} + +// In this section you declare the dependencies for your production and test code +dependencies { + // The production code uses the SLF4J logging API at compile time + implementation 'org.slf4j:slf4j-api:1.7.25' + + // Declare the dependency for your favourite test framework you want to use in your tests. + // TestNG is also supported by the Gradle Test task. Just change the + // testCompile dependency to testCompile 'org.testng:testng:6.8.1' and add + // 'test.useTestNG()' to your build script. + testImplementation 'junit:junit:4.12' +} + +// Define the main class for the application +mainClassName = defaultPackage + '.player.Interface' \ No newline at end of file diff --git a/interface/src/main/java/edu/regis/universe_player/player/Collections.java b/interface/src/main/java/edu/regis/universe_player/player/Collections.java new file mode 100644 index 0000000..573e813 --- /dev/null +++ b/interface/src/main/java/edu/regis/universe_player/player/Collections.java @@ -0,0 +1,48 @@ +/* + * Copyright (c) 2021 William Hubbard. All Rights Reserved. + */ + +package edu.regis.universe_player.player; + +import java.awt.Color; + +import javax.swing.BoxLayout; +import javax.swing.JLabel; +import javax.swing.JPanel; + +/** + * This panel links to various song collections the player has set up. + * + * @author William Hubbard + * @version 0.1 + */ +public class Collections extends JPanel +{ + JLabel allSongs; + JLabel artists; + JLabel albums; + JLabel genres; + JLabel years; + JLabel playlists; + + public Collections() + { + JLabel label; + BoxLayout layout = new BoxLayout(this, BoxLayout.Y_AXIS); + this.setLayout(layout); + + this.add(this.allSongs = label = new JLabel("All Songs")); + label.setForeground(Color.BLUE); + this.add(this.artists = label = new JLabel("Artists")); + label.setForeground(Color.BLUE); + this.add(this.albums = label = new JLabel("Albums")); + label.setForeground(Color.BLUE); + this.add(this.genres = label = new JLabel("Genres")); + label.setForeground(Color.BLUE); + this.add(this.years = label = new JLabel("Years")); + label.setForeground(Color.BLUE); + this.add(new JLabel("\u23AF\u23AF\u23AF\u23AF\u23AF\u23AF")); + this.add(this.playlists = label = new JLabel("Playlists")); + label.setForeground(Color.BLUE); + } +} diff --git a/interface/src/main/java/edu/regis/universe_player/player/Interface.java b/interface/src/main/java/edu/regis/universe_player/player/Interface.java new file mode 100644 index 0000000..5bebc79 --- /dev/null +++ b/interface/src/main/java/edu/regis/universe_player/player/Interface.java @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2021 William Hubbard. All Rights Reserved. + */ + +package edu.regis.universe_player.player; + +import java.awt.BorderLayout; + +import javax.swing.JFrame; + +/** + * The Interface class serves as the primary GUI that the player interacts with. + * @author William Hubbard + * @version 0.1 + */ +public class Interface extends JFrame +{ + public static void main(String[] args) + { + Interface inter = new Interface(); + inter.pack(); + inter.setVisible(true); + } + + public Interface() + { + super(); + this.setTitle("Universal Music Player"); + this.getContentPane().setLayout(new BorderLayout()); + this.getContentPane().add(new Collections(), BorderLayout.LINE_START); + this.getContentPane().add(new PlayerControls(), BorderLayout.PAGE_END); + this.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); + } +} \ No newline at end of file diff --git a/interface/src/main/java/edu/regis/universe_player/player/PlayerControls.java b/interface/src/main/java/edu/regis/universe_player/player/PlayerControls.java new file mode 100644 index 0000000..362a171 --- /dev/null +++ b/interface/src/main/java/edu/regis/universe_player/player/PlayerControls.java @@ -0,0 +1,86 @@ +/* + * Copyright (c) 2021 William Hubbard. All Rights Reserved. + */ + +package edu.regis.universe_player.player; + +import java.awt.Dimension; +import java.awt.FlowLayout; + +import javax.swing.ImageIcon; +import javax.swing.JButton; +import javax.swing.JPanel; +import javax.swing.JSlider; +import javax.swing.SpringLayout; + +/** + * This panel contains the buttons necessary for controlling the playback of audio. + * + * @author William Hubbard + * @version 0.1 + */ +public class PlayerControls extends JPanel +{ + private JButton playButton; + private JButton nextButton; + private JButton prevButton; + private JSlider progress; + + public PlayerControls() + { + final Dimension BUTTON_SIZE = new Dimension(32, 32); + final Dimension ICON_SIZE = new Dimension(16, 16); + ImageIcon icon; + JButton button; + JPanel buttonCont, progressCont; + FlowLayout buttonLayout; + SpringLayout progressLayout; + + SpringLayout layout = new SpringLayout(); + this.setLayout(layout); + + buttonLayout = new FlowLayout(); + buttonCont = new JPanel(buttonLayout); + this.add(buttonCont); + + button = new JButton(); + icon = new ImageIcon(this.getClass() + .getResource("/gui/icons/skipPrev.png"), "Previous Button"); + icon.setImage(icon.getImage().getScaledInstance(ICON_SIZE.width, ICON_SIZE.height, 0)); + button.setIcon(icon); + button.setPreferredSize(BUTTON_SIZE); + buttonCont.add(button); + this.prevButton = button; + + button = new JButton(); + icon = new ImageIcon(this.getClass().getResource("/gui/icons/play.png"), "Play Button"); + icon.setImage(icon.getImage().getScaledInstance(ICON_SIZE.width, ICON_SIZE.height, 0)); + button.setIcon(icon); + button.setPreferredSize(BUTTON_SIZE); + buttonCont.add(button); + this.playButton = button; + + button = new JButton(); + icon = new ImageIcon(this.getClass().getResource("/gui/icons/skipNext.png"), "Next Button"); + icon.setImage(icon.getImage().getScaledInstance(ICON_SIZE.width, ICON_SIZE.height, 0)); + button.setIcon(icon); + button.setPreferredSize(BUTTON_SIZE); + buttonCont.add(button); + this.nextButton = button; + + progressLayout = new SpringLayout(); + progressCont = new JPanel(progressLayout); + this.add(progressCont); + + this.progress = new JSlider(); + this.add(this.progress); + + layout.putConstraint(SpringLayout.NORTH, buttonCont, 0, SpringLayout.NORTH, this); + layout.putConstraint(SpringLayout.WEST, buttonCont, 0, SpringLayout.WEST, this); + layout.putConstraint(SpringLayout.NORTH, this.progress, 5, SpringLayout.SOUTH, buttonCont); + layout.putConstraint(SpringLayout.WEST, this.progress, 5, SpringLayout.WEST, this); + layout.putConstraint(SpringLayout.EAST, this, 5, SpringLayout.EAST, this.progress); + layout.putConstraint(SpringLayout.SOUTH, this, 5, SpringLayout.SOUTH, this.progress); + layout.putConstraint(SpringLayout.EAST, buttonCont, 0, SpringLayout.EAST, this); + } +} diff --git a/interface/src/main/resources/gui/icons/pause.png b/interface/src/main/resources/gui/icons/pause.png new file mode 100644 index 0000000..7b13a71 Binary files /dev/null and b/interface/src/main/resources/gui/icons/pause.png differ diff --git a/interface/src/main/resources/gui/icons/pause.svg b/interface/src/main/resources/gui/icons/pause.svg new file mode 100644 index 0000000..fd17c19 --- /dev/null +++ b/interface/src/main/resources/gui/icons/pause.svg @@ -0,0 +1,78 @@ + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/interface/src/main/resources/gui/icons/play.png b/interface/src/main/resources/gui/icons/play.png new file mode 100644 index 0000000..1a4940c Binary files /dev/null and b/interface/src/main/resources/gui/icons/play.png differ diff --git a/interface/src/main/resources/gui/icons/play.svg b/interface/src/main/resources/gui/icons/play.svg new file mode 100644 index 0000000..dc9b42c --- /dev/null +++ b/interface/src/main/resources/gui/icons/play.svg @@ -0,0 +1,74 @@ + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/interface/src/main/resources/gui/icons/skip.svg b/interface/src/main/resources/gui/icons/skip.svg new file mode 100644 index 0000000..512650a --- /dev/null +++ b/interface/src/main/resources/gui/icons/skip.svg @@ -0,0 +1,86 @@ + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/interface/src/main/resources/gui/icons/skipNext.png b/interface/src/main/resources/gui/icons/skipNext.png new file mode 100644 index 0000000..27d6901 Binary files /dev/null and b/interface/src/main/resources/gui/icons/skipNext.png differ diff --git a/interface/src/main/resources/gui/icons/skipPrev.png b/interface/src/main/resources/gui/icons/skipPrev.png new file mode 100644 index 0000000..b157a5a Binary files /dev/null and b/interface/src/main/resources/gui/icons/skipPrev.png differ diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..ff5ae7b --- /dev/null +++ b/settings.gradle @@ -0,0 +1,23 @@ +/* + * Copyright (c) 2021 William Hubbard. All Rights Reserved. + */ + +/* + * This settings file was generated by the Gradle 'init' task. + * + * The settings file is used to specify which projects to include in your build. + * In a single project build this file can be empty or even removed. + * + * Detailed information about configuring a multi-project build in Gradle can be found + * in the user guide at https://docs.gradle.org/4.4.1/userguide/multi_project_builds.html + */ + +/* +// To declare projects as part of a multi-project build use the 'include' method +include 'shared' +include 'api' +include 'services:webservice' +*/ + +rootProject.name = 'UniversalMusicPlayer' +include ':interface'