Merge pull request #412 from bitmovin/feature/PRN-108-fix-event-liste…

…ner-conflicts Fix event listener conflicts
bitmovin · Mar 21, 2024 · b07a53c · b07a53c
2 parents 62dabc6 + 8fe5a24
commit b07a53c
Show file tree

Hide file tree

Showing 11 changed files with 714 additions and 332 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,10 @@
 
 - `CueEnterEvent` and `CueExitEvent` to signal when a subtitle entry transitions into an active or inactive status respectively
 
+### Fixed
+
+- Fix potential event name conflicts with other 3rd party libraries
+
 ## [0.18.0] (2024-03-06)
 
 ### Changed

diff --git a/android/src/main/java/com/bitmovin/player/reactnative/RNPlayerViewManager.kt b/android/src/main/java/com/bitmovin/player/reactnative/RNPlayerViewManager.kt
@@ -68,67 +68,67 @@ class RNPlayerViewManager(private val context: ReactApplicationContext) : Simple
      * be accessed from React.
      */
     private val bubblingEventsMapping: Map<String, String> = mapOf(
-        "event" to "onEvent",
-        "playerError" to "onPlayerError",
-        "playerWarning" to "onPlayerWarning",
-        "destroy" to "onDestroy",
-        "muted" to "onMuted",
-        "unmuted" to "onUnmuted",
-        "ready" to "onReady",
-        "paused" to "onPaused",
-        "play" to "onPlay",
-        "playing" to "onPlaying",
-        "playbackFinished" to "onPlaybackFinished",
-        "seek" to "onSeek",
-        "seeked" to "onSeeked",
-        "timeShift" to "onTimeShift",
-        "timeShifted" to "onTimeShifted",
-        "stallStarted" to "onStallStarted",
-        "stallEnded" to "onStallEnded",
-        "timeChanged" to "onTimeChanged",
-        "sourceLoad" to "onSourceLoad",
-        "sourceLoaded" to "onSourceLoaded",
-        "sourceUnloaded" to "onSourceUnloaded",
-        "sourceError" to "onSourceError",
-        "sourceWarning" to "onSourceWarning",
-        "audioAdded" to "onAudioAdded",
-        "audioChanged" to "onAudioChanged",
-        "audioRemoved" to "onAudioRemoved",
-        "subtitleAdded" to "onSubtitleAdded",
-        "subtitleChanged" to "onSubtitleChanged",
-        "subtitleRemoved" to "onSubtitleRemoved",
-        "downloadFinished" to "onDownloadFinished",
-        "videoDownloadQualityChanged" to "onVideoDownloadQualityChanged",
-        "pictureInPictureAvailabilityChanged" to "onPictureInPictureAvailabilityChanged",
-        "pictureInPictureEnter" to "onPictureInPictureEnter",
-        "pictureInPictureExit" to "onPictureInPictureExit",
-        "adBreakFinished" to "onAdBreakFinished",
-        "adBreakStarted" to "onAdBreakStarted",
-        "adClicked" to "onAdClicked",
-        "adError" to "onAdError",
-        "adFinished" to "onAdFinished",
-        "adManifestLoad" to "onAdManifestLoad",
-        "adManifestLoaded" to "onAdManifestLoaded",
-        "adQuartile" to "onAdQuartile",
-        "adScheduled" to "onAdScheduled",
-        "adSkipped" to "onAdSkipped",
-        "adStarted" to "onAdStarted",
-        "videoPlaybackQualityChanged" to "onVideoPlaybackQualityChanged",
-        "fullscreenEnabled" to "onFullscreenEnabled",
-        "fullscreenDisabled" to "onFullscreenDisabled",
-        "fullscreenEnter" to "onFullscreenEnter",
-        "fullscreenExit" to "onFullscreenExit",
-        "castStart" to "onCastStart",
-        "castPlaybackFinished" to "onCastPlaybackFinished",
-        "castPaused" to "onCastPaused",
-        "castPlaying" to "onCastPlaying",
-        "castStarted" to "onCastStarted",
-        "castAvailable" to "onCastAvailable",
-        "castStopped" to "onCastStopped",
-        "castWaitingForDevice" to "onCastWaitingForDevice",
-        "castTimeUpdated" to "onCastTimeUpdated",
-        "cueEnter" to "onCueEnter",
-        "cueExit" to "onCueExit",
+        "event" to "onBmpEvent",
+        "playerError" to "onBmpPlayerError",
+        "playerWarning" to "onBmpPlayerWarning",
+        "destroy" to "onBmpDestroy",
+        "muted" to "onBmpMuted",
+        "unmuted" to "onBmpUnmuted",
+        "ready" to "onBmpReady",
+        "paused" to "onBmpPaused",
+        "play" to "onBmpPlay",
+        "playing" to "onBmpPlaying",
+        "playbackFinished" to "onBmpPlaybackFinished",
+        "seek" to "onBmpSeek",
+        "seeked" to "onBmpSeeked",
+        "timeShift" to "onBmpTimeShift",
+        "timeShifted" to "onBmpTimeShifted",
+        "stallStarted" to "onBmpStallStarted",
+        "stallEnded" to "onBmpStallEnded",
+        "timeChanged" to "onBmpTimeChanged",
+        "sourceLoad" to "onBmpSourceLoad",
+        "sourceLoaded" to "onBmpSourceLoaded",
+        "sourceUnloaded" to "onBmpSourceUnloaded",
+        "sourceError" to "onBmpSourceError",
+        "sourceWarning" to "onBmpSourceWarning",
+        "audioAdded" to "onBmpAudioAdded",
+        "audioChanged" to "onBmpAudioChanged",
+        "audioRemoved" to "onBmpAudioRemoved",
+        "subtitleAdded" to "onBmpSubtitleAdded",
+        "subtitleChanged" to "onBmpSubtitleChanged",
+        "subtitleRemoved" to "onBmpSubtitleRemoved",
+        "downloadFinished" to "onBmpDownloadFinished",
+        "videoDownloadQualityChanged" to "onBmpVideoDownloadQualityChanged",
+        "pictureInPictureAvailabilityChanged" to "onBmpPictureInPictureAvailabilityChanged",
+        "pictureInPictureEnter" to "onBmpPictureInPictureEnter",
+        "pictureInPictureExit" to "onBmpPictureInPictureExit",
+        "adBreakFinished" to "onBmpAdBreakFinished",
+        "adBreakStarted" to "onBmpAdBreakStarted",
+        "adClicked" to "onBmpAdClicked",
+        "adError" to "onBmpAdError",
+        "adFinished" to "onBmpAdFinished",
+        "adManifestLoad" to "onBmpAdManifestLoad",
+        "adManifestLoaded" to "onBmpAdManifestLoaded",
+        "adQuartile" to "onBmpAdQuartile",
+        "adScheduled" to "onBmpAdScheduled",
+        "adSkipped" to "onBmpAdSkipped",
+        "adStarted" to "onBmpAdStarted",
+        "videoPlaybackQualityChanged" to "onBmpVideoPlaybackQualityChanged",
+        "fullscreenEnabled" to "onBmpFullscreenEnabled",
+        "fullscreenDisabled" to "onBmpFullscreenDisabled",
+        "fullscreenEnter" to "onBmpFullscreenEnter",
+        "fullscreenExit" to "onBmpFullscreenExit",
+        "castStart" to "onBmpCastStart",
+        "castPlaybackFinished" to "onBmpCastPlaybackFinished",
+        "castPaused" to "onBmpCastPaused",
+        "castPlaying" to "onBmpCastPlaying",
+        "castStarted" to "onBmpCastStarted",
+        "castAvailable" to "onBmpCastAvailable",
+        "castStopped" to "onBmpCastStopped",
+        "castWaitingForDevice" to "onBmpCastWaitingForDevice",
+        "castTimeUpdated" to "onBmpCastTimeUpdated",
+        "cueEnter" to "onBmpCueEnter",
+        "cueExit" to "onBmpCueExit",
     )
 
     /**