Merge pull request #157 from SimformSolutionsPvtLtd/develop

mukesh-simform · web-flow · commit 2c3282e299af · 2025-02-11T10:54:14.000+05:30
Release v2.1.3
diff --git a/android/build.gradle b/android/build.gradle
@@ -91,4 +91,7 @@ dependencies {
   // Android Audio Media3 Dependency
   implementation 'androidx.media3:media3-exoplayer:1.3.1'
   implementation 'androidx.media3:media3-common:1.3.1'
+
+  implementation "androidx.media3:media3-session:1.3.1"
+  implementation 'androidx.media3:media3-ui:1.3.1'
 }
diff --git a/android/src/main/java/com/audiowaveform/AudioPlayer.kt b/android/src/main/java/com/audiowaveform/AudioPlayer.kt
@@ -1,6 +1,11 @@
 package com.audiowaveform
 
+import android.content.Context
+import android.media.AudioAttributes
+import android.media.AudioFocusRequest
+import android.media.AudioManager
 import android.net.Uri
+import android.os.Build
 import android.os.CountDownTimer
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.Promise
@@ -18,13 +23,93 @@ class AudioPlayer(
 ) {
     private val appContext = context
     private lateinit var player: ExoPlayer
+    private var audioManager: AudioManager = appContext.getSystemService(Context.AUDIO_SERVICE) as AudioManager
+    private var audioFocusRequest: AudioFocusRequest? = null
     private var playerListener: Player.Listener? = null
     private var isPlayerPrepared: Boolean = false
     private var finishMode = FinishMode.Stop
     private val key = playerKey
     private var updateFrequency = UpdateFrequency.Low
     private lateinit var audioPlaybackListener: CountDownTimer
     private var isComponentMounted = true // Flag to track mounting status
+    private var isAudioFocusGranted=false
+
+    init {
+        // Set up the audio focus request
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            audioFocusRequest = AudioFocusRequest.Builder(AudioManager.AUDIOFOCUS_GAIN)
+                .setAudioAttributes(
+                    AudioAttributes.Builder()
+                        .setUsage(AudioAttributes.USAGE_MEDIA)
+                        .setContentType(AudioAttributes.CONTENT_TYPE_MUSIC)
+                        .build()
+                ).setAcceptsDelayedFocusGain(true)
+                .setOnAudioFocusChangeListener { focusChange ->
+                    handleAudioFocusChange(focusChange)
+                }
+                .build()
+        }
+    }
+
+    private fun handleAudioFocusChange(focusChange: Int) {
+        when (focusChange) {
+            AudioManager.AUDIOFOCUS_GAIN -> {
+                // Audio focus granted; resume playback if necessary
+                if (!player.isPlaying) {
+                    player.play()
+                }
+                player.volume = 1.0f // Restore full volume
+            }
+            AudioManager.AUDIOFOCUS_LOSS -> {
+                // Permanent loss of audio focus; pause playback
+                if (player.isPlaying) {
+                    val args: WritableMap = Arguments.createMap()
+                    stopListening()
+                    player.pause()
+                    abandonAudioFocus()
+                    args.putInt(Constants.finishType, 1)
+                    args.putString(Constants.playerKey, key)
+                    appContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)?.emit("onDidFinishPlayingAudio", args)
+                }
+            }
+            AudioManager.AUDIOFOCUS_LOSS_TRANSIENT -> {
+                // Temporary loss of audio focus; pause playback
+                if (player.isPlaying) {
+                    player.pause()
+                }
+            }
+            AudioManager.AUDIOFOCUS_LOSS_TRANSIENT_CAN_DUCK -> {
+                // Temporarily loss of audio focus; but can continue playing at a lower volume.
+                player.volume = 0.2f
+            }
+        }
+    }
+
+    private fun requestAudioFocus(): Boolean {
+        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            audioFocusRequest?.let {
+                val result = audioManager.requestAudioFocus(it)
+                isAudioFocusGranted = result == AudioManager.AUDIOFOCUS_REQUEST_GRANTED
+                return isAudioFocusGranted
+            } ?: false
+        } else {
+            val result = audioManager.requestAudioFocus(
+                { focusChange -> handleAudioFocusChange(focusChange) },
+                AudioManager.STREAM_MUSIC,
+                AudioManager.AUDIOFOCUS_GAIN
+            )
+            isAudioFocusGranted = result == AudioManager.AUDIOFOCUS_REQUEST_GRANTED
+            return isAudioFocusGranted
+        }
+    }
+
+    private fun abandonAudioFocus() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            audioManager.abandonAudioFocusRequest(audioFocusRequest!!)
+        }
+        isAudioFocusGranted = false
+    }
+
 
     fun markPlayerAsUnmounted() {
         isComponentMounted = false
@@ -134,12 +219,15 @@ class AudioPlayer(
                 this.finishMode = FinishMode.Stop
             }
 
-           validateAndSetPlaybackSpeed(player, speed)
-
-            player.playWhenReady = true
-            player.play()
-            promise.resolve(true)
-            startListening(promise)
+            validateAndSetPlaybackSpeed(player, speed)
+            if (requestAudioFocus()) {
+                player.playWhenReady = true
+                player.play()
+                promise.resolve(true)
+                startListening(promise)}
+            else {
+                promise.reject("AudioFocusError", "Failed to gain audio focus")
+            }
         } catch (e: Exception) {
             promise.reject("Can not start the player", e.toString())
         }
