diff --git a/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Audio/AudioManager.java b/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Audio/AudioManager.java index b929d09..6587275 100644 --- a/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Audio/AudioManager.java +++ b/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Audio/AudioManager.java @@ -7,7 +7,7 @@ public class AudioManager { - private AudioManager instance = new AudioManager(); + private static AudioManager instance = new AudioManager(); private Map sounds = new EnumMap<>(SoundEffect.class); private double volume = 1.0; @@ -25,7 +25,7 @@ public AudioManager() { } } - public AudioManager getInstance() { + public static AudioManager getInstance() { return instance; } diff --git a/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Audio/SoundEffect.java b/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Audio/SoundEffect.java index 8d145b4..3341a6e 100644 --- a/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Audio/SoundEffect.java +++ b/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Audio/SoundEffect.java @@ -2,8 +2,8 @@ public enum SoundEffect { - OPEN_APP("/Audio/mouse_click.wav"), - CLOSE_APP("/Audio/mouse_click.wav"); + OPEN_APP("/Audio/open_app.wav"), + CLOSE_APP("/Audio/close_app.wav"); private String path; diff --git a/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Controller/PopupsController.java b/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Controller/PopupsController.java index d44cc7b..027823d 100644 --- a/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Controller/PopupsController.java +++ b/src/main/java/edu/ntnu/idi/idatt2003/gruppe42/Controller/PopupsController.java @@ -1,5 +1,7 @@ package edu.ntnu.idi.idatt2003.gruppe42.Controller; +import edu.ntnu.idi.idatt2003.gruppe42.Audio.AudioManager; +import edu.ntnu.idi.idatt2003.gruppe42.Audio.SoundEffect; import edu.ntnu.idi.idatt2003.gruppe42.Model.App; import edu.ntnu.idi.idatt2003.gruppe42.View.Popup; import java.util.List; @@ -12,6 +14,7 @@ public final class PopupsController { private final List popups; + private AudioManager audioManager = AudioManager.getInstance(); public PopupsController(List popups) { this.popups = popups; @@ -35,6 +38,7 @@ public boolean show(App type) { popup.getRoot().autosize(); popup.getRoot().toFront(); }); + audioManager.play(SoundEffect.OPEN_APP); return true; } @@ -43,6 +47,7 @@ public boolean hide(Popup popup) { return false; } popup.getRoot().setVisible(false); + audioManager.play(SoundEffect.CLOSE_APP); return true; } diff --git a/src/main/resources/Audio/close_app.wav b/src/main/resources/Audio/close_app.wav new file mode 100644 index 0000000..55ea3aa Binary files /dev/null and b/src/main/resources/Audio/close_app.wav differ diff --git a/src/main/resources/Audio/open_app.wav b/src/main/resources/Audio/open_app.wav new file mode 100644 index 0000000..1332cc1 Binary files /dev/null and b/src/main/resources/Audio/open_app.wav differ