@applicaster/quick-brick-player 13.0.0-rc.94 → 13.0.0-rc.95

package/src/Player/AudioLayer/Layout/{DockedLayout.tsx → DockedControls/index.tsx}

@@ -16,43 +16,24 @@ import {
 } from "@applicaster/quick-brick-mobile-transport-controls";
 
 import { PlayNextData } from "@applicaster/zapp-react-native-ui-components/Components/PlayerContainer/PlayerContainer";
+
 import {
   AnimationComponent,
   ComponentAnimationType,
-  defaultAspectRatioWidth,
   PlayerAnimationStateEnum,
   useModalAnimationContext,
 } from "@applicaster/zapp-react-native-ui-components/Components/VideoModal/ModalAnimation";
+import { toNumberWithDefault } from "@applicaster/zapp-react-native-utils/numberUtils";
 
-type Dimensions = {
-  width: number;
-  height: number;
-};
-
-type LayoutProps = {
+type Props = {
   entry: ZappEntry;
-  layoutState: {
-    inline: boolean;
-    docked: boolean;
-    isModal: boolean;
-  };
-  playerState: {
-    currentTime: number;
-    duration: number;
-    seekableDuration: number;
-    isLive: boolean;
-    isPaused: boolean;
-    isBuffering: boolean;
-  };
+  layoutState: QuickBrickPlayer.LayoutState;
+  playerState: QuickBrickPlayer.PlayerState;
   value: GetValue;
-  configuration: { [key: string]: any };
-  onPlaybackButtonPress: () => void;
-  onRewindButtonPress: () => void;
-  onForwardButtonPress: () => void;
-  onPlayerSeek: (targetTime: number) => void;
+  configuration: QuickBrickPlayer.AudioPlayerProps["configuration"];
+  dimensions: QuickBrickPlayer.AudioPlayerProps["dimensions"];
   onCloseVideoModal: () => void;
-  maximiseVideoModal: () => void;
-  dimensions: Dimensions;
+  onPlayerSeek: (targetTime: number) => void;
   playNextData: PlayNextData;
   title: string | number;
   summary: string | number;
@@ -114,17 +95,21 @@ const playerDimensionsStyle = (
   minimisedHeight: number,
   addPadding: boolean
 ): ViewStyle => ({
-  paddingLeft: addPadding ? defaultAspectRatioWidth(minimisedHeight) || 100 : 0,
+  paddingLeft: addPadding ? toNumberWithDefault(100, minimisedHeight) : 0,
 });
 
-const animatedContainerStyle = (docked: boolean): ViewStyle => ({
+const animatedContainerStyle = (
+  docked: boolean,
+  progressBarHeight: number
+): ViewStyle => ({
+  top: progressBarHeight,
   position: "absolute",
   width: "100%",
   zIndex: docked ? 1 : -1,
 });
 
 const backgroundImageStyle = (
-  dimensions: Dimensions,
+  dimensions: QuickBrickPlayer.AudioPlayerProps["dimensions"],
   minimisedHeight: number,
   isActiveGesture: boolean
 ): ViewStyle => ({
@@ -190,16 +175,16 @@ const controlButtons = (
   ];
 };
 
-export default function DockedLayout(props: LayoutProps) {
+export const DockedControls = (props: Props) => {
   const {
+    entry,
     layoutState,
+    playerState,
     value,
+    configuration,
     dimensions,
-    entry,
     onCloseVideoModal,
     onPlayerSeek,
-    playerState,
-    configuration,
     playNextData,
     title,
     summary,
@@ -207,7 +192,6 @@ export default function DockedLayout(props: LayoutProps) {
 
   const isTablet = useIsTablet();
 
-  const visible = true;
   const liveButton = Boolean(value("live_badge_enabled"));
 
   const {
@@ -215,6 +199,7 @@ export default function DockedLayout(props: LayoutProps) {
     setPlayerAnimationState,
     startComponentsAnimation,
     minimisedHeight,
+    progressBarHeight,
   } = useModalAnimationContext();
 
   const maximazeVideoModal = React.useCallback(
@@ -229,7 +214,11 @@ export default function DockedLayout(props: LayoutProps) {
       animationType={ComponentAnimationType.componentAppears}
       style={[
         styles.container,
-        animatedContainerStyle(isActiveGesture || layoutState.docked),
+        animatedContainerStyle(
+          isActiveGesture || layoutState.docked,
+          progressBarHeight
+        ),
+        { height: minimisedHeight },
       ]}
     >
       {!playerState.isLive &&
@@ -238,7 +227,7 @@ export default function DockedLayout(props: LayoutProps) {
           name={"audio-docked-layout"}
           content={entry}
           value={value}
-          visible={visible}
+          visible
           layoutState={layoutState}
           onPlayerSeek={onPlayerSeek}
           playerState={playerState}
@@ -289,7 +278,7 @@ export default function DockedLayout(props: LayoutProps) {
         >
           <Controls
             value={value}
-            visible={visible}
+            visible
             buttons={R.partial(controlButtons, [
               playerState.isLive && liveButton,
             ])}
@@ -308,4 +297,4 @@ export default function DockedLayout(props: LayoutProps) {
       </View>
     </AnimationComponent>
   );
-}
+};

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

@@ -0,0 +1,212 @@
+import * as React from "react";
+import { View, ViewStyle, StyleSheet } from "react-native";
+import {
+  useSafeAreaInsets,
+  useSafeAreaFrame,
+} from "react-native-safe-area-context";
+import { useModalAnimationContext } from "@applicaster/zapp-react-native-ui-components/Components/VideoModal/ModalAnimation";
+
+import { MOBILE } from "./const";
+import { TransportInfo } from "./TransportInfo";
+import { PlayerImage } from "./PlayerImage";
+import { Controls } from "./Controls";
+
+import { useImageSize, useTransportInfoHeight } from "./hooks";
+import { DockedControls } from "./DockedControls";
+import { withDebug } from "./debug";
+
+import { Props } from "./types";
+
+const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+  },
+
+  flex: {
+    flex: 1,
+  },
+
+  audioPlayerContainer: {
+    flex: 1,
+    justifyContent: "flex-start",
+
+    minHeight: MOBILE.MIN_HEIGHT,
+
+    marginLeft: MOBILE.MARGIN_HORIZONTAL,
+    marginRight: MOBILE.MARGIN_HORIZONTAL,
+
+    marginTop: MOBILE.MARGIN_TOP,
+
+    ...withDebug({
+      borderWidth: 2,
+      borderColor: "blue",
+    }),
+  },
+});
+
+const mobileStyles = ({
+  screenHeight,
+  topInset,
+  bottomInset,
+  imageSize,
+}): ViewStyle => ({
+  height: screenHeight - topInset - bottomInset,
+
+  opacity: imageSize ? 1 : 0, // hide content until imageSize is calculated
+
+  ...withDebug({
+    borderWidth: 2,
+    borderColor: "magenta",
+  }),
+});
+
+export function MobileLayout({
+  entry,
+  layoutState,
+  playerState,
+  value,
+  onPlaybackButtonPress,
+  onRewindButtonPress,
+  onForwardButtonPress,
+  onPlayerSeek,
+  onSkipStart,
+  onSkipLive,
+  onSpeedButtonPress,
+  onSleepButtonPress,
+  onCloseVideoModal,
+  playbackSpeedName,
+  playbackSleepName,
+  configuration,
+  dimensions,
+  playNextData,
+  cancelSleepTimer,
+  sleepTimerDate,
+  title,
+  summary,
+}: Props) {
+  const { docked } = layoutState;
+
+  const { bottom: bottomInset, top: topInset } = useSafeAreaInsets();
+  const { height: screenHeight } = useSafeAreaFrame();
+  const { progressBarHeight } = useModalAnimationContext();
+
+  const { imageSize, onLayout } = useImageSize({ isPortraitMode: true });
+
+  const { height: transportInfoHeight, onLayout: onTransportInfoLayout } =
+    useTransportInfoHeight();
+
+  return (
+    <View
+      style={[
+        styles.container,
+        mobileStyles({
+          screenHeight,
+          topInset,
+          bottomInset,
+          imageSize,
+        }),
+      ]}
+    >
+      {/* TransportInfo */}
+      <TransportInfo
+        entry={entry}
+        layoutState={layoutState}
+        value={value}
+        configuration={configuration}
+        onLayout={onTransportInfoLayout}
+      />
+
+      {/* TransportInfo */}
+
+      <View
+        style={[
+          styles.audioPlayerContainer,
+          {
+            width: imageSize,
+          },
+        ]}
+      >
+        {/* PlayerImage */}
+        <View
+          style={[
+            styles.flex,
+            {
+              maxHeight: imageSize,
+
+              ...withDebug({
+                borderWidth: 2,
+                borderColor: "yellow",
+              }),
+            },
+          ]}
+          onLayout={onLayout}
+        >
+          <PlayerImage
+            entry={entry}
+            layoutState={layoutState}
+            playerState={playerState}
+            value={value}
+            configuration={configuration}
+            onPlayerSeek={onPlayerSeek}
+            onCloseVideoModal={onCloseVideoModal}
+            dimensions={dimensions}
+            playNextData={playNextData}
+            title={title}
+            summary={summary}
+            docked={docked}
+            imageWidth={imageSize}
+            verticalOffset={
+              transportInfoHeight + MOBILE.MARGIN_TOP - progressBarHeight
+            }
+          />
+        </View>
+        {/* PlayerImage */}
+
+        <View
+          style={[
+            styles.flex,
+            {
+              marginBottom: MOBILE.MARGIN_BOTTOM,
+            },
+          ]}
+        >
+          <Controls
+            entry={entry}
+            layoutState={layoutState}
+            playerState={playerState}
+            value={value}
+            title={title}
+            summary={summary}
+            sleepTimerDate={sleepTimerDate}
+            cancelSleepTimer={cancelSleepTimer}
+            playbackSpeedName={playbackSpeedName}
+            playbackSleepName={playbackSleepName}
+            onPlaybackButtonPress={onPlaybackButtonPress}
+            onRewindButtonPress={onRewindButtonPress}
+            onForwardButtonPress={onForwardButtonPress}
+            onPlayerSeek={onPlayerSeek}
+            onSkipStart={onSkipStart}
+            onSkipLive={onSkipLive}
+            onSpeedButtonPress={onSpeedButtonPress}
+            onSleepButtonPress={onSleepButtonPress}
+            docked={docked}
+          />
+        </View>
+      </View>
+
+      <DockedControls
+        entry={entry}
+        layoutState={layoutState}
+        playerState={playerState}
+        value={value}
+        configuration={configuration}
+        dimensions={dimensions}
+        onCloseVideoModal={onCloseVideoModal}
+        onPlayerSeek={onPlayerSeek}
+        playNextData={playNextData}
+        title={title}
+        summary={summary}
+      />
+    </View>
+  );
+}

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

@@ -0,0 +1,83 @@
+import React, { PropsWithChildren } from "react";
+import { ImageBackground, Animated, StyleSheet } from "react-native";
+
+import { imageSrcFromMediaItem } from "@applicaster/zapp-react-native-utils/configurationUtils";
+import {
+  useModalAnimationContext,
+  PlayerAnimationStateEnum,
+  DURATION_TO_MINIMIZE,
+  DURATION_TO_MAXIMIZE,
+} from "@applicaster/zapp-react-native-ui-components/Components/VideoModal/ModalAnimation";
+
+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?: { [K: string]: any };
+  imageStyle?: { [K: string]: any };
+  imageWidth: number;
+}>;
+
+export const AnimatedImage = ({
+  entry,
+  style,
+  imageStyle,
+  imageWidth,
+}: Props) => {
+  const heightAnim = React.useRef(new Animated.Value(imageWidth)).current;
+
+  const source = React.useMemo(
+    () => ({ uri: imageSrcFromMediaItem(entry, undefined) }),
+    [entry]
+  );
+
+  const { playerAnimationState, minimisedHeight } = useModalAnimationContext();
+
+  React.useEffect(() => {
+    if (playerAnimationState === PlayerAnimationStateEnum.minimize) {
+      Animated.timing(heightAnim, {
+        toValue: minimisedHeight,
+        duration: DURATION_TO_MINIMIZE,
+        useNativeDriver: false, // width/height can't use native driver
+      }).start();
+
+      return;
+    }
+
+    if (playerAnimationState === PlayerAnimationStateEnum.maximize) {
+      Animated.timing(heightAnim, {
+        toValue: imageWidth,
+        duration: DURATION_TO_MAXIMIZE,
+        useNativeDriver: false, // width/height can't use native driver
+      }).start();
+    }
+  }, [playerAnimationState, imageWidth]);
+
+  if (!source) return null;
+
+  return (
+    <Animated.View
+      style={[
+        styles.container,
+        {
+          width: heightAnim,
+        },
+      ]}
+    >
+      <ImageBackground
+        resizeMode="cover"
+        style={style}
+        imageStyle={imageStyle}
+        source={source}
+      >
+        {null}
+      </ImageBackground>
+    </Animated.View>
+  );
+};

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

@@ -0,0 +1,32 @@
+import * as React from "react";
+import { ImageBackground } from "react-native";
+
+import { imageSrcFromMediaItem } from "@applicaster/zapp-react-native-utils/configurationUtils";
+
+type Props = {
+  entry: ZappEntry;
+  style?: { [K: string]: any };
+  imageStyle?: { [K: string]: any };
+};
+
+const style = { flex: 1, aspectRatio: 1 };
+
+export const FlexImage = ({ entry, imageStyle }: Props) => {
+  const source = React.useMemo(
+    () => ({ uri: imageSrcFromMediaItem(entry, undefined) }),
+    [entry]
+  );
+
+  if (!source) return null;
+
+  return (
+    <ImageBackground
+      resizeMode="cover"
+      style={style}
+      source={source}
+      imageStyle={imageStyle}
+    >
+      {null}
+    </ImageBackground>
+  );
+};

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

@@ -0,0 +1,95 @@
+import * as React from "react";
+
+import {
+  AnimationComponent,
+  ComponentAnimationType,
+  useModalAnimationContext,
+} from "@applicaster/zapp-react-native-ui-components/Components/VideoModal/ModalAnimation";
+
+import { AnimatedImage } from "./AnimatedImage";
+import { FlexImage } from "./FlexImage";
+
+import { styles } from "./styles";
+import { calculateBorderRadius } from "../../utils";
+import { PlayNextData } from "../types";
+
+type Props = {
+  entry: ZappEntry;
+  layoutState: QuickBrickPlayer.LayoutState;
+  playerState: QuickBrickPlayer.PlayerState;
+  value: GetValue;
+  configuration: QuickBrickPlayer.AudioPlayerProps["configuration"];
+  dimensions: QuickBrickPlayer.AudioPlayerProps["dimensions"];
+  onCloseVideoModal: Callback;
+  onPlayerSeek: (targetTime: number) => void;
+  playNextData: PlayNextData;
+  title: string | number;
+  summary: string | number;
+  docked: boolean;
+  imageWidth: Option<number>;
+  verticalOffset: number;
+};
+
+export const PlayerImage = (props: Props) => {
+  const {
+    entry,
+    dimensions,
+    docked,
+    imageWidth,
+    verticalOffset,
+    configuration,
+  } = props;
+
+  const {
+    isActiveGesture,
+    startComponentsAnimation,
+    playerAnimationState,
+    minimisedHeight,
+  } = useModalAnimationContext();
+
+  const borderRadius = calculateBorderRadius(
+    docked,
+    startComponentsAnimation,
+    isActiveGesture,
+    playerAnimationState,
+    configuration
+  );
+
+  return (
+    <AnimationComponent
+      animationType={ComponentAnimationType.moveUpComponent}
+      additionalData={{
+        marginTop: verticalOffset,
+      }}
+      style={styles.flex}
+    >
+      <AnimationComponent
+        animationType={ComponentAnimationType.moveComponentHorizontal}
+        additionalData={{
+          // we move image horiontally to this value due artwork is centered
+          moveValue: (dimensions.width - minimisedHeight) / 2,
+        }}
+        style={styles.alignItemsCenter}
+      >
+        {!imageWidth ? (
+          // we render image with flex until we get size of this image
+          <FlexImage
+            entry={entry}
+            style={styles.backgroundImageContainer}
+            imageStyle={{ borderRadius }}
+          />
+        ) : null}
+
+        {imageWidth ? (
+          // we have imageSize here and now we could animate resizing of this image
+          <AnimatedImage
+            entry={entry}
+            style={styles.backgroundImageContainer}
+            imageStyle={{ borderRadius }}
+            imageWidth={imageWidth}
+          />
+        ) : null}
+      </AnimationComponent>
+    </AnimationComponent>
+  );
+};

package/src/Player/AudioLayer/Layout/PlayerImage/styles.ts

@@ -0,0 +1,17 @@
+import { StyleSheet } from "react-native";
+
+export const styles = StyleSheet.create({
+  backgroundImageContainer: {
+    flex: 1,
+    aspectRatio: 1,
+  },
+
+  alignItemsCenter: {
+    flex: 1,
+    alignItems: "center",
+  },
+
+  flex: {
+    flex: 1,
+  },
+});