@applicaster/quick-brick-player 14.0.0-rc.81 → 14.0.0-rc.83

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applicaster/quick-brick-player",
-  "version": "14.0.0-rc.81",
+  "version": "14.0.0-rc.83",
   "description": "Quick Brick Player",
   "main": "./src/index.ts",
   "types": "index.d.ts",
@@ -35,11 +35,11 @@
   },
   "homepage": "https://github.com/applicaster/quickbrick#readme",
   "dependencies": {
-    "@applicaster/quick-brick-mobile-transport-controls": "14.0.0-rc.67",
+    "@applicaster/quick-brick-mobile-transport-controls": "14.0.0-rc.83",
     "@applicaster/quick-brick-tv-transport-controls": "14.0.0-rc.71",
-    "@applicaster/zapp-react-native-tvos-app": "14.0.0-rc.81",
-    "@applicaster/zapp-react-native-ui-components": "14.0.0-rc.81",
-    "@applicaster/zapp-react-native-utils": "14.0.0-rc.81",
+    "@applicaster/zapp-react-native-tvos-app": "14.0.0-rc.83",
+    "@applicaster/zapp-react-native-ui-components": "14.0.0-rc.83",
+    "@applicaster/zapp-react-native-utils": "14.0.0-rc.83",
     "query-string": "7.1.3",
     "shaka-player": "4.3.5",
     "typeface-montserrat": "^0.0.54",

package/src/Player/AudioLayer/AudioPlayerWrapper.tsx

@@ -61,6 +61,7 @@ type Props = {
     inline: boolean;
     docked: boolean;
     isModal: boolean;
+    pip: boolean;
   };
   playNextData: PlayNextData;
   isTabletPortrait?: boolean;
@@ -246,13 +247,28 @@ export const AudioPlayerWrapper: React.FC<Props> = (props: Props) => {
     player?.seekTo(0);
   }, [player]);
 
