Merge branch 'release/0.2.6'

Author: chaimPaneth

README.md

@@ -176,9 +176,10 @@ Running the example project:
 
 ## Available props
 
-| Prop         | Description                      | Type     |
-| ------------ | -------------------------------- | -------- |
-| **`config`** | The JW [Config](#Config) object. | `Object` |
+| Prop           | Description                      | Default     | Type      |
+| -------------- | -------------------------------- | ----------- | --------- |
+| **`config`**   | The JW [Config](#Config) object. | `undefined` | `Object`  |
+| **`controls`** | Should the player controls show. | `true`      | `Boolean` |
 
 ##### Config
 

index.d.ts

@@ -142,6 +142,7 @@ declare module "react-native-jw-media-player" {
   }
   interface PropsType {
     config: Config;
+    controls: boolean;
     onPlayerReady?: (event: any) => void;
     onPlaylist?: (playlist: PlaylistItem[]) => void;
     onBeforePlay?: (event: any) => void;
@@ -173,11 +174,11 @@ declare module "react-native-jw-media-player" {
     toggleSpeed(): void;
     setSpeed(speed: number): void;
     setPlaylistIndex(index: number): void;
-    setControls(shouldDisplayControl: boolean): void;
+    setControls(show: boolean): void;
     loadPlaylist(playlist: PlaylistItem[]): void;
     loadPlaylistItem(playlistItem: PlaylistItem): void;
     seekTo(time: number): void;
-    setFullscreen(shouldDisplayInFullScreen: boolean): void;
+    setFullscreen(fullScreen: boolean): void;
     position(): Promise<number>;
     setUpCastController(): void;
     presentCastDialog(): void;

index.js

@@ -227,7 +227,7 @@ export default class JWPlayer extends Component {
   }
 
   setControls(show) {
-    if (RNJWPlayerManager && Platform.OS === "android")
+    if (RNJWPlayerManager)
       RNJWPlayerManager.setControls(this.getRNJWPlayerBridgeHandle(), show);
   }
 
@@ -390,7 +390,7 @@ export default class JWPlayer extends Component {
   }
 
   shouldComponentUpdate(nextProps, nextState) {
-    var {config} = nextProps;
+    var {config, controls} = nextProps;
     var {
       file,
       image,
@@ -436,6 +436,10 @@ export default class JWPlayer extends Component {
       return true
     }
 
+    if (controls !== this.props.controls) {
+      return true;
+    }
+
     return false;
   }
 

ios/RNJWPlayer.podspec

@@ -12,8 +12,8 @@ Pod::Spec.new do |s|
   s.platform     = :ios, "10.0"
   s.source       = { :git => "https://github.com/chaimPaneth/react-native-jw-media-player.git", :tag => "v#{s.version}" }
   s.source_files  = "RNJWPlayer/*.{h,m}"
-  s.dependency   'JWPlayerKit', '~> 4.2.0'
-  s.dependency   'google-cast-sdk', '~> 4.5.1'
+  s.dependency   'JWPlayerKit', '~> 4.3.0'
+  s.dependency   'google-cast-sdk', '~> 4.7.0'
   s.dependency   'React'
   # s.static_framework = true
   s.info_plist = {

ios/RNJWPlayer/RNJWPlayerView.h

@@ -20,6 +20,8 @@
 @property(nonatomic)BOOL userPaused;
 @property(nonatomic)BOOL wasInterrupted;
 
+@property(nonatomic)JWInterfaceBehavior interfaceBehavior;
+
 /* casting objects */
 @property(nonatomic, strong)JWCastController *castController;
 @property(nonatomic)BOOL isCasting;
@@ -87,4 +89,7 @@
 - (JWCastingDevice*)connectedDevice;
 - (NSArray <JWCastingDevice *>*)availableDevices;
 
+/* Methods */
+-(void)toggleUIGroup:(UIView*)view :(NSString*)name :(NSString*)ofSubview :(BOOL)show;
+
 @end

ios/RNJWPlayer/RNJWPlayerView.m

@@ -48,7 +48,6 @@ - (void)layoutSubviews
 
     if (self.playerViewController != nil) {
         self.playerViewController.view.frame = self.frame;
-//        [_playerViewController.view.subviews[0].subviews[2] setHidden:YES]; // this is overlay with controls
     }
 }
 
@@ -93,6 +92,11 @@ -(void)setConfig:(NSDictionary*)config
     }
 }
 
+-(void)setControls:(BOOL)controls
+{
+    [self toggleUIGroup:_playerViewController.view :@"JWPlayerKit.InterfaceView" :nil :controls];
+}
+
 #pragma mark - RNJWPlayer styling
 
 -(UIColor*)colorWithHexString:(NSString*)hex
@@ -592,10 +596,10 @@ -(void)setupPlayerViewController:config :(JWPlayerConfiguration*)playerConfig
     _playerViewController = [JWPlayerViewController new];
     _playerViewController.delegate = self;
 
-//    id interfaceBehavior = config[@"interfaceBehavior"];
-//    if ((interfaceBehavior != nil) && (interfaceBehavior != (id)[NSNull null])) {
-//        _playerViewController.interfaceBehavior = [RCTConvert JWInterfaceBehavior:interfaceBehavior];
-//    }
+    id interfaceBehavior = config[@"interfaceBehavior"];
+    if ((interfaceBehavior != nil) && (interfaceBehavior != (id)[NSNull null])) {
+        _interfaceBehavior = [RCTConvert JWInterfaceBehavior:interfaceBehavior];
+    }
 
     id forceFullScreenOnLandscape = config[@"fullScreenOnLandscape"];
     if (forceFullScreenOnLandscape != nil && forceFullScreenOnLandscape != (id)[NSNull null]) {
@@ -672,6 +676,10 @@ -(void)presentPlayerViewController:(JWPlayerConfiguration*)configuration
     // before presentation of viewcontroller player is nil so acces only after
     if (configuration != nil) {
         [_playerViewController.player configurePlayerWith:configuration];
+        
+        if (_interfaceBehavior) {
+            _playerViewController.interfaceBehavior = JWInterfaceBehaviorHidden;
+        }
     }
 
     _playerViewController.playerView.delegate = self;
@@ -713,6 +721,19 @@ -(void)removePlayerView
     }
 }
 
+-(void)toggleUIGroup:(UIView*)view :(NSString*)name :(NSString*)ofSubview :(BOOL)show
+{
+    NSArray *subviews = [view subviews];
+
+    for (UIView *subview in subviews) {
+        if ([NSStringFromClass(subview.class) isEqualToString:name] && (ofSubview == nil || [NSStringFromClass(subview.superview.class) isEqualToString:name])) {
+            [subview setHidden:!show];
+        } else {
+            [self toggleUIGroup:subview :name :ofSubview :show];
+        }
+    }
+}
+
 #pragma mark - JWPlayer Delegate
 
 - (void)jwplayerIsReady:(id<JWPlayer>)player

ios/RNJWPlayer/RNJWPlayerViewManager.m

@@ -75,6 +75,7 @@ - (UIView*)view
 
 /* props */
 RCT_EXPORT_VIEW_PROPERTY(config, NSDictionary);
+RCT_EXPORT_VIEW_PROPERTY(controls, BOOL);
 
 RCT_REMAP_METHOD(state,
                  tag:(nonnull NSNumber*)reactTag
@@ -464,4 +465,17 @@ - (UIView*)view
     }];
 }
 
+RCT_EXPORT_METHOD(setControls: (nonnull NSNumber *)reactTag: (BOOL)show) {
+    [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, RNJWPlayerView *> *viewRegistry) {
+        RNJWPlayerView *view = viewRegistry[reactTag];
+        if (![view isKindOfClass:[RNJWPlayerView class]] || (view.playerView == nil && view.playerViewController == nil)) {
+            RCTLogError(@"Invalid view returned from registry, expecting RNJWPlayerView, got: %@", view);
+        } else {
+            if (view.playerViewController) {
+                [view toggleUIGroup:view.playerViewController.view :@"JWPlayerKit.InterfaceView" :nil :show];
+            }
+        }
+    }];
+}
+
 @end

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-jw-media-player",
-  "version": "0.2.5",
+  "version": "0.2.6",
   "description": "React-native Android/iOS plugin for JWPlayer SDK (https://www.jwplayer.com/)",
   "main": "index.js",
   "types": "./index.d.ts",