@@ -153,15 +241,17 @@ class AudioPlayer(
         isPlayerPrepared = false
         player.stop()
         player.release()
+        abandonAudioFocus()
     }
 
-    fun pause(promise: Promise) {
+    fun pause(promise: Promise?) {
         try {
             stopListening()
             player.pause()
-            promise.resolve(true)
+            abandonAudioFocus()
+            promise?.resolve(true)
         } catch (e: Exception) {
-            promise.reject("Failed to pause the player", e.toString())
+            promise?.reject("Failed to pause the player", e.toString())
         }
 
     }
diff --git a/android/src/main/java/com/audiowaveform/AudioRecorder.kt b/android/src/main/java/com/audiowaveform/AudioRecorder.kt
@@ -178,9 +178,10 @@ class AudioRecorder {
     fun pauseRecording(recorder: MediaRecorder?, promise: Promise) {
         try {
             recorder?.pause()
-            promise.resolve(false)
+            promise.resolve(true)
         } catch (e: IllegalStateException) {
             Log.e(Constants.LOG_TAG, "Failed to pause recording")
+            promise.resolve(false)
         }
     }
 
diff --git a/ios/AudioRecorder.swift b/ios/AudioRecorder.swift
@@ -45,8 +45,8 @@ public class AudioRecorder: NSObject, AVAudioRecorderDelegate{
       AVEncoderAudioQualityKey: AVAudioQuality.high.rawValue
     ]
     
-    let options: AVAudioSession.CategoryOptions = [.defaultToSpeaker, .allowBluetooth]
-   
+    let options: AVAudioSession.CategoryOptions = [.defaultToSpeaker, .allowBluetooth, .mixWithOthers]
+
     if (path == nil) {
       guard let newPath = self.createAudioRecordPath(fileNameFormat: fileNameFormat) else {
         reject(Constants.audioWaveforms, "Failed to initialise file URL", nil)
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@simform_solutions/react-native-audio-waveform",
-  "version": "2.1.2",
+  "version": "2.1.3",
   "description": "A React Native component to show audio waveform with ease in react native application",
   "main": "lib/index",
   "types": "lib/index.d.ts",
diff --git a/src/components/Waveform/Waveform.tsx b/src/components/Waveform/Waveform.tsx
@@ -68,6 +68,7 @@ export const Waveform = forwardRef<IWaveformRef, IWaveform>((props, ref) => {
   const scrollRef = useRef<ScrollView>(null);
   const isLayoutCalculated = useRef<boolean>(false);
   const isAutoPaused = useRef<boolean>(false);
+  const isAudioPlaying = useRef<boolean>(false);
   const [waveform, setWaveform] = useState<number[]>([]);
   const [viewLayout, setViewLayout] = useState<LayoutRectangle | null>(null);
   const [seekPosition, setSeekPosition] = useState<NativeTouchEvent | null>(
@@ -215,6 +216,7 @@ export const Waveform = forwardRef<IWaveformRef, IWaveform>((props, ref) => {
         const result = await stopPlayer({
           playerKey: `PlayerFor${path}`,
         });
+        isAudioPlaying.current = false;
         if (!isNil(result) && result) {
           if (resetProgress) {
             setCurrentProgress(0);
@@ -240,6 +242,7 @@ export const Waveform = forwardRef<IWaveformRef, IWaveform>((props, ref) => {
   const startPlayerAction = async (args?: IStartPlayerRef) => {
     if (mode === 'static') {
       try {
+        isAudioPlaying.current = true;
         if (playerState === PlayerState.stopped) {
           await preparePlayerForPath(currentProgress);
         }
@@ -278,6 +281,7 @@ export const Waveform = forwardRef<IWaveformRef, IWaveform>((props, ref) => {
   const pausePlayerAction = async (changePlayerState = true) => {
     if (mode === 'static') {
       try {
+        isAudioPlaying.current = false;
         const pause = await pausePlayer({
           playerKey: `PlayerFor${path}`,
         });
@@ -474,8 +478,9 @@ export const Waveform = forwardRef<IWaveformRef, IWaveform>((props, ref) => {
     const tracePlayerState = onDidFinishPlayingAudio(async data => {
       if (data.playerKey === `PlayerFor${path}`) {
         if (data.finishType === FinishMode.stop) {
-          setPlayerState(PlayerState.stopped);
-          setCurrentProgress(0);
+          stopPlayerAction();
+        } else if (data.finishType === FinishMode.pause) {
+          setPlayerState(PlayerState.paused);
         }
       }
     });
@@ -600,6 +605,20 @@ export const Waveform = forwardRef<IWaveformRef, IWaveform>((props, ref) => {
     }
   }, [currentProgress, songDuration, onCurrentProgressChange]);
 
+  /* Ensure that the audio player is released (or stopped) once the song's duration is determined, 
+  especially if the audio is not playing immediately after loading */
+  useEffect(() => {
+    if (
+      songDuration !== 0 &&
+      mode === 'static' &&
+      isAudioPlaying.current !== true
+    ) {
+      isAudioPlaying.current = false;
+      stopPlayerAction(false);
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [songDuration]);
+
   useImperativeHandle(ref, () => ({
     startPlayer: startPlayerAction,
     stopPlayer: stopPlayerAction,

Original file line number	Diff line number	Diff line change
`@@ -91,4 +91,7 @@ dependencies {`
`91`	`91`	`// Android Audio Media3 Dependency`
`92`	`92`	`implementation 'androidx.media3:media3-exoplayer:1.3.1'`
`93`	`93`	`implementation 'androidx.media3:media3-common:1.3.1'`
	`94`	`+`
	`95`	`+ implementation "androidx.media3:media3-session:1.3.1"`
	`96`	`+ implementation 'androidx.media3:media3-ui:1.3.1'`
`94`	`97`	`}`
Original file line number	Diff line number	Diff line change
`@@ -178,9 +178,10 @@ class AudioRecorder {`
`178`	`178`	`fun pauseRecording(recorder: MediaRecorder?, promise: Promise) {`
`179`	`179`	`try {`
`180`	`180`	`recorder?.pause()`
`181`		`- promise.resolve(false)`
	`181`	`+ promise.resolve(true)`
`182`	`182`	`} catch (e: IllegalStateException) {`
`183`	`183`	`Log.e(Constants.LOG_TAG, "Failed to pause recording")`
	`184`	`+ promise.resolve(false)`
`184`	`185`	`}`
`185`	`186`	`}`
`186`	`187`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@simform_solutions/react-native-audio-waveform",`
`3`		`- "version": "2.1.2",`
	`3`	`+ "version": "2.1.3",`
`4`	`4`	`"description": "A React Native component to show audio waveform with ease in react native application",`
`5`	`5`	`"main": "lib/index",`
`6`	`6`	`"types": "lib/index.d.ts",`