@applicaster/quick-brick-player 12.0.0-alpha.3977160850 → 12.0.0-alpha.4300857220

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applicaster/quick-brick-player",
-  "version": "12.0.0-alpha.3977160850",
+  "version": "12.0.0-alpha.4300857220",
   "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.28",
+    "@applicaster/quick-brick-mobile-transport-controls": "12.0.0-rc.51",
     "@applicaster/quick-brick-tv-transport-controls": "11.0.0-rc.133",
-    "@applicaster/zapp-react-native-tvos-app": "12.0.0-alpha.3977160850",
-    "@applicaster/zapp-react-native-ui-components": "12.0.0-alpha.3977160850",
-    "@applicaster/zapp-react-native-utils": "12.0.0-alpha.3977160850",
+    "@applicaster/zapp-react-native-tvos-app": "12.0.0-alpha.4300857220",
+    "@applicaster/zapp-react-native-ui-components": "12.0.0-alpha.4300857220",
+    "@applicaster/zapp-react-native-utils": "12.0.0-alpha.4300857220",
     "keymirror": "^0.1.1",
     "query-string": "7.1.3",
     "react-native-web-linear-gradient": "1.1.2",

package/src/CellPlayer/Assets/AssetsComponent.tsx

@@ -1,8 +1,9 @@
 import React, { useEffect, useState } from "react";
-import { Image, StyleSheet, View } from "react-native";
+import { StyleSheet, View } from "react-native";
 import { usePlayer } from "@applicaster/zapp-react-native-utils/appUtils/playerManager/usePlayer";
 import { MUTED_USAGE } from "../const";
 import { LiveImageManager } from "@applicaster/zapp-react-native-ui-components/Components/VideoLive/LiveImageManager";
+import { QBImage as Image } from "@applicaster/zapp-react-native-ui-components/Components/Image";
 
 type Asset = string | undefined;
 

package/src/Player/AudioLayer/AudioPlayerWrapper.tsx

@@ -1,5 +1,5 @@
 import * as React from "react";
-import { ViewStyle, View, ScrollView } from "react-native";
+import { ViewStyle, View } from "react-native";
 
 import { SafeAreaView, Edge } from "react-native-safe-area-context";
 import { usePlayerState } from "@applicaster/zapp-react-native-utils/appUtils/playerManager/usePlayerState";
@@ -24,8 +24,14 @@ import {
   NAMESPACE,
 } from "./utils";
 import { localStorage } from "@applicaster/zapp-react-native-bridge/ZappStorage/LocalStorage";
-import { getLiveUrl } from "../Utils";
+import { addQueryParam, getLiveUrl } from "../Utils";
 import { useTitleSummaryOverlay } from "@applicaster/zapp-react-native-utils/appUtils/playerManager/usePlayerTitleSummaryOverlay";
