🐛 [Fix]: 재생 관련 오류 수정 #447 #448 #449 #450 (#451)

* 🐛[Fix]: Fix Image Name

	* 헤드폰 이미지의 이름을
	  headPhone -> HeadPhone으로 변경
	* 시뮬레이터에서 해당 이미지가 나오지 않는 현상이 해결됨

* 🛠️ [Chore]: 온보딩이미지 파일 이름 전체 변경

	* 파인더와 Xcode내에서 사용하는 이미지 이름을 동일하게 변경

* 🗑️ [Del]: Assets

* ➕[Add]: Assets

* 🐛[Fix]: 이전 곡 재생, 다음 곡 재생시 play 버튼 오류

* 🐛[Fix]: ListenListCell 터치하면 재생되도록 변경

* 🐛 [Fix]: 간격 조절시 일부 음원이 전체 재생되지 않는 문제 해결

* 🐛 [Fix]: 아무런 지표를 설정하지 않아도 음원이 저장되도록 수정

* 🗑️ [Del]: 불필요한 init 코드 제거

* ✏️[Comment]: MARK 주석 추가

* 🪄[Style]: 명시적으로 변경 - toggle -> true & false

---------

Co-authored-by: hamsik22 <[email protected]>

Author: doyeonjeong

RelaxOn.xcodeproj/xcshareddata/xcschemes/RelaxOn.xcscheme

@@ -41,7 +41,7 @@
       </Testables>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Debug"
+      buildConfiguration = "Release"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"

RelaxOn/App/Manager/AudioEngineManager.swift

