@applicaster/quick-brick-player 12.0.0-alpha.4342066143 → 12.0.0-alpha.4354608902

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applicaster/quick-brick-player",
-  "version": "12.0.0-alpha.4342066143",
+  "version": "12.0.0-alpha.4354608902",
   "description": "Quick Brick Player",
   "main": "./src/index.ts",
   "types": "index.d.ts",
@@ -36,11 +36,11 @@
   },
   "homepage": "https://github.com/applicaster/quickbrick#readme",
   "dependencies": {
-    "@applicaster/quick-brick-mobile-transport-controls": "12.0.0-rc.68",
-    "@applicaster/quick-brick-tv-transport-controls": "12.0.0-rc.62",
-    "@applicaster/zapp-react-native-tvos-app": "12.0.0-alpha.4342066143",
-    "@applicaster/zapp-react-native-ui-components": "12.0.0-alpha.4342066143",
-    "@applicaster/zapp-react-native-utils": "12.0.0-alpha.4342066143",
+    "@applicaster/quick-brick-mobile-transport-controls": "12.0.0-rc.96",
+    "@applicaster/quick-brick-tv-transport-controls": "12.0.0-alpha.4354608902",
+    "@applicaster/zapp-react-native-tvos-app": "12.0.0-alpha.4354608902",
+    "@applicaster/zapp-react-native-ui-components": "12.0.0-alpha.4354608902",
+    "@applicaster/zapp-react-native-utils": "12.0.0-alpha.4354608902",
     "keymirror": "^0.1.1",
     "query-string": "7.1.3",
     "react-native-web-linear-gradient": "1.1.2",

package/src/Player/AudioLayer/AudioPlayerWrapper.tsx

@@ -388,6 +388,7 @@ export const AudioPlayerWrapper: React.FC<Props> = (props: Props) => {
         <AnimationComponent
           animationType={ComponentAnimationType.moveUpComponent}
           additionalData={{ saveArea: true }}
+          style={Styles.playerContainer}
         >
           <AnimatedScrollModal>
             <View style={Styles.playerContainer} onLayout={onLayout}>

package/src/Player/AudioLayer/Layout/DockedLayout.tsx

@@ -117,7 +117,6 @@ const playerDimensionsStyle = (
 });
 
 const animatedContainerStyle = (docked: boolean): ViewStyle => ({
-  top: docked ? 2 : null,
   position: "absolute",
   width: "100%",
   zIndex: docked ? 1 : -1,
@@ -245,17 +244,19 @@ export default function DockedLayout(props: LayoutProps) {
         animatedContainerStyle(isActiveGesture || layoutState.docked),
       ]}
     >
-      {!playerState.isLive && layoutState.docked && (
-        <ProgressBar
-          content={entry}
-          value={value}
-          visible={visible}
-          layoutState={layoutState}
-          onPlayerSeek={onPlayerSeek}
-          playerState={playerState}
-          docked
-        />
-      )}
+      {!playerState.isLive &&
+        (layoutState.docked || startComponentsAnimation) && (
+          <ProgressBar
+            content={entry}
+            value={value}
+            visible={visible}
+            layoutState={layoutState}
+            onPlayerSeek={onPlayerSeek}
+            playerState={playerState}
+            startComponentsAnimation={startComponentsAnimation}
+            docked
+          />
+        )}
 
       <View style={styles.content}>
         <View

package/src/Player/index.tsx

@@ -4,7 +4,7 @@
 import React from "react";
 import * as R from "ramda";
 
-import { findNodeHandle, NativeModules, StyleSheet, View } from "react-native";
+import { findNodeHandle, StyleSheet, View } from "react-native";
 import TransportControlsMobile from "@applicaster/quick-brick-mobile-transport-controls";
 import TransportControlsTV from "@applicaster/quick-brick-tv-transport-controls";
 
@@ -42,15 +42,7 @@ import {
   AnimationComponent,
   ComponentAnimationType,
 } from "@applicaster/zapp-react-native-ui-components/Components/VideoModal/ModalAnimation";
-
-const RNPlayerManager = {
-  QuickBrickPlayerPlugin: isApplePlatform()
-    ? NativeModules.PlayerModule
-    : NativeModules.QuickBrickDefaultPlayerModule,
-  KalturaPlayerPlugin: isApplePlatform()
-    ? NativeModules.KalturaPlayerModule
-    : NativeModules.QBKalturaPlayerModule,
-};
+import { RNPlayerManager } from "@applicaster/zapp-react-native-utils/appUtils/playerManager/nativePlayerManager";
 
 const styles = StyleSheet.create({
   container: { flex: 1 },
@@ -120,8 +112,6 @@ export default class VideoPlayer extends React.Component<
   }
 
   componentWillUnmount() {
-    this.stopBackgroundPlayback();
-
     this.playbackStarted = false;
     this.handleAnalyticEvent(GENERAL_EVENT.session_end);
     this.onPlayerClosed();
@@ -166,6 +156,11 @@ export default class VideoPlayer extends React.Component<
     }
   }
 
+  // For close button
+  public closeNativePlayer = () => {
+    this.stopBackgroundPlayback();
+  };
+
   getPlayNextData = () => this.props.playNextData as PlayNextData;
 
   /**
@@ -340,11 +335,7 @@ export default class VideoPlayer extends React.Component<
     }
   };
 
-  /**
-   * Sets either subtitle language, or audio language if we have a selected a new locale.
-   * If no locale is set it defaults to system language for audio, and leaves subtitles unaltered.
-   */
-  setLanguage = (selected = null) => {
+  selectTrack = (selected) => {
     const { trackType, id, language } = selected || {};
 
     const isOff = language === "Off";
@@ -862,7 +853,7 @@ export default class VideoPlayer extends React.Component<
       !!this.props.controller?.supportsNativeControls?.();
 
     const controls = isAppleTV()
-      ? supportsNativeControls && !isInlineTV && !this.getPlayNextData()
+      ? (supportsNativeControls && !isInlineTV) || !!this.getPlayNextData()
       : supportsNativeControls && !this.getPlayNextData();
 
     const shouldUseNativeControls =
@@ -998,7 +989,13 @@ export default class VideoPlayer extends React.Component<
       ...androidLifecyclePiPEvents,
     };
 
-    const needToShowPlayNextOverlay = this.getPlayNextData() && !docked;
+    const needToShowPlayNextOverlay =
+      isTV() && this.getPlayNextData() && !docked;
+
+    const needToShowDefaultControls = !(
+      (controls && !castAction?.state?.connected) ||
+      this.getPlayNextData()
+    );
 
     const playerContainerStyles = isApplePlatform()
       ? styles.playerContainerBlack
@@ -1040,7 +1037,7 @@ export default class VideoPlayer extends React.Component<
           extraInfoText={castAction?.state?.friendlyStatus}
           controlsAlwaysVisible={castAction?.state?.connected}
           playNextData={this.getPlayNextData()}
-          nativeControls={!!controls}
+          needToShowDefaultControls={needToShowDefaultControls}
         />
       ) : null;
     };