fix: adStarted method in ios, pause in android

Author: aleccolville

README.md

@@ -73,7 +73,7 @@ import { BrightcoveIMAPlayer } from "react-native-brightcove-ima-player";
 | adVideoLoadTimeout     | number   | Set the amount of milliseconds for video to load. Default is `3000`                 |                              |
 | playbackRate           | number   | Set playback speed scale. Default is `1`                                            |                              |
 | disableDefaultControl  | boolean  | Disable default player control. Set `true` when you implement own video controller. |                              |
-| adStarted              | Function | Indicates the IMA ad has started (ANDROID ONLY)                                     |                              |
+| adStarted              | Function | Indicates the IMA ad has started                                                    |                              |
 | onReady                | Function | Indicates the video can be played back                                              |                              |
 | onPlay                 | Function | Indicates the video playback starts                                                 |                              |
 | onPause                | Function | Indicates the video is paused                                                       |                              |

android/src/main/java/com/matejdr/brightcoveimaplayer/BrightcoveIMAPlayerView.java

@@ -329,22 +329,20 @@ public void stopPlayback() {
   }
 
   public void pause() {
-    if (this.brightcoveVideoView != null) {
-      if (this.adsPlaying && this.googleIMAComponent != null) {
-        this.googleIMAComponent.getVideoAdPlayer().pauseAd();
-      } else if (this.playing) {
-        this.brightcoveVideoView.pause();
-      }
+    if (this.adsPlaying && this.googleIMAComponent != null && this.googleIMAComponent.getVideoAdPlayer() != null) {
+      // TODO upgrade to pauseAd(AdMediaInfo)
+      this.googleIMAComponent.getVideoAdPlayer().pause();
+    } else if (this.playing && this.brightcoveVideoView != null) {
+      this.brightcoveVideoView.pause(); 
     }
   }
 
   public void play() {
-    if (this.brightcoveVideoView != null) {
-      if (this.adsPlaying && this.googleIMAComponent != null) {
-        this.googleIMAComponent.getVideoAdPlayer().resumeAd();
-      } else {
-        this.brightcoveVideoView.start();
-      }
+    if (this.adsPlaying && this.googleIMAComponent != null && this.googleIMAComponent.getVideoAdPlayer() != null) {
+      // TODO upgrade to resumeAd(AdMediaInfo)
+      this.googleIMAComponent.getVideoAdPlayer().resumeAd();
+    } else if (this.brightcoveVideoView != null) {
+      this.brightcoveVideoView.start();
     }
   }
 

android/src/main/java/com/matejdr/brightcoveimaplayer/BrightcoveIMAPlayerViewManager.java

@@ -167,7 +167,7 @@ public void receiveCommand(BrightcoveIMAPlayerView view, int commandType, @Nulla
   public @Nullable
   Map<String, Object> getExportedCustomDirectEventTypeConstants() {
     Map<String, Object> map = new HashMap<>();
-    map.put(AD_STARTED, (Object) MapBuilder.of("registrationName", "adStarted"));
+    map.put(AD_STARTED, (Object) MapBuilder.of("registrationName", "onAdStarted"));
     map.put(EVENT_READY, (Object) MapBuilder.of("registrationName", "onReady"));
     map.put(EVENT_PLAY, (Object) MapBuilder.of("registrationName", "onPlay"));
     map.put(EVENT_PAUSE, (Object) MapBuilder.of("registrationName", "onPause"));

ios/BrightcoveIMAPlayerView.h

@@ -38,6 +38,7 @@
 @property (nonatomic, copy) NSString *videoId;
 @property (nonatomic, copy) NSString *accountId;
 @property (nonatomic, copy) NSString *policyKey;
+@property (nonatomic, copy) RCTDirectEventBlock onAdStarted;
 @property (nonatomic, copy) RCTDirectEventBlock onReady;
 @property (nonatomic, copy) RCTDirectEventBlock onPlay;
 @property (nonatomic, copy) RCTDirectEventBlock onPause;

ios/BrightcoveIMAPlayerView.m

@@ -332,6 +332,10 @@ - (void)playbackController:(id<BCOVPlaybackController>)controller playbackSessio
         if (self.onPause) {
             self.onPause(@{});
         }
+    } else if (lifecycleEvent.eventType == kBCOVIMALifecycleEventAdsLoaderLoaded) {
+        if (self.onAdStarted) {
+            self.onAdStarted(@{});
+        }
     } else if (lifecycleEvent.eventType == kBCOVPlaybackSessionLifecycleEventAdProgress) {
         // catches scroll away before ads start bug
         if (!_inViewPort) {

ios/BrightcoveIMAPlayerViewManager.m

@@ -27,6 +27,7 @@ - (dispatch_queue_t)methodQueue {
 RCT_EXPORT_VIEW_PROPERTY(bitRate, NSNumber);
 RCT_EXPORT_VIEW_PROPERTY(adVideoLoadTimeout, NSNumber);
 RCT_EXPORT_VIEW_PROPERTY(playbackRate, NSNumber);
+RCT_EXPORT_VIEW_PROPERTY(onAdStarted, RCTDirectEventBlock);
 RCT_EXPORT_VIEW_PROPERTY(onReady, RCTDirectEventBlock);
 RCT_EXPORT_VIEW_PROPERTY(onPlay, RCTDirectEventBlock);
 RCT_EXPORT_VIEW_PROPERTY(onPause, RCTDirectEventBlock);

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-brightcove-ima-player",
-  "version": "2.2.7",
+  "version": "2.2.8",
   "description": "React Native implementation of Brightcove Player native SDK",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",

src/BrightcoveIMAPlayer.tsx

@@ -54,7 +54,7 @@ type BrightcoveIMAPlayerProps = ViewProps & {
    */
   adVideoLoadTimeout?: number;
   playbackRate?: number;
-  adStarted?: (
+  onAdStarted?: (
     event: NativeSyntheticEvent<TBrightcoveIMAPlayerEventBase>
   ) => void;
   onReady?: (