diff --git a/nirvana-ios.xcodeproj/project.pbxproj b/nirvana-ios.xcodeproj/project.pbxproj index 51e8f80..5220a96 100644 --- a/nirvana-ios.xcodeproj/project.pbxproj +++ b/nirvana-ios.xcodeproj/project.pbxproj @@ -17,7 +17,7 @@ 890919A42781845D0025F4BB /* AlertToast in Frameworks */ = {isa = PBXBuildFile; productRef = 890919A32781845D0025F4BB /* AlertToast */; }; 890919A7278299590025F4BB /* RuleBook.swift in Sources */ = {isa = PBXBuildFile; fileRef = 890919A6278299590025F4BB /* RuleBook.swift */; }; 890919AB2782DC760025F4BB /* ProgressBarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 890919AA2782DC760025F4BB /* ProgressBarView.swift */; }; - 890919B1278401E00025F4BB /* woosh.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 890919B0278401E00025F4BB /* woosh.mp3 */; }; + 890919B3278424C70025F4BB /* woosh.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 890919B2278424C70025F4BB /* woosh.mp3 */; }; 890C245D277BF628009B4A30 /* AgoraRtcKit in Frameworks */ = {isa = PBXBuildFile; productRef = 890C245C277BF628009B4A30 /* AgoraRtcKit */; }; 890C2460277BF896009B4A30 /* AgoraViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 890C245F277BF896009B4A30 /* AgoraViewController.swift */; }; 890C2462277BF935009B4A30 /* CallView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 890C2461277BF935009B4A30 /* CallView.swift */; }; @@ -110,7 +110,7 @@ 8909199D278155920025F4BB /* UserStatusView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserStatusView.swift; sourceTree = ""; }; 890919A6278299590025F4BB /* RuleBook.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RuleBook.swift; sourceTree = ""; }; 890919AA2782DC760025F4BB /* ProgressBarView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProgressBarView.swift; sourceTree = ""; }; - 890919B0278401E00025F4BB /* woosh.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = woosh.mp3; sourceTree = ""; }; + 890919B2278424C70025F4BB /* woosh.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = woosh.mp3; sourceTree = ""; }; 890C245F277BF896009B4A30 /* AgoraViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AgoraViewController.swift; sourceTree = ""; }; 890C2461277BF935009B4A30 /* CallView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CallView.swift; sourceTree = ""; }; 890C2463277BFA97009B4A30 /* AgroRep.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AgroRep.swift; sourceTree = ""; }; @@ -212,7 +212,7 @@ isa = PBXGroup; children = ( 8909199B277EFDF30025F4BB /* joinSound.mp3 */, - 890919B0278401E00025F4BB /* woosh.mp3 */, + 890919B2278424C70025F4BB /* woosh.mp3 */, 89091998277EFDCC0025F4BB /* leaveSound.mp3 */, ); path = sounds; @@ -629,7 +629,7 @@ 891A15E827653A7100B26659 /* Preview Assets.xcassets in Resources */, 8909199C277EFDF30025F4BB /* joinSound.mp3 in Resources */, 891A15E527653A7100B26659 /* Assets.xcassets in Resources */, - 890919B1278401E00025F4BB /* woosh.mp3 in Resources */, + 890919B3278424C70025F4BB /* woosh.mp3 in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/nirvana-ios/Views/InnerCircle/CircleGridView.swift b/nirvana-ios/Views/InnerCircle/CircleGridView.swift index 78a765f..35f52ed 100644 --- a/nirvana-ios/Views/InnerCircle/CircleGridView.swift +++ b/nirvana-ios/Views/InnerCircle/CircleGridView.swift @@ -369,6 +369,8 @@ struct CircleGridView: View { } self.animateLiveConvos = true + + self.innerCircleVM.playWoosh() } .onReceive(self.authSessionStore.$messagesArr) {_ in // TODO: don't know if this fires if I am active and I receive a message but that's not something I am allowing right now with the continuous convo feature diff --git a/nirvana-ios/Views/InnerCircle/InnerCircleViewModel.swift b/nirvana-ios/Views/InnerCircle/InnerCircleViewModel.swift index de11875..10e32c5 100644 --- a/nirvana-ios/Views/InnerCircle/InnerCircleViewModel.swift +++ b/nirvana-ios/Views/InnerCircle/InnerCircleViewModel.swift @@ -168,14 +168,7 @@ extension InnerCircleViewModel { switch res { case .success: // play woosh - if let wooshFilePath = URL(string: Bundle.main.path(forResource: "woosh", ofType: "mp3") ?? "") { - print(wooshFilePath) - - self?.stopPlayingAnyAudio() - self?.queuePlayer = AVQueuePlayer(playerItem: AVPlayerItem(url: wooshFilePath)) - self?.queuePlayer.automaticallyWaitsToMinimizeStalling = false - self?.queuePlayer.play() - } + self?.playWoosh() self?.toast = .clipSent @@ -210,7 +203,23 @@ extension InnerCircleViewModel { return FileManager.default.temporaryDirectory } - + func playWoosh() { + if let wooshFilePath = Bundle.main.url(forResource: "woosh", withExtension: "mp3") { + self.stopPlayingAnyAudio() + + print(wooshFilePath) + + let player = AVPlayer(url: wooshFilePath) + player.play() + +// self.queuePlayer = AVQueuePlayer(playerItem: AVPlayerItem(url: wooshFilePath)) +// self.queuePlayer.automaticallyWaitsToMinimizeStalling = false +// self.queuePlayer.play() + } + else { + print("didn't get the ath") + } + } }