+import {
+  AnimationComponent,
+  ComponentAnimationType,
+  AnimatedScrollModal,
+} from "@applicaster/zapp-react-native-ui-components/Components/VideoModal/ModalAnimation";
+import { PADDING_HORIZONTAL } from "./Layout/defaultLayoutsConts";
 
 const { log_debug } = createLogger({
   subsystem: "UIComponent",
@@ -48,7 +54,7 @@ type Configuration = {
 };
 
 type Props = {
-  children: React.ReactNode;
+  children?: React.ReactNode;
   inline?: boolean;
   docked?: boolean;
   configuration: Configuration;
@@ -68,29 +74,20 @@ export const defaultAspectRatioWidth = (height: number): number =>
   (height / 9) * 16;
 
 const Styles = {
-  mainContainer: (docked: boolean, style: ViewStyle) => {
+  mainContainer: (style: ViewStyle) => {
     const combinedStyle: ViewStyle = {
       flex: 1,
     };
 
-    if (!docked) {
-      style.paddingTop = 0;
-      style.paddingHorizontal = 15;
-    }
-
-    return { ...combinedStyle, ...style };
-  },
-  playerContainer: (docked: boolean, style: ViewStyle) => {
-    const combinedStyle: ViewStyle = {
-      flex: 1,
+    return {
+      ...combinedStyle,
+      ...style,
     };
-
-    if (docked) {
-      combinedStyle.height = style.height;
-    }
-
-    return combinedStyle;
   },
+  playerContainer: {
+    flex: 1,
+  },
+  paddingHorizontal: { paddingTop: 0, paddingHorizontal: PADDING_HORIZONTAL },
 
   controlsMobile: {
     height: 50,
@@ -144,9 +141,9 @@ export const AudioPlayerWrapper: React.FC<Props> = (props: Props) => {
   const isTablet = useIsTablet();
 
   const isTabletLandscape = !isTV() && isTablet && !isTabletPortrait;
-  
+
   // TODO: Have generic place for live url from configuration. Currently its hardcoded for client.
-  
+
   const feedUrl = getLiveUrl(entry?.extensions?.live?.channel_src ?? "");
 
   const { title, summary } = useTitleSummaryOverlay(
@@ -168,6 +165,9 @@ export const AudioPlayerWrapper: React.FC<Props> = (props: Props) => {
 
   const [sleepTimerDate, setSleepTimerDate] = useState(0);
 
+  const [defaultDimensions, setDefaultDimensions] =
+    React.useState<Dimensions>(undefined);
+
   const [dimensions, setDimensions] = React.useState<Dimensions>({
     width: 0,
     height: 0,
@@ -181,9 +181,11 @@ export const AudioPlayerWrapper: React.FC<Props> = (props: Props) => {
     const { width, height } = event.nativeEvent.layout;
 
     setDimensions({
-      width: docked ? defaultAspectRatioWidth(height) : width,
+      width,
       height,
     });
+
+    if (!defaultDimensions) setDefaultDimensions({ width, height });
   };
 
   const cancelSleepTimer = async () => {
@@ -195,7 +197,6 @@ export const AudioPlayerWrapper: React.FC<Props> = (props: Props) => {
     });
 
     setSleepTimerDate(0);
-    player?.pause();
 
     await localStorage.removeItem("sleep", NAMESPACE);
   };
@@ -376,58 +377,64 @@ export const AudioPlayerWrapper: React.FC<Props> = (props: Props) => {
     player?.seekTo(0);
   }, [player]);
 
-  const edges = React.useMemo<Edge[]>(
-    () => (docked ? [] : ["right", "left", "top"]),
-    [docked]
-  );
+  const edges = React.useMemo<Edge[]>(() => ["right", "left", "top"], [docked]);
 
-  const ContainerView = docked ? View : SafeAreaView;
+  const ContainerView = SafeAreaView;
 
   const MainContent = React.useMemo(() => {
     return (
-      <ContainerView style={Styles.mainContainer(docked, style)} edges={edges}>
-        <ScrollView
-          style={Styles.playerContainer(docked, style)}
-          onLayout={onLayout}
+      <ContainerView style={Styles.mainContainer(style)} edges={edges}>
+        <AnimationComponent
+          animationType={ComponentAnimationType.moveUpComponent}
+          additionalData={{ saveArea: true }}
         >
-          <Layout
-            entry={entry}
-            playerState={playerState}
-            layoutState={layoutState}
-            value={value}
-            onPlaybackButtonPress={onPlaybackButtonPress}
-            onRewindButtonPress={onRewindButtonPress}
-            onForwardButtonPress={onForwardButtonPress}
-            onPlayerSeek={onPlayerSeek}
-            onSkipStart={onSkipStart}
-            onSpeedButtonPress={onSpeedButtonPress}
-            onSleepButtonPress={onSleepButtonPress}
-            playbackSpeedName={formatSpeed(playbackSpeed.value)}
-            playbackSleepName={
-              sleepTimer.value === 0 ? "sleep_timer" : "sleep_timer_active"
-            }
-            sleepTimerDate={sleepTimerDate}
-            cancelSleepTimer={cancelSleepTimer}
-            onSkipLive={onSkipLive}
-            onCloseVideoModal={onCloseVideoModal}
-            maximiseVideoModal={maximiseVideoModal}
-            configuration={configuration}
-            dimensions={dimensions}
-            playNextData={playNextData}
-            title={title}
-            summary={summary}
-          />
-          {children}
-          {!docked && (
-            <PlayerDetails
-              configuration={configuration}
-              style={Styles.playerDetails}
-              entry={entry}
-              isTabletLandscape={isTabletLandscape}
-              isAudioPlayer={true}
-            />
-          )}
-        </ScrollView>
+          <AnimatedScrollModal>
+            <View style={Styles.playerContainer} onLayout={onLayout}>
+              <Layout
+                entry={entry}
+                playerState={playerState}
+                layoutState={layoutState}
+                value={value}
+                onPlaybackButtonPress={onPlaybackButtonPress}
+                onRewindButtonPress={onRewindButtonPress}
+                onForwardButtonPress={onForwardButtonPress}
+                onPlayerSeek={onPlayerSeek}
+                onSkipStart={onSkipStart}
+                onSpeedButtonPress={onSpeedButtonPress}
+                onSleepButtonPress={onSleepButtonPress}
+                playbackSpeedName={formatSpeed(playbackSpeed.value)}
+                playbackSleepName={
+                  sleepTimer.value === 0 ? "sleep_timer" : "sleep_timer_active"
+                }
+                sleepTimerDate={sleepTimerDate}
+                cancelSleepTimer={cancelSleepTimer}
+                onSkipLive={onSkipLive}
+                onCloseVideoModal={onCloseVideoModal}
+                maximiseVideoModal={maximiseVideoModal}
+                configuration={configuration}
+                dimensions={dimensions}
+                playNextData={playNextData}
+                title={title}
+                summary={summary}
+                defaultDimensions={defaultDimensions}
+              />
+              <View style={Styles.paddingHorizontal}>
+                {children}
+                <AnimationComponent
+                  animationType={ComponentAnimationType.componentFade}
+                >
+                  <PlayerDetails
+                    configuration={configuration}
+                    style={Styles.playerDetails}
+                    entry={entry}
+                    isTabletLandscape={isTabletLandscape}
+                    isAudioPlayer={true}
+                  />
+                </AnimationComponent>
+              </View>
+            </View>
+          </AnimatedScrollModal>
+        </AnimationComponent>
       </ContainerView>
     );
   }, [
@@ -456,17 +463,20 @@ export const AudioPlayerWrapper: React.FC<Props> = (props: Props) => {
   if (configuration.magic_background) {
     const baseUrl = entry?.extensions?.audio_player_background_image ?? "";
 
-    // TODO: To be added when background is ready
+    const queryParamName =
+      configuration.audio_player_background_image_query || "width";
+
+    const queryParamValue = 15;
 
-    // const queryParamName =
-    //   configuration.audio_player_background_image_query || "width";
-    //
-    // const queryParamValue = 15;
-    //
-    // const url = addQueryParam(baseUrl, queryParamName, queryParamValue);
+    const url = addQueryParam(baseUrl, queryParamName, queryParamValue);
 
     return (
-      <MagicBG image={baseUrl} fallbackUrl={baseUrl} defaultColor="#000000">
+      <MagicBG
+        image={url}
+        fallbackUrl={baseUrl}
+        colors={entry?.extensions?.backgroundColors}
+        defaultColor="#000000"
+      >
         {MainContent}
       </MagicBG>
     );

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

@@ -18,13 +18,21 @@ import {
   rewindButton,
   skipToStartButton,
   skipToLiveButton,
+  PADDING_HORIZONTAL,
   speedButton,
   sleepButton,
 } from "./defaultLayoutsConts";
 import { AudioDescription } from "../AudioDescription";
 import { PlayerImageBackground } from "@applicaster/zapp-react-native-ui-components/Components/PlayerImageBackground";
 import { useLanguageData } from "@applicaster/zapp-react-native-utils/reactHooks/player";
+import { PlayNextData } from "@applicaster/zapp-react-native-ui-components/Components/PlayerContainer/PlayerContainer";
 import { useEffect, useMemo, useState } from "react";
+import {
+  useModalAnimationContext,
+  AnimationComponent,
+  ComponentAnimationType,
+} from "@applicaster/zapp-react-native-ui-components/Components/VideoModal/ModalAnimation";
+import DockedLayout from "./DockedLayout";
 
 type Dimensions = {
   width: number;
@@ -60,9 +68,13 @@ type LayoutProps = {
   onPlayerSeek: (targetTime: number) => void;
   onSkipLive: () => void;
   onSkipStart: () => void;
+  onCloseVideoModal: () => void;
+  maximiseVideoModal: () => void;
   dimensions: Dimensions;
+  playNextData: PlayNextData;
   title: string | number;
   summary: string | number;
+  defaultDimensions: Dimensions;
 };
 
 const Styles = {
@@ -72,10 +84,13 @@ const Styles = {
     alignItems: "center",
     justifyContent: isPortraitMode ? "center" : "flex-start",
   }),
-  tabletLayout: {
-    width: 463,
+  playerImageWrapper: {
+    width: "100%",
     maxHeight: 750,
     marginTop: 80,
+  },
+  tabletLayout: {
+    width: 463,
     marginBottom: 80,
   },
   controls: (isTablet: boolean, isLiveShowFullControls: boolean) => ({
@@ -84,24 +99,31 @@ const Styles = {
     justifyContent: isLiveShowFullControls ? "space-between" : "space-evenly",
   }),
   backgroundImageContainer: (dimensions: Dimensions, isTablet: boolean) => {
+    const mobileValue = dimensions.width
+      ? dimensions.width - PADDING_HORIZONTAL * 2
+      : 330;
+
     return {
-      width: isTablet ? 463 : dimensions.width || 330,
-      height: isTablet ? 463 : dimensions.width || 330,
+      width: isTablet ? 463 : mobileValue,
+      height: isTablet ? 463 : mobileValue,
     };
   },
-  backgroundImageContainerImageStyle: (isTablet) => ({
-    borderRadius: isTablet ? 24 : 10,
+  backgroundImageContainerImageStyle: (
+    isTablet,
+    docked,
+    startComponentsAnimation,
+    isActiveGesture
+  ) => ({
+    borderRadius:
+      (startComponentsAnimation && isActiveGesture) || docked
+        ? 0
+        : isTablet
+        ? 24
+        : 10,
   }),
-  playerContainer: (docked: boolean, style) => {
-    const combinedStyle = {
-      flex: 1,
-    };
-
-    if (docked) {
-      combinedStyle["height"] = style.height;
-    }
 
-    return combinedStyle;
+  paddingHorizontal: {
+    paddingHorizontal: PADDING_HORIZONTAL,
   },
 
   controlsMobile: {
@@ -115,6 +137,12 @@ const Styles = {
   separator: {
     height: 20,
   },
+  flexDirectionRow: {
+    flexDirection: "row",
+  },
+  alignItemsCenter: {
+    alignItems: "center",
+  },
 };
 
 export default function DefaultLayout(props: LayoutProps) {
@@ -139,12 +167,14 @@ export default function DefaultLayout(props: LayoutProps) {
     sleepTimerDate,
     title,
     summary,
+    defaultDimensions,
   } = props;
 
   const isTablet = useIsTablet();
   const { width, height } = dimensions;
   const isPortraitMode = width < height;
   const isLiveContent = playerState.isLive;
+  const docked = layoutState.docked;
 
   const languageData = useLanguageData("audio-player");
 
@@ -283,71 +313,120 @@ export default function DefaultLayout(props: LayoutProps) {
   const needsToShowProgressBar =
     (isLiveContent && liveSeekingEnabled) || !isLiveContent;
 
+  const defaultImageDimensions = React.useMemo(
+    () =>
+      defaultDimensions &&
+      Styles.backgroundImageContainer(defaultDimensions, isTablet),
+    [defaultDimensions]
+  );
+
+  const { isActiveGesture, startComponentsAnimation } =
+    useModalAnimationContext();
+
   return (
     <View
       style={
         isTablet ? Styles.tabletContainer(isPortraitMode) : Styles.container
       }
     >
-      <TransportInfo
-        content={entry}
-        value={value}
-        visible={true}
-        languageData={languageData}
-        layoutState={layoutState}
-        actionButtons={actionButtons}
-      />
-      <View
-        style={
-          isTablet ? Styles.tabletContainer(isPortraitMode) : Styles.container
-        }
+      <AnimationComponent animationType={ComponentAnimationType.componentFade}>
+        <TransportInfo
+          content={entry}
+          value={value}
+          visible={true}
+          languageData={languageData}
+          layoutState={layoutState}
+          actionButtons={actionButtons}
+        />
+      </AnimationComponent>
+      <AnimationComponent
+        animationType={ComponentAnimationType.moveUpComponent}
+        style={isTablet ? Styles.playerImageWrapper : null}
       >
-        <View style={isTablet ? Styles.tabletLayout : null}>
+        <AnimationComponent
+          animationType={ComponentAnimationType.moveComponentHorizontal}
+          additionalData={{
+            disableAnimatedComponent: !isTablet,
+            moveValue: (dimensions.width - 463) / 2,
+            extraAnimation: !isTablet
+              ? {
+                  [ComponentAnimationType.audioPlayerPaddingHorizontal]: {
+                    style: Styles.paddingHorizontal,
+                  },
+                }
+              : null,
+          }}
+          style={isTablet ? Styles.alignItemsCenter : null}
+        >
           <PlayerImageBackground
             entry={entry}
             style={Styles.backgroundImageContainer(dimensions, isTablet)}
-            imageStyle={Styles.backgroundImageContainerImageStyle(isTablet)}
-          />
-          <AudioDescription
-            title={title}
-            summary={summary}
-            value={value}
-            layoutState={layoutState}
+            imageStyle={Styles.backgroundImageContainerImageStyle(
+              isTablet,
+              docked,
+              startComponentsAnimation,
+              isActiveGesture
+            )}
+            defaultImageDimensions={defaultImageDimensions}
           />
-          <Separator />
-          {needsToShowProgressBar && (
-            <View>
-              <ProgressBar
-                content={entry}
-                value={value}
-                visible={true}
-                layoutState={layoutState}
-                onPlayerSeek={onPlayerSeek}
-                playerState={playerState}
-                disableFullscreen={true}
-                sliderStyle={2}
-              />
-
-              {showCounter && timeLeft >= 0 && (
-                <CountDown
-                  timeLeft={timeLeft}
+        </AnimationComponent>
+
+        <DockedLayout {...props} />
+      </AnimationComponent>
+      <View
+        style={[
+          Styles.paddingHorizontal,
+          isTablet ? Styles.tabletLayout : null,
+        ]}
+      >
+        {!docked && (
+          <AnimationComponent
+            animationType={ComponentAnimationType.componentFade}
+          >
+            <AudioDescription
+              title={title}
+              summary={summary}
+              value={value}
+              layoutState={layoutState}
+            />
+            <Separator />
+            {needsToShowProgressBar && (
+              <View>
+                <ProgressBar
+                  content={entry}
                   value={value}
-                  title={sleepTitle}
+                  visible={true}
+                  layoutState={layoutState}
+                  onPlayerSeek={onPlayerSeek}
+                  playerState={playerState}
+                  disableFullscreen={true}
+                  sliderStyle={2}
                 />
-              )}
 
-              <Separator />
-            </View>
-          )}
-          <Controls
-            value={value}
-            visible={true}
-            keepAlive={null}
-            buttons={controlButtons}
-            style={Styles.controls(isTablet, isLiveContent && showFullControls)}
-            playerState={playerState}
-          />
-        </View>
+                {showCounter && timeLeft >= 0 && (
+                  <CountDown
+                    timeLeft={timeLeft}
+                    value={value}
+                    title={sleepTitle}
+                  />
+                )}
+
+                <Separator />
+              </View>
+            )}
+            <Controls
+              value={value}
+              visible={true}
+              keepAlive={null}
+              buttons={controlButtons}
+              style={Styles.controls(
+                isTablet,
+                isLiveContent && showFullControls
+              )}
+              playerState={playerState}
+            />
+          </AnimationComponent>
+        )}
       </View>
     </View>
   );

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

@@ -15,8 +15,13 @@ import {
   Button,
 } from "@applicaster/quick-brick-mobile-transport-controls";
 
-import { PlayerImageBackground } from "@applicaster/zapp-react-native-ui-components/Components/PlayerImageBackground";
 import { PlayNextData } from "@applicaster/zapp-react-native-ui-components/Components/PlayerContainer/PlayerContainer";
+import {
+  useModalAnimationContext,
+  AnimationComponent,
+  ComponentAnimationType,
+  PlayerAnimationStateEnum,
+} from "@applicaster/zapp-react-native-ui-components/Components/VideoModal/ModalAnimation";
 
 type Dimensions = {
   width: number;
@@ -104,14 +109,26 @@ const backgroundColorStyle = (value: GetValue): ViewStyle => ({
   backgroundColor: value("docked_player_background_color"),
 });
 
-const playerDimensionsStyle = ({
-  height,
-}: PlayerDimensionsProp): ViewStyle => ({
-  paddingLeft: height || 100,
+const playerDimensionsStyle = (
+  minimisedHeight: number,
+  addPadding: boolean
+): ViewStyle => ({
+  paddingLeft: addPadding ? minimisedHeight || 100 : 0,
 });
 
-const backgroundImageStyle = (dimensions: Dimensions): ViewStyle => ({
-  height: dimensions.height,
+const animatedContainerStyle = (docked: boolean): ViewStyle => ({
+  top: docked ? 2 : null,
+  position: "absolute",
+  width: "100%",
+  zIndex: docked ? 1 : -1,
+});
+
+const backgroundImageStyle = (
+  dimensions: Dimensions,
+  minimisedHeight: number,
+  isActiveGesture: boolean
+): ViewStyle => ({
+  height: isActiveGesture ? minimisedHeight : dimensions.height,
   aspectRatio: 1,
   position: "absolute",
 });
@@ -193,7 +210,6 @@ export default function DockedLayout(props: LayoutProps) {
     dimensions,
     entry,
     onCloseVideoModal,
-    maximiseVideoModal,
     onPlayerSeek,
     playerState,
     configuration,
@@ -207,9 +223,29 @@ export default function DockedLayout(props: LayoutProps) {
   const visible = true;
   const liveButton = Boolean(value("live_badge_enabled"));
 
+  const {
+    isActiveGesture,
+    setPlayerAnimationState,
+    startComponentsAnimation,
+    minimisedHeight,
+  } = useModalAnimationContext();
+
+  const maximazeVideoModal = React.useCallback(
+    () => setPlayerAnimationState(PlayerAnimationStateEnum.maximaze),
+    []
+  );
+
+  if (!layoutState.docked && !startComponentsAnimation) return null;
+
   return (
-    <View style={styles.container}>
-      {!playerState.isLive && (
+    <AnimationComponent
+      animationType={ComponentAnimationType.componentAppears}
+      style={[
+        styles.container,
+        animatedContainerStyle(isActiveGesture || layoutState.docked),
+      ]}
+    >
+      {!playerState.isLive && layoutState.docked && (
         <ProgressBar
           content={entry}
           value={value}
@@ -217,18 +253,27 @@ export default function DockedLayout(props: LayoutProps) {
           layoutState={layoutState}
           onPlayerSeek={onPlayerSeek}
           playerState={playerState}
+          docked
         />
       )}
 
       <View style={styles.content}>
-        <PlayerImageBackground
-          configuration={configuration}
-          entry={entry}
-          style={backgroundImageStyle(dimensions)}
+        <View
+          style={backgroundImageStyle(
+            dimensions,
+            minimisedHeight,
+            isActiveGesture
+          )}
         />
-        <TouchableWithoutFeedback onPress={maximiseVideoModal}>
+        <TouchableWithoutFeedback onPress={maximazeVideoModal}>
           <View
-            style={[styles.touchableArea, playerDimensionsStyle(dimensions)]}
+            style={[
+              styles.touchableArea,
+              playerDimensionsStyle(
+                minimisedHeight,
+                isActiveGesture || layoutState.docked
+              ),
+            ]}
           >
             <View
               style={[
@@ -272,6 +317,6 @@ export default function DockedLayout(props: LayoutProps) {
           />
         </View>
       </View>
-    </View>
+    </AnimationComponent>
   );
 }

package/src/Player/AudioLayer/Layout/defaultLayoutsConts.ts

@@ -19,6 +19,8 @@ const playbackButtonMargins = (
 ): number =>
   isLiveShowFullControls ? (isTablet ? 65 : 10) : isTablet ? 95 : 40;
 
+export const PADDING_HORIZONTAL = 15;
+
 export const playbackButton = ({
   playerState,
   liveButton,

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

@@ -1,6 +1,5 @@
 import React from "react";
 import DefaultLayout from "./DefaultLayout";
-import DockedLayout from "./DockedLayout";
 import { PlayNextData } from "@applicaster/zapp-react-native-ui-components/Components/PlayerContainer/PlayerContainer";
 
 type Dimensions = {
@@ -40,6 +39,7 @@ type LayoutProps = {
   onSkipLive: () => void;
   maximiseVideoModal: () => void;
   dimensions: Dimensions;
+  defaultDimensions: Dimensions;
   playNextData: PlayNextData;
   title: string | number;
   summary: string | number;
@@ -48,11 +48,5 @@ type LayoutProps = {
 export default function Layout(
   props: LayoutProps
 ): React.ReactElement<LayoutProps> {
-  const { layoutState } = props;
-
-  if (layoutState.docked) {
-    return <DockedLayout {...props} />;
-  }
-
   return <DefaultLayout {...props} />;
 }

package/src/Player/AudioLayer/MagicBG/index.tsx

@@ -11,9 +11,10 @@ type MagicBGProps = {
   image: string;
   fallbackUrl?: string;
   defaultColor: string;
+  colors: string[]; // Updated to type string[] as it holds hex values
 };
 
-const colors = {
+const defaultColors = {
   overlay: "rgba(0, 0, 0, 0.35)",
   defaultGradientStart: "rgba(0, 0, 0, 0.25)",
   defaultGradientEnd: "rgba(0, 0, 0, 0)",
@@ -25,7 +26,7 @@ const styles = StyleSheet.create({
   },
   fullScreenOverlay: {
     ...StyleSheet.absoluteFillObject,
-    backgroundColor: colors.overlay,
+    backgroundColor: defaultColors.overlay,
   },
   gradientOverlay: {
     position: "absolute",
@@ -54,46 +55,63 @@ export const MagicBG: React.FC<MagicBGProps> = ({
   children,
   image,
   fallbackUrl = "",
+  colors = [],
   defaultColor,
 }) => {
   const [dominantColor, setDominantColor] =
     React.useState<string>(defaultColor);
 
   const [gradientColors, setGradientColors] = React.useState<string[]>([
-    colors.defaultGradientStart,
-    colors.defaultGradientEnd,
+    defaultColors.defaultGradientStart,
+    defaultColors.defaultGradientEnd,
   ]);
 
   useEffect(() => {
     const fetchColors = async () => {
-      if (!image) return;
-
-      try {
-        const { gradientColors, dominantColor } =
-          await fetchPaletteAndDominantColor(image);
-
-        setGradientColors(gradientColors);
-        setDominantColor(dominantColor);
-      } catch (error) {
+      // Check if colors are provided and not empty
+      if (colors && colors.length > 0) {
+        // Use provided colors for gradient and dominant color
+        setGradientColors(colors.slice(0, 2)); // First 2 colors for gradient
+        setDominantColor(colors[0]); // First color as dominant
+      } else if (image) {
+        // If no colors, try fetching from image
         try {
           const { gradientColors, dominantColor } =
-            await fetchPaletteAndDominantColor(fallbackUrl);
+            await fetchPaletteAndDominantColor(image);
 
           setGradientColors(gradientColors);
           setDominantColor(dominantColor);
-        } catch {
-          setGradientColors([
-            colors.defaultGradientStart,
-            colors.defaultGradientEnd,
-          ]);
-
-          setDominantColor(defaultColor);
+        } catch (error) {
+          // If image fetch fails, try fallback URL
+          try {
+            const { gradientColors, dominantColor } =
+              await fetchPaletteAndDominantColor(fallbackUrl);
+
+            setGradientColors(gradientColors);
+            setDominantColor(dominantColor);
+          } catch {
+            // If everything fails, use default color
+            setGradientColors([
+              defaultColors.defaultGradientStart,
+              defaultColors.defaultGradientEnd,
+            ]);
+
+            setDominantColor(defaultColor);
+          }
         }
+      } else {
+        // If no image or colors, use default color
+        setGradientColors([
+          defaultColors.defaultGradientStart,
+          defaultColors.defaultGradientEnd,
+        ]);
+
+        setDominantColor(defaultColor);
       }
     };
 
     fetchColors();
-  }, [image, fallbackUrl, colors, defaultColor]);
+  }, []);
 
   return (
     <View style={[styles.container, { backgroundColor: dominantColor }]}>

package/src/Player/index.tsx

@@ -36,6 +36,12 @@ import { AudioPlayerWrapper } from "./AudioLayer/AudioPlayerWrapper";
 import { playerManager } from "@applicaster/zapp-react-native-utils/appUtils";
 import { getAllAccessibilityProps } from "@applicaster/zapp-react-native-utils/configurationUtils";
 import { PlayNextData } from "@applicaster/zapp-react-native-ui-components/Components/PlayerContainer/PlayerContainer";
+import { getTargetScreenDataFromEntry } from "@applicaster/zapp-react-native-utils/reactHooks/screen/useTargetScreenData";
+import { isAppleTV } from "@applicaster/zapp-react-native-ui-components/Helpers/Platform";
+import {
+  AnimationComponent,
+  ComponentAnimationType,
+} from "@applicaster/zapp-react-native-ui-components/Components/VideoModal/ModalAnimation";
 
 const RNPlayerManager = {
   QuickBrickPlayerPlugin: isApplePlatform()
@@ -55,6 +61,7 @@ const styles = StyleSheet.create({
     position: "absolute",
     zIndex: 1,
   },
+  playerSize: { width: "100%", height: "100%" },
 });
 
 const logger = createLogger({
@@ -555,6 +562,26 @@ export default class VideoPlayer extends React.Component<
     this.props.listener?.onPlayerDetached?.(nativeEvent);
   };
 
+  onVideoFullscreenPlayerDidDismiss = () => {
+    this.props.listener?.onVideoFullscreenPlayerDidDismiss?.();
+  };
+
+  onVideoFullscreenPlayerDidPresent = () => {
+    this.props.listener?.onVideoFullscreenPlayerDidPresent?.();
+  };
+
+  onVideoFullscreenPlayerWillDismiss = () => {
+    this.props.listener?.onVideoFullscreenPlayerWillDismiss?.();
+  };
+
+  onVideoFullscreenPlayerWillPresent = () => {
+    this.props.listener?.onVideoFullscreenPlayerWillPresent?.();
+  };
+
+  onPlayerClose = () => {
+    this.props.listener?.onPlayerClose?.();
+  };
+
   onPiPEnter = () => {
     this.setState({ piped: true });
     this.props.openPiP();
@@ -758,8 +785,6 @@ export default class VideoPlayer extends React.Component<
 
   render() {
     const {
-      castAction,
-      controls,
       docked,
       entry,
       fullscreen,
@@ -769,8 +794,12 @@ export default class VideoPlayer extends React.Component<
       isTabletPortrait,
       muted,
       style,
+      castAction,
+      controller,
     } = this.props;
 
+    const supportNativeCast = controller.supportNativeCast();
+
     const { audioTrackId, keyEvent, paused, seek, textTrackId, rate } =
       this.state;
 
@@ -817,17 +846,32 @@ export default class VideoPlayer extends React.Component<
     const liveCatchUpEnabled =
       this.props.pluginConfiguration?.liveCatchUpEnabled;
 
-    const hideNativeControls = isTV()
-      ? { controls: !this.getPlayNextData() }
-      : {};
+    // TODO: Get screen data more reliable way useCurrentScreenData
+    const screenData = getTargetScreenDataFromEntry(this.props.playableItem);
 
-    const platformSpecificProps = isApplePlatform()
+    const isInlineTV = screenData?.ui_components?.length > 0 && isTV();
+
+    let platformSpecificProps: any = isApplePlatform()
       ? {
-          ...hideNativeControls,
           resizeMode: nativeResizeMode,
         }
       : {};
 
+    const supportsNativeControls =
+      !!this.props.controller?.supportsNativeControls?.();
+
+    const controls = isAppleTV()
+      ? supportsNativeControls && !isInlineTV && !this.getPlayNextData()
+      : supportsNativeControls && !this.getPlayNextData();
+
+    const shouldUseNativeControls =
+      controls && !docked && !castAction?.state?.connected;
+
+    platformSpecificProps = {
+      ...platformSpecificProps,
+      controls: shouldUseNativeControls,
+    };
+
     const pictureInPictureEnabled =
       this.props.pluginConfiguration?.pictureInPictureEnabled;
 
@@ -835,7 +879,6 @@ export default class VideoPlayer extends React.Component<
       entry, // Must be passed first in list
       ...platformSpecificProps,
       audioTrackId,
-      controls,
       docked,
       enableAutoAudioTrackSelection,
       fullscreen, // TODO: Check fullscreen params not crash
@@ -890,22 +933,17 @@ export default class VideoPlayer extends React.Component<
       onVideoEnd: this.onVideoEnd, // complete
       onVideoError: this.onVideoError, // error
       onVideoProgress: this.onVideoProgress,
-      onVideoFullscreenPlayerDidDismiss: this.unHandledEvent(
-        "onVideoFullscreenPlayerDidPresent"
-      ),
-      onVideoFullscreenPlayerDidPresent: this.unHandledEvent(
-        "onVideoFullscreenPlayerDidPresent"
-      ),
-      onVideoFullscreenPlayerWillDismiss: this.unHandledEvent(
-        "onVideoFullscreenPlayerWillDismiss"
-      ),
-      onVideoFullscreenPlayerWillPresent: this.unHandledEvent(
-        "onVideoFullscreenPlayerWillPresent"
-      ),
+      onVideoFullscreenPlayerDidDismiss: this.onVideoFullscreenPlayerDidDismiss,
+      onVideoFullscreenPlayerDidPresent: this.onVideoFullscreenPlayerDidPresent,
+      onVideoFullscreenPlayerWillDismiss:
+        this.onVideoFullscreenPlayerWillDismiss,
+      onVideoFullscreenPlayerWillPresent:
+        this.onVideoFullscreenPlayerWillPresent,
       onVideoLoad: this.onVideoLoad,
       onVideoLoadStart: this.unHandledEvent("onVideoLoadStart"),
       onVideoBuffer: this.onVideoBuffer,
       onPlaybackStalled: this.onPlaybackStalled,
+      onPlayerClose: this.onPlayerClose,
       onPlayerAttached: this.onPlayerAttached,
       onPlayerDetached: this.onPlayerDetached,
     };
@@ -979,7 +1017,7 @@ export default class VideoPlayer extends React.Component<
         !needToShowPlayNextOverlay &&
         this.props.mode !== "PIP";
 
-      if (controls === true) {
+      if (shouldUseNativeControls) {
         return null;
       }
 
@@ -1032,29 +1070,14 @@ export default class VideoPlayer extends React.Component<
     const renderMobilePlayer = () => {
       return isFullScreenAudioPlayer && isAudioItem ? (
         <View style={containerStyle}>
-          {!castAction?.state?.connected && (
+          {(!castAction?.state?.connected || supportNativeCast) && (
             <this.props.PlayerComponent
               ref={this._assignRoot}
               {...nativeEvents}
               {...nativeProps}
             />
           )}
-          <AudioPlayerWrapper {...sharedWrapperViewProps}>
-            <View>
-              {
-                <PlayNextOverlay
-                  item={entry}
-                  playerIsDocked={docked}
-                  pluginConfiguration={this.getPluginConfiguration()}
-                  playerId={this.props.playerId}
-                  playNextData={this.getPlayNextData()}
-                  setNextVideoPreloadThresholdPercentage={
-                    this.props.setNextVideoPreloadThresholdPercentage
-                  }
-                />
-              }
-            </View>
-          </AudioPlayerWrapper>
+          <AudioPlayerWrapper {...sharedWrapperViewProps} />
         </View>
       ) : (
         <PlayerWrapper {...sharedWrapperViewProps}>
@@ -1069,11 +1092,24 @@ export default class VideoPlayer extends React.Component<
               <View style={styles.container}>
                 <View style={[playerContainerStyles, playerDimensions]}>
                   {isAudioItem && (
-                    <AudioPlayer
-                      style={playerDimensions}
-                      audio_item={entry}
-                      plugin_configuration={this.getPluginConfiguration()}
-                    />
+                    <AnimationComponent
+                      animationType={ComponentAnimationType.player}
+                      additionalData={{
+                        ...playerDimensions,
+                        inlineAudioPlayer: true,
+                      }}
+                      style={getStyle(playerDimensions)}
+                    >
+                      <AudioPlayer
+                        style={
+                          isTV()
+                            ? getStyle(playerDimensions)
+                            : styles.playerSize
+                        }
+                        audio_item={entry}
+                        plugin_configuration={this.getPluginConfiguration()}
+                      />
+                    </AnimationComponent>
                   )}
 
                   {shouldRenderBackground && (
@@ -1085,18 +1121,28 @@ export default class VideoPlayer extends React.Component<
                     />
                   )}
 
-                  {!castAction?.state?.connected && (
-                    <this.props.PlayerComponent
-                      ref={this._assignRoot}
-                      {...nativeEvents}
-                      {...nativeProps}
-                      listener={this.props.listener}
+                  {(!castAction?.state?.connected || supportNativeCast) && (
+                    <AnimationComponent
+                      animationType={ComponentAnimationType.player}
+                      additionalData={playerDimensions}
                       style={getStyle(playerDimensions)}
-                      pluginConfiguration={this.getPluginConfiguration()}
-                      controller={this.props.controller}
                     >
-                      {this.childrenWithPlayNext()}
-                    </this.props.PlayerComponent>
+                      <this.props.PlayerComponent
+                        ref={this._assignRoot}
+                        {...nativeEvents}
+                        {...nativeProps}
+                        listener={this.props.listener}
+                        style={
+                          isTV()
+                            ? getStyle(playerDimensions)
+                            : styles.playerSize
+                        }
+                        pluginConfiguration={this.getPluginConfiguration()}
+                        controller={this.props.controller}
+                      >
+                        {this.childrenWithPlayNext()}
+                      </this.props.PlayerComponent>
+                    </AnimationComponent>
                   )}
                 </View>