@applicaster/quick-brick-player 12.0.0-alpha.4837064762 → 12.0.0-alpha.4876423277

package/package.json

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

package/src/CellPlayer/Assets/AssetsComponent.tsx

@@ -10,66 +10,76 @@ type Asset = string | undefined;
 const isCurrentPlayer = (playerId) =>
   LiveImageManager.instance.getCurrentlyPlaying()?.playerId === playerId;
 
+const liveImageButtonsListenerKey = "live-image-buttons";
+
 const usePlayPauseListeners = (playerId, player, asset, setImageUri) =>
   useEffect(() => {
     if (playerId && player) {
-      if (player.playerState.isReadyToPlay) {
-        if (player.playerState.isPaused) {
-          setImageUri(asset.active);
-        } else {
-          setImageUri(asset.inactive);
-        }
+      setImageUri(null);
+
+      return;
+    }
+
+    if (player.playerState.isReadyToPlay) {
+      if (player.playerState.isPaused) {
+        setImageUri(asset.active);
+      } else {
+        setImageUri(asset.inactive);
       }
+    }
 
-      return player.addListener({
-        id: "live-image-buttons",
-        listener: {
-          onPlayerResume: () => {
-            setImageUri(asset.inactive);
-          },
-          onPlayerPause: () => {
-            setImageUri(asset.active);
-          },
-          onPlayerClose: () => {
-            setImageUri(null);
-          },
-          onLoad() {
-            setImageUri(asset.inactive);
-          },
+    return player.addListener({
+      id: liveImageButtonsListenerKey,
+      listener: {
+        onPlayerResume: () => {
+          setImageUri(asset.inactive);
         },
-      });
-    }
+        onPlayerPause: () => {
+          setImageUri(asset.active);
+        },
+        onPlayerClose: () => {
+          setImageUri(null);
+        },
+        onLoad() {
+          setImageUri(asset.inactive);
+        },
+      },
+    });
   }, [player, playerId, asset]);
 
 const useMuteUnmuteListeners = (playerId, player, asset, setImageUri) =>
   useEffect(() => {
-    if (playerId && player) {
-      // active action = muted, inactive = unmuted
-      return player.addListener({
-        id: "live-image-buttons",
-        listener: {
-          onPlayerMute: () => {
-            if (isCurrentPlayer(playerId)) {
-              setImageUri(asset.active);
-            }
-          },
-          onPlayerUnmute: () => {
-            if (isCurrentPlayer(playerId)) {
-              setImageUri(asset.inactive);
-            }
-          },
-          onLoad() {
-            setImageUri(player?.getIsMuted() ? asset.active : asset.inactive);
-          },
-          onPlayerClose: () => {
-            setImageUri(null);
-          },
-          onVideoEnd: () => {
-            setImageUri(null);
-          },
-        },
-      });
+    if (!player || !playerId) {
+      setImageUri(null);
+
+      return;
     }
+
+    // active action = muted, inactive = unmuted
+    return player.addListener({
+      id: liveImageButtonsListenerKey,
+      listener: {
+        onPlayerMute: () => {
+          if (isCurrentPlayer(playerId)) {
+            setImageUri(asset.active);
+          }
+        },
+        onPlayerUnmute: () => {
+          if (isCurrentPlayer(playerId)) {
+            setImageUri(asset.inactive);
+          }
+        },
+        onLoad() {
+          setImageUri(player?.getIsMuted() ? asset.active : asset.inactive);
+        },
+        onPlayerClose: () => {
+          setImageUri(null);
+        },
+        onVideoEnd: () => {
+          setImageUri(null);
+        },
+      },
+    });
   }, [player, playerId, asset]);
 
 const useListeners = MUTED_USAGE

package/src/CellPlayer/ContextProvider.tsx

@@ -21,7 +21,7 @@ const playActionCallback = (player) => {
   }
 };
 
-const invokeAction = () => {
+const invokeAction = (_item: ZappEntry, _object) => {
   const actionCallback = MUTED_USAGE ? muteActionCallback : playActionCallback;
   // We only allow one player to be present at a time
   const player = LiveImageManager.instance.getCurrentlyPlaying()?.player;
@@ -29,6 +29,54 @@ const invokeAction = () => {
   actionCallback(player);
 };
 
+// Not exported because currently the is no way
+// to subscribe to the action availability change.
+// We currently return a null state to disable the action.
+// eslint-disable-next-line unused-imports/no-unused-vars
+const isActionAvailable = (item: ZappEntry) => {
+  return (
+    LiveImageManager.instance.getCurrentlyPlaying()?.getPlayer().entry.id ===
+    item.id
+  );
+};
+
+const addListener = (
+  entryId: string,
+  listener: CellActionStateListenerFunction
+) => {
+  const callback = (event: Record<string, any>) => {
+    if (event.entry?.id !== entryId) {
+      return;
+    }
+
+    const player = LiveImageManager.instance.getCurrentlyPlaying()?.getPlayer();
+
+    if (!player || player.entry?.id !== entryId) {
+      listener(null);
+
+      return;
+    }
+
+    const actionState = MUTED_USAGE ? player.getIsMuted() : player.isPaused();
+
+    listener({
+      state: actionState ? 1 : 0,
+      label: "",
+      asset: AssetComponent,
+    });
+  };
+
+  return LiveImageManager.instance.addListener({
+    id: `cell-player-${entryId}`,
+    listener: {
+      onEnd: callback,
+      onStart: callback,
+      onError: callback,
+      onDestroy: callback,
+    },
+  });
+};
+
 const emptyState = [];
 
 const initialEntryState = () => ({
@@ -46,6 +94,7 @@ export function ContextProvider(Component: ReactComponent<any>) {
         state: emptyState,
         invokeAction,
         initialEntryState,
+        addListener,
       }),
       [invokeAction, initialEntryState]
     );

package/src/Player/AudioLayer/AudioPlayerWrapper.tsx

@@ -32,6 +32,7 @@ import {
   AnimatedScrollModal,
 } from "@applicaster/zapp-react-native-ui-components/Components/VideoModal/ModalAnimation";
 import { PADDING_HORIZONTAL } from "./Layout/defaultLayoutsConts";
+import { toNumberWithDefault } from "@applicaster/zapp-react-native-utils/numberUtils";
 
 const { log_debug } = createLogger({
   subsystem: "UIComponent",
@@ -54,7 +55,7 @@ type Configuration = {
 };
 
 type Props = {
-  children?: React.ReactNode;
+  children: React.ReactNode;
   inline?: boolean;
   docked?: boolean;
   configuration: Configuration;
@@ -294,7 +295,7 @@ export const AudioPlayerWrapper: React.FC<Props> = (props: Props) => {
     playerState.isPaused ? player?.play() : player.pause();
   }, [playerState, player]);
 
-  const seekDuration = Number(value("seek_duration"));
+  const seekDuration = toNumberWithDefault(10, value("seek_duration"));
 
   const onRewindButtonPress = React.useCallback(() => {
     player?.rewind(seekDuration);
@@ -387,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/DefaultLayout.tsx

@@ -1,6 +1,7 @@
 import * as React from "react";
 import * as R from "ramda";
 import { View } from "react-native";
+import { dayjs } from "@applicaster/zapp-react-native-utils/dateUtils";
 
 import {
   ProgressBar,
@@ -33,6 +34,7 @@ import {
   ComponentAnimationType,
 } from "@applicaster/zapp-react-native-ui-components/Components/VideoModal/ModalAnimation";
 import DockedLayout from "./DockedLayout";
+import { isValidDate } from "../../Utils";
 
 type Dimensions = {
   width: number;
@@ -79,7 +81,7 @@ type LayoutProps = {
 
 const Styles = {
   container: { flex: 1 },
-  tabletContainer: (isPortraitMode) => ({
+  tabletContainer: (isPortraitMode: boolean) => ({
     flex: 1,
     alignItems: "center",
     justifyContent: isPortraitMode ? "center" : "flex-start",
@@ -109,10 +111,10 @@ const Styles = {
     };
   },
   backgroundImageContainerImageStyle: (
-    isTablet,
-    docked,
-    startComponentsAnimation,
-    isActiveGesture
+    isTablet: boolean,
+    docked: boolean,
+    startComponentsAnimation: boolean,
+    isActiveGesture: boolean
   ) => ({
     borderRadius:
       (startComponentsAnimation && isActiveGesture) || docked
@@ -190,8 +192,31 @@ export default function DefaultLayout(props: LayoutProps) {
 
   let showFullControls = !controller?.isAd();
 
+  const startTime = entry.extensions?.live?.start_time;
+  const endTime = entry.extensions?.live?.end_time;
+
+  const hasValidStartTime = isValidDate(startTime);
+  const hasValidEndTime = isValidDate(endTime);
+
+  const isDateBasedLiveContent =
+    isLiveContent && hasValidStartTime && hasValidEndTime;
+
+  const needsToShowProgressBar =
+    (isLiveContent &&
+      (Boolean(value("liveSeekingEnabled")) || isDateBasedLiveContent)) ||
+    !isLiveContent;
+
+  const startTimestamp = hasValidStartTime
+    ? dayjs.utc(startTime!).valueOf()
+    : undefined;
+
+  const endTimestamp = hasValidEndTime
+    ? dayjs.utc(endTime!).valueOf()
+    : undefined;
+
   if (isLiveContent) {
     const seekEnabled = Boolean(value("liveSeekingEnabled"));
+
     showFullControls = !!(controller?.hasSeekableDuration?.() && seekEnabled);
   }
 
@@ -221,12 +246,14 @@ export default function DefaultLayout(props: LayoutProps) {
 
     const rewind = rewindButton({
       isTablet,
-      onPress: controller?.hasContentDuration?.() ? onRewindButtonPress : null,
+      onPress: controller?.hasSeekableDuration?.() ? onRewindButtonPress : null,
     });
 
     const forward = forwardButton({
       isTablet,
-      onPress: controller?.hasContentDuration?.() ? onForwardButtonPress : null,
+      onPress: controller?.hasSeekableDuration?.()
+        ? onForwardButtonPress
+        : null,
     });
 
     const speed = speedButton({
@@ -255,7 +282,6 @@ export default function DefaultLayout(props: LayoutProps) {
       return [skipToStart, rewind, play, forward, skipToLive];
     }
 
-    // Temporary empty button until we add sleep button. It will ensure the buttons will not break in their position
     return [speed, rewind, play, forward, sleep];
   }, [
     playerState,
@@ -276,15 +302,12 @@ export default function DefaultLayout(props: LayoutProps) {
 
   useEffect(() => {
     if (showCounter && sleepTimerDate !== 0) {
-      // Setting the initial timeLeft based on sleepTimerDate
       setTimeLeft(sleepTimerDate - Date.now());
 
-      // Setting up an interval to update the remaining time every second
       const intervalId = setInterval(() => {
         setTimeLeft(() => {
           const newTimeLeft = sleepTimerDate - Date.now();
 
-          // If the new remaining time is less than or equal to 0, clear the interval and trigger the cancelSleepTimer function
           if (newTimeLeft <= 0) {
             clearInterval(intervalId);
 
@@ -292,32 +315,24 @@ export default function DefaultLayout(props: LayoutProps) {
 
             return 0;
           } else {
-            // Otherwise, update the state with the new remaining time
             return newTimeLeft;
           }
         });
       }, 1000);
 
-      // Clearing the interval when the component unmounts or dependencies change
       return () => clearInterval(intervalId);
     } else {
-      // Ensure the timeLeft state is set correctly if showCounter is false
       setTimeLeft(0);
     }
   }, [sleepTimerDate, showCounter, cancelSleepTimer]);
 
   const Separator = () => <View style={Styles.separator} />;
 
-  const liveSeekingEnabled = value("liveSeekingEnabled");
-
-  const needsToShowProgressBar =
-    (isLiveContent && liveSeekingEnabled) || !isLiveContent;
-
   const defaultImageDimensions = React.useMemo(
     () =>
       defaultDimensions &&
       Styles.backgroundImageContainer(defaultDimensions, isTablet),
-    [defaultDimensions]
+    [defaultDimensions, isTablet]
   );
 
   const { isActiveGesture, startComponentsAnimation } =
@@ -341,7 +356,7 @@ export default function DefaultLayout(props: LayoutProps) {
       </AnimationComponent>
       <AnimationComponent
         animationType={ComponentAnimationType.moveUpComponent}
-        style={isTablet ? Styles.playerImageWrapper : null}
+        style={isTablet ? Styles.playerImageWrapper : undefined}
       >
         <AnimationComponent
           animationType={ComponentAnimationType.moveComponentHorizontal}
@@ -356,7 +371,7 @@ export default function DefaultLayout(props: LayoutProps) {
                 }
               : null,
           }}
-          style={isTablet ? Styles.alignItemsCenter : null}
+          style={isTablet ? Styles.alignItemsCenter : undefined}
         >
           <PlayerImageBackground
             entry={entry}
@@ -376,7 +391,7 @@ export default function DefaultLayout(props: LayoutProps) {
       <View
         style={[
           Styles.paddingHorizontal,
-          isTablet ? Styles.tabletLayout : null,
+          isTablet ? Styles.tabletLayout : undefined,
         ]}
       >
         {!docked && (
@@ -401,6 +416,10 @@ export default function DefaultLayout(props: LayoutProps) {
                   playerState={playerState}
                   disableFullscreen={true}
                   sliderStyle={2}
+                  startTimestamp={startTimestamp}
+                  endTimestamp={endTimestamp}
+                  isDateBasedLiveContent={isDateBasedLiveContent}
+                  onSkipLive={onSkipLive}
                 />
 
                 {showCounter && timeLeft >= 0 && (

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/AudioLayer/MagicBG/index.tsx

@@ -1,7 +1,6 @@
-// Disabling for now as lint can't recognise typescript definition here
 /* eslint-disable react/prop-types */
 import * as React from "react";
-import { StyleSheet, View } from "react-native";
+import { Animated, StyleSheet, View } from "react-native";
 import LinearGradient from "../LinearGradient";
 import { getDominantColor, getPalettes } from "../../../utils/utils";
 import { useEffect } from "react";
@@ -11,7 +10,7 @@ type MagicBGProps = {
   image: string;
   fallbackUrl?: string;
   defaultColor: string;
-  colors: string[]; // Updated to type string[] as it holds hex values
+  colors: string[];
 };
 
 const defaultColors = {
@@ -66,31 +65,46 @@ export const MagicBG: React.FC<MagicBGProps> = ({
     defaultColors.defaultGradientEnd,
   ]);
 
+  const [backgroundColorAnim] = React.useState(new Animated.Value(0)); // from 0 to 1
+  const [gradientOpacityAnim] = React.useState(new Animated.Value(0)); // from 0 to 1
+
   useEffect(() => {
+    const animateColors = () => {
+      Animated.timing(backgroundColorAnim, {
+        toValue: 1,
+        duration: 500,
+        useNativeDriver: false,
+      }).start();
+
+      Animated.timing(gradientOpacityAnim, {
+        toValue: 1,
+        duration: 500,
+        useNativeDriver: false,
+      }).start();
+    };
+
     const fetchColors = async () => {
-      // 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
+        setGradientColors(colors.slice(0, 2));
+        setDominantColor(colors[0]);
+        animateColors();
       } else if (image) {
-        // If no colors, try fetching from image
         try {
           const { gradientColors, dominantColor } =
             await fetchPaletteAndDominantColor(image);
 
           setGradientColors(gradientColors);
           setDominantColor(dominantColor);
+          animateColors();
         } catch (error) {
-          // If image fetch fails, try fallback URL
           try {
             const { gradientColors, dominantColor } =
               await fetchPaletteAndDominantColor(fallbackUrl);
 
             setGradientColors(gradientColors);
             setDominantColor(dominantColor);
+            animateColors();
           } catch {
-            // If everything fails, use default color
             setGradientColors([
               defaultColors.defaultGradientStart,
               defaultColors.defaultGradientEnd,
@@ -100,7 +114,6 @@ export const MagicBG: React.FC<MagicBGProps> = ({
           }
         }
       } else {
-        // If no image or colors, use default color
         setGradientColors([
           defaultColors.defaultGradientStart,
           defaultColors.defaultGradientEnd,
@@ -113,11 +126,30 @@ export const MagicBG: React.FC<MagicBGProps> = ({
     fetchColors();
   }, []);
 
+  const interpolatedBackgroundColor = backgroundColorAnim.interpolate({
+    inputRange: [0, 1],
+    outputRange: ["black", dominantColor],
+  });
+
   return (
-    <View style={[styles.container, { backgroundColor: dominantColor }]}>
+    <Animated.View
+      style={[
+        styles.container,
+        { backgroundColor: interpolatedBackgroundColor },
+      ]}
+    >
       <View style={styles.fullScreenOverlay} />
-      <LinearGradient colors={gradientColors} style={styles.gradientOverlay} />
+
+      <Animated.View
+        style={[styles.gradientOverlay, { opacity: gradientOpacityAnim }]}
+      >
+        <LinearGradient
+          colors={gradientColors}
+          style={StyleSheet.absoluteFill}
+        />
+      </Animated.View>
+
       {children}
-    </View>
+    </Animated.View>
   );
 };

package/src/Player/Utils/Utils.ts

@@ -1,26 +1,5 @@
 import queryString from "query-string";
-
-export const toTypeString = (obj) => {
-  switch (typeof obj) {
-    case "object":
-      return obj instanceof Date ? obj.toISOString() : JSON.stringify(obj); // object, null
-    case "undefined":
-      return "";
-    default:
-      // boolean, number, string
-      return obj.toString();
-  }
-};
-
-export const stringsOnlyObject = (obj) => {
-  const strObj = {};
-
-  Object.keys(obj).forEach((x) => {
-    strObj[x] = toTypeString(obj[x]);
-  });
-
-  return strObj;
-};
+import { dayjs } from "@applicaster/zapp-react-native-utils/dateUtils";
 
 export const getLiveUrl = (url: string) => {
   // Use the replace method with a regular expression to replace all instances of subClass with livePage
@@ -42,3 +21,11 @@ export const addQueryParam = (
 
   return `${urlWithoutQuery}?${updatedQueryString}`;
 };
+
+export const isValidDate = (dateString: string | undefined): boolean => {
+  return (
+    typeof dateString === "string" &&
+    dateString.trim() !== "" &&
+    dayjs.utc(dateString).isValid()
+  );
+};

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";
 
@@ -21,14 +21,8 @@ import { PlayerWrapper } from "@applicaster/zapp-react-native-ui-components/Comp
 
 import { PlayNextOverlay } from "./PlayNextOverlay";
 import { PlayerImageBackground } from "@applicaster/zapp-react-native-ui-components/Components/PlayerImageBackground";
-import { AnalyticsTracker } from "@applicaster/zapp-react-native-utils/analyticsUtils/analyticsTracker";
 
-import {
-  AD_EVENT,
-  GENERAL_EVENT,
-  PLAYBACK_EVENT,
-  QOS_EVENT,
-} from "@applicaster/zapp-react-native-utils/analyticsUtils/events";
+import { GENERAL_EVENT } from "@applicaster/zapp-react-native-utils/analyticsUtils/events";
 import { Categories, createLogger, Subsystem } from "../logger";
 import { parseLanguageTracks } from "@applicaster/zapp-react-native-utils/playerUtils/configurationUtils";
 import { DEFAULT_COLORS, SEEK_TIME } from "../utils/const";
@@ -42,15 +36,10 @@ import {
   AnimationComponent,
   ComponentAnimationType,
 } from "@applicaster/zapp-react-native-ui-components/Components/VideoModal/ModalAnimation";
+import { PlayerAnalyticsManager } from "@applicaster/zapp-react-native-utils/analyticsUtils/PlayerAnalyticsManager";
+import { PlayerAnalyticsTrackerI } from "@applicaster/zapp-react-native-utils/analyticsUtils/playerAnalyticsTracker";
 
-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 },
@@ -75,7 +64,6 @@ export default class VideoPlayer extends React.Component<
 > {
   public static propTypes = {};
   _root: any;
-  analyticsTracker: AnalyticsTracker;
   playerPluginId: string;
   takeParentStyle: Record<any, any>;
   playbackStarted = false;
@@ -106,6 +94,17 @@ export default class VideoPlayer extends React.Component<
     duration: 0,
   };
 
+  private _tracker: PlayerAnalyticsTrackerI;
+  get analyticsTracker() {
+    if (!this._tracker) {
+      this._tracker = PlayerAnalyticsManager.getInstance().getTracker(
+        this.props.playerId
+      );
+    }
+
+    return this._tracker;
+  }
+
   constructor(props) {
     super(props);
     this.onVideoLoadCalled = false; // android
@@ -114,16 +113,13 @@ export default class VideoPlayer extends React.Component<
       ? { width: "100%", flex: "1 1 auto", objectFit: "contain" }
       : { flexBasis: "auto", flexGrow: 1, flexShrink: 1 };
 
-    const entry = this.props?.entry;
-    this.analyticsTracker = new AnalyticsTracker(entry);
     this.playerPluginId = this.props?.playerPluginIdentifier;
   }
 
   componentWillUnmount() {
-    this.stopBackgroundPlayback();
-
     this.playbackStarted = false;
-    this.handleAnalyticEvent(GENERAL_EVENT.session_end);
+
+    this.analyticsTracker.handleAnalyticEvent(GENERAL_EVENT.session_end);
     this.onPlayerClosed();
 
     if (isAndroidPlatform()) {
@@ -166,6 +162,11 @@ export default class VideoPlayer extends React.Component<
     }
   }
 
+  // For close button
+  public closeNativePlayer = () => {
+    this.stopBackgroundPlayback();
+  };
+
   getPlayNextData = () => this.props.playNextData as PlayNextData;
 
   /**
@@ -179,27 +180,6 @@ export default class VideoPlayer extends React.Component<
     return this.props.pluginConfiguration;
   };
 
-  /**
-   * Handles analytic events, generates a new analytics tracker and transmits events
-   * Passes entry data, and playerState to the tracker for additional context
-   * The end result is an event formatted and passed to AnalyticsBridge.postEvent
-   * When we get the synthetic event we need to pull the data in the nativeEvent object
-   * nativeEvent contains the return value from native
-   */
-  handleAnalyticEvent = (event, data = {}) => {
-    const entry = this.props?.entry;
-    const playerState = this.getState();
-
-    if (this.analyticsTracker?.handleAnalyticEvent) {
-      this.analyticsTracker?.handleAnalyticEvent?.(
-        event,
-        { ...data, player_type: this.props.playerPluginIdentifier },
-        entry,
-        playerState
-      );
-    }
-  };
-
   /**
    * This method is for the events that have no implementation in react but are being invoked by native
    * When we get the synthetic event we need to pull the data in the nativeEvent object
@@ -340,11 +320,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";
@@ -403,28 +379,16 @@ export default class VideoPlayer extends React.Component<
   };
 
   onPlayerPresented = () => {
-    this.handleAnalyticEvent(GENERAL_EVENT.player_presented);
+    this.analyticsTracker?.handleAnalyticEvent(GENERAL_EVENT.player_presented);
   };
 
   onPlayerClosed = () => {
-    this.handleAnalyticEvent(GENERAL_EVENT.player_closed);
-  };
-
-  onPlayerSessionEnd = () => {
-    // TODO: Implement method on native android, ios exists
-    this.handleAnalyticEvent(GENERAL_EVENT.session_end);
-  };
-
-  onPlayerSessionStart = () => {
-    // TODO: Implement method on native android, ios exists
-
-    this.handleAnalyticEvent(GENERAL_EVENT.session_start);
+    this.analyticsTracker?.handleAnalyticEvent(GENERAL_EVENT.player_closed);
   };
 
   onVideoEnd = () => {
     this.setState({ displayOverlay: !this.state.displayOverlay }, () => {
       if (this.state?.displayOverlay) {
-        this.handleAnalyticEvent(PLAYBACK_EVENT.complete);
         this.props?.listener?.onVideoEnd({});
       }
     });
@@ -434,15 +398,12 @@ export default class VideoPlayer extends React.Component<
   onVideoError = ({ nativeEvent }) => {
     const { message } = nativeEvent;
 
-    this.handleAnalyticEvent(PLAYBACK_EVENT.error, nativeEvent);
-
     return this.props?.listener?.onError(new Error(message));
   };
 
   onPlayerPause = ({ nativeEvent = null }) => {
     this.setState({ paused: true });
     this.props?.listener?.onPlayerPause(nativeEvent);
-    this.handleAnalyticEvent(PLAYBACK_EVENT.pause, nativeEvent);
   };
 
   onPlayerResume = ({ nativeEvent = null }) => {
@@ -453,98 +414,61 @@ export default class VideoPlayer extends React.Component<
 
     if (isNotAnAd && !resume) {
       this.setState({ resume: true });
-      this.handleAnalyticEvent(PLAYBACK_EVENT.play, nativeEvent);
     }
   };
 
   onPlayerSeekComplete = ({ nativeEvent }) => {
     this.props?.listener?.onPlayerSeekComplete(nativeEvent);
-    this.handleAnalyticEvent(PLAYBACK_EVENT.seek_complete, nativeEvent);
   };
 
   onPlayerSeekStart = ({ nativeEvent }) => {
     this.props?.listener?.onPlayerSeekStart(nativeEvent);
-    this.handleAnalyticEvent(PLAYBACK_EVENT.seek_start, nativeEvent);
   };
 
   onBufferStart = ({ nativeEvent }) => {
     this.props?.listener?.onBufferStart(nativeEvent);
-    this.handleAnalyticEvent(PLAYBACK_EVENT.buffer_start, nativeEvent);
   };
 
   onBufferComplete = ({ nativeEvent }) => {
     this.props?.listener?.onBufferComplete(nativeEvent);
-    this.handleAnalyticEvent(PLAYBACK_EVENT.buffer_complete, nativeEvent);
-  };
-
-  onPlayerNext = ({ nativeEvent }) => {
-    // TODO: Implement method on native
-
-    this.handleAnalyticEvent(PLAYBACK_EVENT.next, nativeEvent);
-  };
-
-  onPlayerPrevious = ({ nativeEvent }) => {
-    // TODO: Implement method on native
-
-    this.handleAnalyticEvent(PLAYBACK_EVENT.previous, nativeEvent);
-  };
-
-  onPlayerStop = ({ nativeEvent }) => {
-    // TODO: Implement method on native
-
-    this.handleAnalyticEvent(PLAYBACK_EVENT.stop, nativeEvent);
-  };
-
-  onVideoBandwidthUpdate = ({ nativeEvent }) => {
-    // TODO: Implement method on native
-
-    this.handleAnalyticEvent(QOS_EVENT.bitrate_changed, nativeEvent);
   };
 
   onAdBegin = ({ nativeEvent }) => {
     this.setState({ isAd: true });
-    this.handleAnalyticEvent(AD_EVENT.ad_start, nativeEvent);
     this.props.listener?.onAdBegin?.(nativeEvent);
   };
 
   onAdBreakBegin = ({ nativeEvent }) => {
     this.setState({ isAd: true });
-    this.handleAnalyticEvent(AD_EVENT.ad_break_start, nativeEvent);
     this.props.listener?.onAdBreakBegin?.(nativeEvent);
   };
 
   onAdBreakEnd = ({ nativeEvent }) => {
     this.setState({ isAd: false });
-    this.handleAnalyticEvent(AD_EVENT.ad_break_completed, nativeEvent);
     this.props.listener?.onAdBreakEnd?.(nativeEvent);
   };
 
   onAdEnd = ({ nativeEvent }) => {
     this.setState({ isAd: false });
-    this.handleAnalyticEvent(AD_EVENT.ad_complete, nativeEvent);
     this.props.listener?.onAdEnd?.(nativeEvent);
   };
 
   onAdError = ({ nativeEvent }) => {
     this.setState({ isAd: false });
-    this.handleAnalyticEvent(AD_EVENT.ad_error, nativeEvent);
     this.props.listener?.onAdError?.(nativeEvent);
   };
 
   onAdRequest = ({ nativeEvent }) => {
-    this.handleAnalyticEvent(AD_EVENT.ad_request, nativeEvent);
     this.props.listener?.onAdRequest?.(nativeEvent);
   };
 
   onAdClicked = ({ nativeEvent }) => {
-    this.handleAnalyticEvent(AD_EVENT.ad_clicked, nativeEvent);
     // Broadcast click event
     this.props.playerEvent("ad-clicked", nativeEvent);
     this.props.listener?.onAdClicked?.(nativeEvent);
   };
 
   onAdTapped = ({ nativeEvent }) => {
-    this.handleAnalyticEvent(AD_EVENT.ad_tapped, nativeEvent);
     // Broadcast click event
     this.props.playerEvent("ad-tapped", nativeEvent);
     this.props.listener?.onAdTapped?.(nativeEvent);
@@ -657,10 +581,6 @@ export default class VideoPlayer extends React.Component<
         }
 
         if (!this.state.isAd && !this.onVideoLoadCalled) {
-          this.handleAnalyticEvent(PLAYBACK_EVENT.load_video, {
-            player_type: this.props.playerPluginIdentifier,
-          });
-
           // TODO: Hack, needs to remove
           this.onVideoLoadCalled = true;
         }
@@ -796,6 +716,7 @@ export default class VideoPlayer extends React.Component<
       style,
       castAction,
       controller,
+      startComponentsAnimation,
     } = this.props;
 
     const supportNativeCast = controller.supportNativeCast();
@@ -861,11 +782,14 @@ 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 =
-      controls && !docked && !castAction?.state?.connected;
+      controls &&
+      !startComponentsAnimation &&
+      !docked &&
+      !castAction?.state?.connected;
 
     platformSpecificProps = {
       ...platformSpecificProps,
@@ -924,8 +848,6 @@ export default class VideoPlayer extends React.Component<
       onPlayerResume: this.onPlayerResume, // play
       onPlayerSeekComplete: this.onPlayerSeekComplete, // seek_complete
       onPlayerSeekStart: this.onPlayerSeekStart, // seek_start
-      onPlayerSessionEnd: this.onPlayerSessionEnd, // session_end
-      onPlayerSessionStart: this.onPlayerSessionStart, // session_start
     };
 
     const lifecycleEvents = {
@@ -958,7 +880,6 @@ export default class VideoPlayer extends React.Component<
       onTimedMetadata: this.unHandledEvent("onTimedMetadata"),
       onTracksChanged: this.onTracksChanged,
       eventSubtitlesChange: this.unHandledEvent("eventSubtitlesChange"),
-      onVideoBandwidthUpdate: this.onVideoBandwidthUpdate,
     };
 
     const playerSystemEvents = {
@@ -978,9 +899,6 @@ export default class VideoPlayer extends React.Component<
     const unsupportedEvents = {
       onBufferComplete: this.onBufferComplete, // buffer_complete
       onBufferStart: this.onBufferStart, // buffer_start
-      onPlayerNext: this.onPlayerNext, // next
-      onPlayerPrevious: this.onPlayerPrevious, // previous
-      onPlayerStop: this.onPlayerStop, // stop
     };
 
     const nativeEvents = {
@@ -994,7 +912,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
@@ -1036,6 +960,7 @@ export default class VideoPlayer extends React.Component<
           extraInfoText={castAction?.state?.friendlyStatus}
           controlsAlwaysVisible={castAction?.state?.connected}
           playNextData={this.getPlayNextData()}
+          needToShowDefaultControls={needToShowDefaultControls}
         />
       ) : null;
     };