+  const layoutStateMemo = React.useMemo(
+    () => ({
+      inline: layoutState.inline,
+      docked: layoutState.docked,
+      isModal: layoutState.isModal,
+      pip: layoutState.pip,
+    }),
+    [
+      layoutState.inline,
+      layoutState.docked,
+      layoutState.isModal,
+      layoutState.pip,
+    ]
+  );
+
   return (
     <SafeAreaView style={[style, Styles.playerContainer]} edges={edges}>
       <View style={Styles.playerContainer} onLayout={onLayout}>
         <Layout
           entry={entry}
           playerState={playerState}
-          layoutState={layoutState}
+          layoutState={layoutStateMemo}
           value={value}
           onPlaybackButtonPress={onPlaybackButtonPress}
           onRewindButtonPress={onRewindButtonPress}

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

@@ -1,6 +1,5 @@
 import * as React from "react";
-import { StyleSheet, View, ViewStyle } from "react-native";
-import * as R from "ramda";
+import { StyleSheet, View } from "react-native";
 import {
   useIsTablet,
   useZStore,
@@ -16,7 +15,6 @@ import {
 
 import { PlayNextData } from "@applicaster/zapp-react-native-ui-components/Components/PlayerContainer/PlayerContainer";
 
-import { toNumberWithDefault } from "@applicaster/zapp-react-native-utils/numberUtils";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { useNavigation } from "@applicaster/zapp-react-native-utils/reactHooks/navigation/useNavigation";
 import { getTabBarHeight } from "@applicaster/zapp-react-native-utils/reactHooks/navigation/getTabBarHeight";
@@ -27,6 +25,7 @@ import { noop } from "@applicaster/zapp-react-native-utils/functionUtils";
 import { PROGRESS_BAR_HEIGHT } from "@applicaster/zapp-react-native-ui-components/Components/VideoModal/ModalAnimation/utils";
 import { isMenuVisible } from "@applicaster/zapp-react-native-ui-components/Components/Screen/navigationHandler";
 import { usePlugins } from "@applicaster/zapp-react-native-redux";
+import { partial } from "@applicaster/zapp-react-native-utils/utils";
 
 const bottomTabBarHeight = getTabBarHeight();
 
@@ -45,7 +44,6 @@ const styles = StyleSheet.create({
     flex: 1,
     flexDirection: "column",
     alignItems: "stretch",
-    marginTop: PROGRESS_BAR_HEIGHT,
   },
   content: {
     flex: 1,
@@ -88,14 +86,12 @@ const styles = StyleSheet.create({
   buttons: {
     marginVertical: 10,
   },
+  liveMarginTop: { marginTop: 0 },
+  marginTop: { marginTop: PROGRESS_BAR_HEIGHT },
 });
 
-const playerDimensionsStyle = (
-  minimisedHeight: number,
-  addPadding: boolean
-): ViewStyle => ({
-  width: addPadding ? toNumberWithDefault(100, minimisedHeight) : 0,
-});
+const getValue = (key: string, stylesObj: Record<string, any>) =>
+  stylesObj?.[key] ?? null;
 
 const controlButtons = (
   live: boolean,
@@ -161,7 +157,6 @@ export const DockedControls = (props: Props) => {
     onPlayerSeek = noop,
     playNextData,
     ImageComponent,
-    isActiveGesture = true,
     aspectRatio,
   } = props;
 
@@ -179,11 +174,6 @@ export const DockedControls = (props: Props) => {
   const configuration = useZStore("playerConfiguration")();
   const playerState = usePlayerState("shared-player-wrapper-docked");
 
-  const getValue = React.useCallback(
-    (key: string, stylesObj: {}) => R.propOr(null, key, stylesObj),
-    []
-  );
-
   const value = React.useCallback(
     (key: string) => {
       const retVal = getValue(key, configuration);
@@ -202,7 +192,7 @@ export const DockedControls = (props: Props) => {
 
       return retVal;
     },
-    [...Object.values(configuration), playerState.seekableDuration, getValue]
+    [...Object.values(configuration), playerState.seekableDuration]
   );
 
   const { title, summary } = useTitleSummaryOverlay(
@@ -219,15 +209,65 @@ export const DockedControls = (props: Props) => {
 
   const insets = useSafeAreaInsets();
 
+  const progressBarLayoutState = React.useMemo(
+    () => ({
+      inline: layoutState.inline,
+      docked: true,
+      isModal: layoutState.isModal,
+      pip: layoutState.pip,
+    }),
+    [layoutState.inline, layoutState.isModal, layoutState.pip]
+  );
+
+  const _controlButtons = React.useMemo(
+    () => partial(controlButtons, playerState.isLive && liveButton),
+    [playerState.isLive, liveButton]
+  );
+
+  const containerStyles = React.useMemo(
+    () => ({
+      height: minimisedHeight,
+      maxHeight: minimisedHeight,
+    }),
+    [minimisedHeight]
+  );
+
+  const imageComponentWrapperStyles = React.useMemo(
+    () => ({
+      aspectRatio: aspectRatio,
+      height: minimisedHeight,
+    }),
+    [aspectRatio, minimisedHeight]
+  );
+
+  const backgroundColorStyle = React.useMemo(
+    () => ({
+      backgroundColor: dockedBackgroundColor,
+    }),
+    [dockedBackgroundColor]
+  );
+
+  const bottomSpacerStyle = React.useMemo(() => {
+    const tabBarHeight = menuVisible ? bottomTabBarHeight : 0;
+    const safeAreaBottomInset = insets.bottom || 0;
+
+    return {
+      height: safeAreaBottomInset + tabBarHeight,
+    };
+  }, [menuVisible, insets.bottom]);
+
+  const contentInfoContent = React.useMemo(
+    () => ({ ...entry, title, summary }),
+    [title, summary, entry]
+  );
+
   return (
     <>
       <View
         style={[
           styles.container,
-          {
-            height: minimisedHeight,
-            maxHeight: minimisedHeight,
-          },
+          containerStyles,
+          playerState.isLive ? styles.liveMarginTop : styles.marginTop,
         ]}
       >
         {!playerState.isLive ? (
@@ -236,42 +276,23 @@ export const DockedControls = (props: Props) => {
             content={entry}
             value={value}
             visible
-            layoutState={layoutState}
+            layoutState={progressBarLayoutState}
             onPlayerSeek={onPlayerSeek}
             playerState={playerState}
-            startComponentsAnimation={noop}
             docked
           />
         ) : null}
 
         <View style={styles.content}>
           <View style={styles.touchableArea}>
-            {isActiveGesture || layoutState.docked ? (
-              <View
-                style={{ aspectRatio: aspectRatio, height: minimisedHeight }}
-              >
-                {ImageComponent || null}
-              </View>
-            ) : (
-              <View
-                style={playerDimensionsStyle(
-                  minimisedHeight,
-                  isActiveGesture || layoutState.docked
-                )}
-              />
-            )}
+            <View style={imageComponentWrapperStyles}>
+              {ImageComponent || null}
+            </View>
             <View
               testID="content-info"
-              style={[
-                styles.contentInfo,
-                { backgroundColor: dockedBackgroundColor },
-              ]}
+              style={[styles.contentInfo, backgroundColorStyle]}
             >
-              <ContentInfo
-                content={{ ...entry, title, summary }}
-                value={value}
-                docked
-              />
+              <ContentInfo content={contentInfoContent} value={value} docked />
             </View>
           </View>
           <View
@@ -279,15 +300,13 @@ export const DockedControls = (props: Props) => {
               isTablet
                 ? styles.controlsContainerForTablet
                 : styles.controlsContainerForMobile,
-              { backgroundColor: dockedBackgroundColor },
+              backgroundColorStyle,
             ]}
           >
             <Controls
               value={value}
               visible
-              buttons={R.partial(controlButtons, [
-                playerState.isLive && liveButton,
-              ])}
+              buttons={_controlButtons}
               style={styles.playPauseButton}
               playNextData={playNextData}
               playerState={playerState}
@@ -302,12 +321,7 @@ export const DockedControls = (props: Props) => {
           </View>
         </View>
       </View>
-      <View
-        style={{
-          height: insets.bottom + (menuVisible ? bottomTabBarHeight : 0),
-          backgroundColor: dockedBackgroundColor,
-        }}
-      />
+      <View style={[bottomSpacerStyle, backgroundColorStyle]} />
     </>
   );
 };

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

@@ -151,12 +151,7 @@ export function MobileLayout({
             },
           ]}
         >
-          <PlayerImage
-            entry={entry}
-            docked={false}
-            imageWidth={imageSize}
-            configuration={configuration}
-          />
+          <PlayerImage entry={entry} configuration={configuration} />
         </View>
         {/* PlayerImage */}
 

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

@@ -4,7 +4,6 @@ import { LayoutChangeEvent, View } from "react-native";
 import { noop } from "@applicaster/zapp-react-native-utils/functionUtils";
 import { toBooleanWithDefaultTrue } from "@applicaster/zapp-react-native-utils/booleanUtils";
 
-import { AnimatedImage } from "./AnimatedImage";
 import { FlexImage } from "./FlexImage";
 
 import { styles } from "./styles";
@@ -13,19 +12,12 @@ import { toNumberWithDefaultZero } from "@applicaster/zapp-react-native-utils/nu
 type Props = {
   entry: ZappEntry;
   configuration: QuickBrickPlayer.AudioPlayerProps["configuration"];
-  docked: boolean;
-  imageWidth?: Option<number>;
+  docked?: boolean;
   onLayoutImage?: (event: LayoutChangeEvent) => void;
 };
 
 export const PlayerImage = (props: Props) => {
-  const {
-    entry,
-    docked,
-    imageWidth,
-    configuration,
-    onLayoutImage = noop,
-  } = props;
+  const { entry, docked = false, configuration, onLayoutImage = noop } = props;
 
   const isShadowEnabled = toBooleanWithDefaultTrue(
     configuration?.audio_player_artwork_shadow_enabled
@@ -43,19 +35,9 @@ export const PlayerImage = (props: Props) => {
         onLayout={onLayoutImage}
         style={[shouldShowShadow ? styles.shadow : undefined, { borderRadius }]}
       >
-        {!imageWidth ? (
-          <View style={[styles.defaultImageWrapperView, { borderRadius }]}>
-            <FlexImage entry={entry} style={styles.backgroundImageContainer} />
-          </View>
-        ) : (
-          // we have imageSize here and now we could animate resizing of this image
-          <AnimatedImage
-            entry={entry}
-            style={[styles.backgroundImageContainer, { borderRadius }]}
-            imageWidth={imageWidth}
-            docked={docked}
-          />
-        )}
+        <View style={[styles.defaultImageWrapperView, { borderRadius }]}>
+          <FlexImage entry={entry} style={styles.backgroundImageContainer} />
+        </View>
       </View>
     </View>
   );

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

@@ -117,14 +117,11 @@ export function TabletLandscapeLayout({
         <View style={[styles.flex, styles.audioPlayerContainerHeightLimit]}>
           {/* PlayerImage non-docked */}
           <View style={[styles.flex, withDebug(styles.debugYellow)]}>
-            {!docked ? (
-              <PlayerImage
-                docked={false}
-                entry={entry}
-                configuration={configuration}
-                onLayoutImage={onLayoutImage}
-              />
-            ) : null}
+            <PlayerImage
+              entry={entry}
+              configuration={configuration}
+              onLayoutImage={onLayoutImage}
+            />
           </View>
           {/* PlayerImage */}
 

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

@@ -144,12 +144,7 @@ export function TabletPortraitLayout({
             ]}
             onLayout={onLayout}
           >
-            <PlayerImage
-              entry={entry}
-              configuration={configuration}
-              docked={docked}
-              imageWidth={imageSize}
-            />
+            <PlayerImage entry={entry} configuration={configuration} />
           </View>
 
           <View

package/src/Player/AudioLayer/utils.ts

@@ -1,10 +1,6 @@
 import { localStorage } from "@applicaster/zapp-react-native-bridge/ZappStorage/LocalStorage";
-import {
-  PlayerAnimationStateEnum,
-  PlayerAnimationStateT,
-} from "@applicaster/zapp-react-native-ui-components/Components/VideoModal/ModalAnimation/ModalAnimationContext";
+
 import { parseJsonIfNeeded } from "@applicaster/zapp-react-native-utils/functionUtils";
-import { toNumberWithDefaultZero } from "@applicaster/zapp-react-native-utils/numberUtils";
 
 export const NAMESPACE = "audio-player";
 
@@ -36,25 +32,3 @@ export const formatSpeed = (value: number) => {
   // Return the formatted string with "speed_" prefix
   return `speed_${formattedValue}`;
 };
-
-export const calculateBorderRadius = (
-  docked: boolean,
-  startComponentsAnimation: boolean,
-  isActiveGesture: boolean,
-  playerAnimationState: PlayerAnimationStateT,
-  configuration: Record<string, any>
-): number => {
-  const shouldRemoveBorderRadius =
-    (startComponentsAnimation &&
-      isActiveGesture &&
-      playerAnimationState !== PlayerAnimationStateEnum.maximize) ||
-    docked;
-
-  if (shouldRemoveBorderRadius) {
-    return 0;
-  }
-
-  return toNumberWithDefaultZero(
-    configuration.audio_player_artwork_border_radius
-  );
-};

package/src/Player/PlayerModal/PlayerModal.tsx

@@ -6,7 +6,7 @@ import { useStyles } from "./styles";
 import { useVideoModalState } from "./hooks";
 import { MODAL_COLLAPSE_RATIO, MODAL_RADIUS } from "./consts";
 import { useModalAnimationContext } from "@applicaster/zapp-react-native-ui-components/Components/VideoModal/ModalAnimation";
-import { getWindowHeight } from "./utils";
+import { getScreenHeight, getWindowHeight } from "./utils";
 
 type AnimatedModalProps = {
   content?: ReactElement;
@@ -31,6 +31,7 @@ export function AnimatedModal({
 
   const WINDOW_HEIGHT = getWindowHeight();
   const heightAboveMinimised = WINDOW_HEIGHT - collapsedHeight;
+  const screenHeight = getScreenHeight();
 
   const MODAL_COLLAPSE_START = WINDOW_HEIGHT * MODAL_COLLAPSE_RATIO;
 
@@ -63,7 +64,7 @@ export function AnimatedModal({
             borderTopLeftRadius: borderTopRadiusAnimated,
             borderTopRightRadius: borderTopRadiusAnimated,
             transform: [{ translateY }],
-            height: WINDOW_HEIGHT,
+            height: screenHeight,
           },
         ]}
       >
@@ -73,7 +74,7 @@ export function AnimatedModal({
             {
               borderTopLeftRadius: borderTopRadiusAnimated,
               borderTopRightRadius: borderTopRadiusAnimated,
-              height: WINDOW_HEIGHT,
+              height: screenHeight,
             },
           ]}
         >

package/src/Player/PlayerModal/VideoPlayerModal.tsx

@@ -18,7 +18,7 @@ import { PROGRESS_BAR_HEIGHT } from "@applicaster/zapp-react-native-ui-component
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { GestureAnimatedScrollView } from "./GestureAnimatedScrollView";
 import { PlayerDetailsWrapperHeightContext } from "./context";
-import { getWindowHeight, getWindowWidth } from "./utils";
+import { getScreenHeight, getWindowHeight, getWindowWidth } from "./utils";
 
 const orientationStyles = StyleSheet.create({
   landscape: { flexDirection: "row" },
@@ -61,6 +61,7 @@ export function VideoPlayerModal({
 
   const WINDOW_WIDTH = useMemo(() => getWindowWidth(), []); // remember initial width, ignore rotation changes
   const height = useMemo(() => getWindowHeight(), []); // remember initial height, ignore rotation changes
+  const screenHeight = useMemo(() => getScreenHeight(), []); // remember initial height, ignore rotation changes
   const MODAL_COLLAPSE_START = height * MODAL_COLLAPSE_RATIO;
 
   let width = WINDOW_WIDTH;
@@ -115,7 +116,7 @@ export function VideoPlayerModal({
 
   const xPosition = !isFullScreenOrPIP
     ? translateY.interpolate({
-        inputRange: [height * VIDEO_TRANSITION_THRESHOLD, heightAboveMinimised],
+        inputRange: [height * VIDEO_TRANSITION_THRESHOLD, MODAL_COLLAPSE_START],
         outputRange: [0, -(width - width * SCALE_FACTOR) / 2],
         extrapolate: "clamp",
       })
@@ -125,14 +126,16 @@ export function VideoPlayerModal({
 
   const yPosition = !isFullScreenOrPIP
     ? translateY.interpolate({
-        inputRange: [
-          height * VIDEO_TRANSITION_THRESHOLD,
-          height - collapsedHeight,
-        ],
+        inputRange: [height * VIDEO_TRANSITION_THRESHOLD, MODAL_COLLAPSE_START],
         outputRange: [
           0,
           isTablet && isTabletLandscape
-            ? -((-PROGRESS_BAR_HEIGHT + height - vidHeight * SCALE_FACTOR) / 2)
+            ? -(
+                (-PROGRESS_BAR_HEIGHT +
+                  screenHeight -
+                  vidHeight * SCALE_FACTOR) /
+                2
+              )
             : -(
                 PROGRESS_BAR_HEIGHT +
                 insets.top / 2 +
@@ -147,10 +150,7 @@ export function VideoPlayerModal({
 
   const scalePosition = !isFullScreenOrPIP
     ? translateY.interpolate({
-        inputRange: [
-          height * VIDEO_TRANSITION_THRESHOLD,
-          height - collapsedHeight,
-        ],
+        inputRange: [height * VIDEO_TRANSITION_THRESHOLD, MODAL_COLLAPSE_START],
         outputRange: [1, SCALE_FACTOR],
         extrapolate: "clamp",
       })
@@ -192,7 +192,7 @@ export function VideoPlayerModal({
             borderTopLeftRadius: borderTopRadiusAnimated,
             borderTopRightRadius: borderTopRadiusAnimated,
             transform: [{ translateY: isFullScreenOrPIP ? 0 : translateY }],
-            height: height,
+            height: screenHeight,
           },
         ]}
       >
@@ -204,13 +204,16 @@ export function VideoPlayerModal({
             {
               borderTopLeftRadius: borderTopRadiusAnimated,
               borderTopRightRadius: borderTopRadiusAnimated,
-              height: height,
+              height: screenHeight,
             },
           ]}
         >
           <Animated.View
             pointerEvents={!collapsed ? "auto" : "none"}
-            style={[styles.modalContent, directionStyles(isTabletLandscape)]}
+            style={[
+              pip ? styles.modalContentPiP : styles.modalContent,
+              directionStyles(isTabletLandscape),
+            ]}
           >
             <Animated.View
               style={[

package/src/Player/PlayerModal/hooks/index.ts

@@ -1,5 +1,8 @@
 import { useCallback, useEffect, useMemo, useRef } from "react";
-import { useSafeAreaInsets } from "react-native-safe-area-context";
+import {
+  useSafeAreaFrame,
+  useSafeAreaInsets,
+} from "react-native-safe-area-context";
 import { State } from "react-native-gesture-handler";
 import { Animated } from "react-native";
 
@@ -15,7 +18,7 @@ import {
 } from "../consts";
 import { PROGRESS_BAR_HEIGHT } from "@applicaster/zapp-react-native-ui-components/Components/VideoModal/ModalAnimation/utils";
 import { usePlugins } from "@applicaster/zapp-react-native-redux";
-import { getWindowHeight } from "../utils";
+import { isOldAndroidDevice } from "../utils";
 
 const bottomTabBarHeight = getTabBarHeight();
 
@@ -24,8 +27,6 @@ export const useVideoModalState = (
 ) => {
   const { minimised_height: minimisedHeight } = useConfiguration();
 
-  const WINDOW_HEIGHT = getWindowHeight();
-
   const {
     maximiseVideoModal,
     minimiseVideoModal,
@@ -42,17 +43,16 @@ export const useVideoModalState = (
     videoModalState.visible &&
     videoModalState.mode === VideoModalMode.MINIMIZED;
 
-  const { bottom } = useSafeAreaInsets();
-
-  const initialBottomOffset = useRef(bottom).current;
+  const frame = useSafeAreaFrame();
+  const insets = useSafeAreaInsets();
 
   const collapsedHeight =
     minimisedHeight +
-    initialBottomOffset +
     (menuVisible ? bottomTabBarHeight : 0) +
+    (isOldAndroidDevice ? 0 : insets.bottom) +
     PROGRESS_BAR_HEIGHT;
 
-  const heightAboveMinimised = WINDOW_HEIGHT - collapsedHeight;
+  const heightAboveMinimised = frame.height - collapsedHeight;
 
   const translateY = translateYRef.current;
 
@@ -179,7 +179,12 @@ export const useVideoModalState = (
         });
       }
     }
-  }, [videoModalState.visible, videoModalState.mode, collapsedHeight]);
+  }, [
+    videoModalState.visible,
+    videoModalState.mode,
+    collapsedHeight,
+    heightAboveMinimised,
+  ]);
 
   return useMemo(
     () => ({

package/src/Player/PlayerModal/styles.ts

@@ -75,6 +75,10 @@ export const useStyles = ({ height }: { height: number }) => {
           flex: 1,
           alignItems: "center",
         },
+        modalContentPiP: {
+          flex: 1,
+          alignItems: "flex-start",
+        },
         expandedContentContainer: {
           justifyContent: "flex-start",
           backgroundColor: BG_COLOR_DEFAULT_TRANSPARENT,

package/src/Player/PlayerModal/utils/index.ts

@@ -1,25 +1,25 @@
-import { StatusBar, Dimensions } from "react-native";
+import { Dimensions } from "react-native";
 
 import {
   isAndroidPlatform,
   isAndroidVersionAtLeast,
 } from "@applicaster/zapp-react-native-utils/reactUtils";
-import { isAndroidTablet } from "@applicaster/zapp-react-native-utils/reactHooks/layout/isTablet";
 
 const MIN_SUPPORTED_ANDROID_API = 34;
 
-const isOldAndroidDevice =
-  isAndroidPlatform() &&
-  !isAndroidVersionAtLeast(MIN_SUPPORTED_ANDROID_API) &&
-  !isAndroidTablet();
+export const isOldAndroidDevice =
+  isAndroidPlatform() && !isAndroidVersionAtLeast(MIN_SUPPORTED_ANDROID_API);
 
 export const getWindowHeight = (): number => {
   const windowDimensions = Dimensions.get("window");
 
-  return (
-    windowDimensions.height +
-    (isOldAndroidDevice ? (StatusBar.currentHeight ?? 0) : 0)
-  );
+  return windowDimensions.height;
+};
+
+export const getScreenHeight = (): number => {
+  const screenDimensions = Dimensions.get("screen");
+
+  return screenDimensions.height;
 };
 
 export const getWindowWidth = (): number => {

package/src/Player/index.tsx

@@ -83,7 +83,6 @@ type VideoPlayerProps = QuickBrickPlayer.PlayerProps & {
   updatePlayerState?: (state: string) => void;
   setNextVideoPreloadThresholdPercentage?: (percentage: number) => void;
   hideTransportControls?: boolean;
-  startComponentsAnimation?: boolean;
   playableItem?: any;
   playerPluginIdentifier?: string;
   controller?: {
@@ -1047,10 +1046,7 @@ export default class VideoPlayer extends React.Component<
       : supportsNativeControls && !this.getPlayNextData();
 
     const shouldUseNativeControls =
-      controls &&
-      !this.props.startComponentsAnimation &&
-      !docked &&
-      !castAction?.state?.connected;
+      controls && !docked && !castAction?.state?.connected;
 
     platformSpecificProps = {
       ...platformSpecificProps,
@@ -1134,7 +1130,8 @@ export default class VideoPlayer extends React.Component<
     const needsToRender =
       !hideTransportControls &&
       !needToShowPlayNextOverlay &&
-      this.props.mode !== "PIP";
+      this.props.mode !== "PIP" &&
+      !docked;
 
     const supportsNativeControls =
       !!this.props.controller?.supportsNativeControls?.();
@@ -1145,10 +1142,7 @@ export default class VideoPlayer extends React.Component<
       : supportsNativeControls && !this.getPlayNextData();
 
     const shouldUseNativeControls =
-      controls &&
-      !this.props.startComponentsAnimation &&
-      !docked &&
-      !castAction?.state?.connected;
+      controls && !docked && !castAction?.state?.connected;
 
     if (shouldUseNativeControls) {
       return null;

package/src/Player/AudioLayer/Layout/PlayerImage/AnimatedImage.tsx

@@ -1,82 +0,0 @@
-import React, { PropsWithChildren } from "react";
-import { Image, Animated, StyleSheet, ImageStyle } from "react-native";
-
-import {
-  useModalAnimationContext,
-  PlayerAnimationStateEnum,
-  DURATION_TO_MINIMIZE,
-  DURATION_TO_MAXIMIZE,
-} from "@applicaster/zapp-react-native-ui-components/Components/VideoModal/ModalAnimation";
-import { PlayerAnimationStateT } from "@applicaster/zapp-react-native-ui-components/Components/VideoModal/ModalAnimation/ModalAnimationContext";
-import { useBackgroundImage } from "@applicaster/zapp-react-native-utils/audioPlayerUtils";
-
-import { useChangePlayerState } from "./hooks";
-
-const styles = StyleSheet.create({
-  container: {
-    // we have to specify flex:0 and dimensions to make animation work
-    flex: 0,
-    aspectRatio: 1,
-  },
-});
-
-type Props = PropsWithChildren<{
-  entry: ZappEntry;
-  style?: ImageStyle | ImageStyle[];
-  imageWidth: number;
-  docked: boolean;
-}>;
-
-export const AnimatedImage = ({ entry, style, imageWidth, docked }: Props) => {
-  const heightAnim = React.useRef(new Animated.Value(imageWidth)).current;
-
-  const backgroundImageSource = useBackgroundImage(entry);
-
-  const { minimisedHeight } = useModalAnimationContext();
-
-  const changePlayerState$ = useChangePlayerState({ docked });
-
-  React.useEffect(() => {
-    const subscription = changePlayerState$.subscribe({
-      next: (nextPlayerState: PlayerAnimationStateT) => {
-        if (nextPlayerState === PlayerAnimationStateEnum.minimize) {
-          Animated.timing(heightAnim, {
-            toValue: minimisedHeight,
-            duration: DURATION_TO_MINIMIZE,
-            useNativeDriver: false, // width/height can't use native driver
-          }).start();
-        }
-
-        if (nextPlayerState === PlayerAnimationStateEnum.maximize) {
-          Animated.timing(heightAnim, {
-            toValue: imageWidth,
-            duration: DURATION_TO_MAXIMIZE,
-            useNativeDriver: false, // width/height can't use native driver
-          }).start();
-        }
-
-        if (nextPlayerState === PlayerAnimationStateEnum.appear_as_docked) {
-          // minimize image immediatly
-          heightAnim.setValue(minimisedHeight);
-        }
-      },
-    });
-
-    return () => {
-      subscription.unsubscribe();
-    };
-  }, [changePlayerState$, minimisedHeight, imageWidth]);
-
-  return (
-    <Animated.View
-      style={[
-        styles.container,
-        {
-          width: heightAnim,
-        },
-      ]}
-    >
-      <Image resizeMode="cover" style={style} source={backgroundImageSource} />
-    </Animated.View>
-  );
-};

package/src/Player/AudioLayer/Layout/PlayerImage/hooks/index.ts

@@ -1 +0,0 @@
-export { useChangePlayerState } from "./useChangePlayerState";

package/src/Player/AudioLayer/Layout/PlayerImage/hooks/useChangePlayerState.ts

@@ -1,99 +0,0 @@
-import * as React from "react";
-import { Subject, Observable } from "rxjs";
-
-import { distinctUntilChanged } from "rxjs/operators";
-import { isNil } from "@applicaster/zapp-react-native-utils/utils";
-import { useRefWithInitialValue } from "@applicaster/zapp-react-native-utils/reactHooks/state/useRefWithInitialValue";
-import { usePrevious } from "@applicaster/zapp-react-native-utils/reactHooks/utils";
-import {
-  useModalAnimationContext,
-  PlayerAnimationStateEnum,
-} from "@applicaster/zapp-react-native-ui-components/Components/VideoModal/ModalAnimation";
-import { PlayerAnimationStateT } from "@applicaster/zapp-react-native-ui-components/Components/VideoModal/ModalAnimation/ModalAnimationContext";
-
-const builder = () => {
-  const changePlayerState$ = new Subject<PlayerAnimationStateT>();
-
-  const emitMaximized = (): void => {
-    changePlayerState$.next(PlayerAnimationStateEnum.maximize);
-  };
-
-  const emitMinimized = (): void => {
-    changePlayerState$.next(PlayerAnimationStateEnum.minimize);
-  };
-
-  const emitAppearInDocked = (): void => {
-    // if audio_player was presented in docked mode
-    changePlayerState$.next(PlayerAnimationStateEnum.appear_as_docked);
-  };
-
-  return {
-    emitMaximized,
-    emitMinimized,
-    emitAppearInDocked,
-    changePlayerState$: changePlayerState$.pipe(distinctUntilChanged()),
-  };
-};
-
-export const useChangePlayerState = ({
-  docked,
-}): Observable<PlayerAnimationStateT> => {
-  const changePlayerStateRef =
-    useRefWithInitialValue<ReturnType<typeof builder>>(builder);
-
-  const { playerAnimationState } = useModalAnimationContext();
-
-  const previousPlayerAnimationState = usePrevious(playerAnimationState);
-
-  React.useEffect(() => {
-    if (
-      !docked &&
-      isNil(previousPlayerAnimationState) &&
-      playerAnimationState === PlayerAnimationStateEnum.minimize
-    ) {
-      changePlayerStateRef.current.emitMinimized();
-
-      return;
-    }
-
-    if (
-      !docked &&
-      isNil(previousPlayerAnimationState) &&
-      playerAnimationState === PlayerAnimationStateEnum.maximize
-    ) {
-      changePlayerStateRef.current.emitMaximized();
-
-      return;
-    }
-
-    if (
-      !docked &&
-      previousPlayerAnimationState === PlayerAnimationStateEnum.drag_scroll &&
-      playerAnimationState === PlayerAnimationStateEnum.maximize
-    ) {
-      changePlayerStateRef.current.emitMaximized();
-
-      return;
-    }
-
-    if (
-      !docked &&
-      previousPlayerAnimationState === PlayerAnimationStateEnum.drag_scroll &&
-      playerAnimationState === PlayerAnimationStateEnum.minimize
-    ) {
-      changePlayerStateRef.current.emitMinimized();
-
-      return;
-    }
-
-    if (
-      docked &&
-      isNil(previousPlayerAnimationState) &&
-      isNil(playerAnimationState)
-    ) {
-      changePlayerStateRef.current.emitAppearInDocked();
-    }
-  }, [previousPlayerAnimationState, playerAnimationState, docked]);
-
-  return changePlayerStateRef.current.changePlayerState$;
-};