@@ -9,6 +9,8 @@ import AVFoundation
 import Combine
 
 final class AudioEngineManager: ObservableObject {
+    
+    // MARK: - Properties
     static let shared = AudioEngineManager()
 
     var engine = AVAudioEngine()
@@ -22,11 +24,8 @@ final class AudioEngineManager: ObservableObject {
     private var intervalCancellable: AnyCancellable?
     private var timerSubscription: Cancellable?
 
-    @Published var interval: Double = 1.0 {
-        didSet {
-            scheduleNextBuffer()
-        }
-    }
+    @Published private var currentPlayingSound: Playable?
+    @Published var interval: Double = 1.0
 
     @Published var pitch: Double = 0 {
         didSet {
@@ -48,6 +47,7 @@ final class AudioEngineManager: ObservableObject {
         }
     }
 
+    // MARK: - Initialization
     private init() {
         setupAudioSession()
         setupEngine()
@@ -74,11 +74,19 @@ extension AudioEngineManager {
     }
 
     private func setupConnections() {
+        if engine.isRunning {
+            engine.stop()
+        }
         if let audioFile = audioFile {
             engine.connect(player, to: pitchEffect, format: audioFile.processingFormat)
             engine.connect(pitchEffect, to: volumeEffect, format: audioFile.processingFormat)
             engine.connect(volumeEffect, to: engine.mainMixerNode, format: audioFile.processingFormat)
         }
+        do {
+            try engine.start()
+        } catch {
+            print("Unable to start engine: \(error.localizedDescription)")
+        }
     }
 
     /**
@@ -90,6 +98,7 @@ extension AudioEngineManager {
             .removeDuplicates()
             .debounce(for: .milliseconds(300), scheduler: RunLoop.main)
             .sink { [weak self] _ in
+                self?.timerSubscription?.cancel()
                 self?.scheduleNextBuffer()
             }
     }
@@ -102,6 +111,8 @@ extension AudioEngineManager {
     func play<T: Playable>(with sound: T) {
         print(#function)
 
+        currentPlayingSound = sound
+        
         let targetFile = sound.filter.rawValue
         guard let fileURL = Bundle.main.url(forResource: targetFile, withExtension: MusicExtension.mp3.rawValue) else {
             print("File not found")
@@ -117,7 +128,7 @@ extension AudioEngineManager {
                 audioVariation = customSound.audioVariation
             }
 
-            scheduleNextBuffer()
+            scheduleNextBuffer(with: sound)
 
         } catch {
             print(error.localizedDescription)
@@ -159,17 +170,27 @@ extension AudioEngineManager {
      다음 오디오 버퍼를 스케줄링합니다. 준비된 버퍼를 사용해 오디오를 재생하고, 주어진 인터벌에 따라 다음 버퍼 재생을 스케줄링합니다.
      Combine 프레임워크의 Timer.publish를 사용하여 지정된 인터벌마다 버퍼 재생을 반복합니다.
      */
-    private func scheduleNextBuffer() {
+    private func scheduleNextBuffer(with playingSound: Playable? = nil) {
         print(#function)
 
         guard let buffer = audioBuffer else {
             print("Failed to prepare buffer")
             return
         }
 
+        guard let sound = playingSound ?? currentPlayingSound else {
+            print("No playing sound")
+            return
+        }
+        
         // 취소 가능한 타이머를 만듭니다.
         timerSubscription?.cancel()
-        timerSubscription = Timer.publish(every: interval, on: RunLoop.main, in: .common)
+        
+        timerSubscription = Timer.publish(
+            every: interval + sound.filter.duration,
+            on: RunLoop.main,
+            in: .common
+        )
             .autoconnect()
             .sink { [weak self] _ in
                 guard let self = self else { return }

RelaxOn/App/Manager/UserDefaultsManager.swift

@@ -11,11 +11,14 @@ import Foundation
  UserDefaults에 사용자가 저장한 사운드 정보 & 온보딩 여부 & 마지막 재생 사운드 정보
  */
 final class UserDefaultsManager {
+    
+    // MARK: - Properties
     static let shared = UserDefaultsManager()
     private let standard = UserDefaults.standard
     private let CUSTOM_SOUND_KEY = UserDefaults.Keys.customSound
     private let IS_FIRST_VISIT = UserDefaults.Keys.isFirstVisit
     private let LAST_SOUND_KEY = UserDefaults.Keys.lastPlayedSoundKey
+    
 }
 
 // MARK: - Data Get, Set Properties
@@ -73,6 +76,11 @@ extension UserDefaultsManager {
             standard.set(data, forKey: LAST_SOUND_KEY)
         }
     }
+
+}
+
+// MARK: - Methods
+extension UserDefaultsManager {
 
     func removeOneCustomSound(at index: Int) {
         var customSounds = self.customSounds
@@ -83,4 +91,5 @@ extension UserDefaultsManager {
     func removeAllCustomSounds() {
         standard.removeObject(forKey: CUSTOM_SOUND_KEY)
     }
+    
 }

RelaxOn/App/Manager/UserFileManager.swift

@@ -11,10 +11,14 @@ import Foundation
  FileManager에 오디오 데이터를 파일로 저장 & 불러오기 & (파일이름)수정 & 파일 삭제 기능
  */
 final class UserFileManager {
+    
+    // MARK: - Properties
     static let shared = UserFileManager()
     private let fileManager = FileManager.default
+    
 }
 
+// MARK: - Methods
 extension UserFileManager {
 
     func saveCustomSound(_ customSound: CustomSound) -> Bool {

RelaxOn/App/Models/AudioVariation.swift

@@ -15,13 +15,7 @@ struct AudioVariation: Codable {
     var pitch: Float
     var interval: Float
 
-    init() {
-        self.volume = 0.5
-        self.pitch = 0
-        self.interval = 1.0
-    }
-    
-    init(volume: Float, pitch: Float, interval: Float = 1.0) {
+    init(volume: Float = 0.5, pitch: Float = 0, interval: Float = 1.0) {
         self.volume = volume
         self.pitch = pitch
         self.interval = interval

RelaxOn/App/Models/CustomSound.swift

@@ -19,16 +19,13 @@ struct CustomSound: Identifiable, Codable, Equatable, Playable {
     var filter: AudioFilter
     var color: String
 
-    init() {
-        self.id = UUID()
-        self.title = "저장된 음원이 없습니다."
-        self.category = .none
-        self.audioVariation = AudioVariation()
-        self.filter = .none
-        self.color = SoundCategory.none.defaultColor
-    }
-    
-    init(title: String, category: SoundCategory, variation: AudioVariation, filter: AudioFilter, color: String = "") {
+    init(
+        title: String = "저장된 음원이 없습니다.",
+        category: SoundCategory = .none,
+        variation: AudioVariation = AudioVariation(),
+        filter: AudioFilter = .none,
+        color: String = ""
+    ) {
         self.id = UUID()
         self.title = title
         self.category = category
@@ -48,6 +45,46 @@ enum AudioFilter: String, Codable {
     case WaterDrop, Basement, Cave, Pipe, Sink
     case SingingBowl, Focus, Training, Empty, Vibration
     case Bird, Owl, Woodpecker, Forest, Cuckoo
+    
+    var duration: TimeInterval {
+        switch self {
+        case .none:
+            return 0.0
+            
+        case .WaterDrop:
+            return 1.0
+        case .Basement:
+            return 2.0
+        case .Cave:
+            return 2.0
+        case .Pipe:
+            return 3.0
+        case .Sink:
+            return 2.0
+            
+        case .SingingBowl:
+            return 5.0
+        case .Focus:
+            return 5.0
+        case .Training:
+            return 4.0
+        case .Empty:
+            return 5.0
+        case .Vibration:
+            return 7.0
+            
+        case .Bird:
+            return 1.0
+        case .Owl:
+            return 3.0
+        case .Woodpecker:
+            return 4.0
+        case .Forest:
+            return 4.0
+        case .Cuckoo:
+            return 3.0
+        }
+    }
 }
 
 /// 원본 사운드 유형 관리를 위한 열거형

RelaxOn/App/ViewModel/CustomSoundViewModel.swift

@@ -78,21 +78,21 @@ final class CustomSoundViewModel: ObservableObject {
     }
 
     /// sound의 재생 간격 저장
-    @Published var interval: Float {
+    @Published var interval: Float = 1.0 {
         didSet {
             audioEngineManager.audioVariation.interval = interval
         }
     }
 
     /// sound의 피치 저장
-    @Published var pitch = Float() {
+    @Published var pitch: Float = 0 {
         didSet {
             audioEngineManager.audioVariation.pitch = pitch
         }
     }
 
     /// sound의 볼륨 저장
-    @Published var volume = Float() {
+    @Published var volume: Float = 1.0 {
         didSet {
             audioEngineManager.audioVariation.volume = volume
         }
@@ -129,9 +129,6 @@ final class CustomSoundViewModel: ObservableObject {
     init(customSound: CustomSound? = nil, filter: AudioFilter = .none) {
         self.selectedSound = customSound
         self.filter = filter
-        self.interval = 0.0
-        self.pitch = 0.0
-        self.volume = 0.0
         self.lastSound = userDefaults.lastPlayedSound
         self.filters = []
     }
@@ -142,12 +139,16 @@ final class CustomSoundViewModel: ObservableObject {
 extension CustomSoundViewModel {
 
     func play<T: Playable>(with sound: T) {
-        isPlaying.toggle()
+        if !isPlaying {
+            isPlaying = true
+        }
         audioEngineManager.play(with: sound)
     }
 
     func stopSound() {
-        isPlaying.toggle()
+        if isPlaying {
+            isPlaying = false
+        }
         audioEngineManager.stop()
     }
 

RelaxOn/App/Views/Listen/ListenListView.swift

@@ -44,6 +44,12 @@ struct ListenListView: View {
                             withAnimation {
                                 isShowingPlayer = true
                             }
+                            if viewModel.isPlaying {
+                                viewModel.stopSound()
+                                viewModel.play(with: file)
+                            } else {
+                                viewModel.play(with: file)
+                            }
                         }
                 }
                 .onDelete { indexSet in