@applicaster/quick-brick-player 13.0.0-alpha.5375459737 → 13.0.0-alpha.5406200595

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applicaster/quick-brick-player",
-  "version": "13.0.0-alpha.5375459737",
+  "version": "13.0.0-alpha.5406200595",
   "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": "13.0.0-rc.95",
+    "@applicaster/quick-brick-mobile-transport-controls": "13.0.0-rc.112",
     "@applicaster/quick-brick-tv-transport-controls": "13.0.0-rc.56",
-    "@applicaster/zapp-react-native-tvos-app": "13.0.0-alpha.5375459737",
-    "@applicaster/zapp-react-native-ui-components": "13.0.0-alpha.5375459737",
-    "@applicaster/zapp-react-native-utils": "13.0.0-alpha.5375459737",
+    "@applicaster/zapp-react-native-tvos-app": "13.0.0-alpha.5406200595",
+    "@applicaster/zapp-react-native-ui-components": "13.0.0-alpha.5406200595",
+    "@applicaster/zapp-react-native-utils": "13.0.0-alpha.5406200595",
     "query-string": "7.1.3",
     "react-native-web-linear-gradient": "1.1.2",
     "shaka-player": "4.3.5",
@@ -52,7 +52,6 @@
     "@applicaster/applicaster-types": "*",
     "@applicaster/blur": "*",
     "@applicaster/quick-brick-xray": "*",
-    "@applicaster/react-native-color-thief": "*",
     "@applicaster/zapp-pipes-v2-client": "*",
     "@applicaster/zapp-react-dom-ui-components": "*",
     "@applicaster/zapp-react-native-redux": "*",

package/src/Player/AudioLayer/AudioDescription.tsx

@@ -1,5 +1,5 @@
 import React from "react";
-import { Text, TextStyle } from "react-native";
+import { StyleSheet, Text, TextStyle, View } from "react-native";
 import { platformSelect } from "@applicaster/zapp-react-native-utils/reactUtils";
 
 type AudioDescriptionProps = {
@@ -10,84 +10,125 @@ type AudioDescriptionProps = {
     docked: boolean;
     isModal: boolean;
   };
+  maxWidth?: number;
   value: GetValue;
 };
 
-const titleStyles = (value: GetValue, prefix: string): TextStyle => ({
-  textAlign: "left",
-  color: value(`${prefix}title_color`),
-  alignSelf: "center",
-  paddingBottom: 5,
-  lineHeight:
-    Number(
-      platformSelect({
-        ios: value(`${prefix}title_lineheight_ios`),
-        android: value(`${prefix}title_lineheight_android`),
-      })
-    ) || 18,
-  letterSpacing:
-    Number(
-      platformSelect({
-        ios: value(`${prefix}title_letterspacing_ios`),
-        android: value(`${prefix}title_letterspacing_android`),
-      })
-    ) || 0,
-  fontSize:
-    Number(
-      platformSelect({
-        ios: value(`${prefix}title_fontsize_ios`),
-        android: value(`${prefix}title_fontsize_android`),
-      })
-    ) || 16,
-  fontFamily: platformSelect({
-    ios: value(`${prefix}title_font_ios`),
-    android: value(`${prefix}title_font_android`),
-  }),
-});
+const TITLE_PADDING_BOTTOM = 5;
+const TITLE_LINES = 2;
+const SUBTITLE_LINES = 1;
 
-const summaryStyles = (value: GetValue, prefix: string): TextStyle => ({
-  textAlign: "left",
-  color: value(`${prefix}subtitle_color`),
-  alignSelf: "center",
-  lineHeight:
-    Number(
-      platformSelect({
-        ios: value(`${prefix}subtitle_lineheight_ios`),
-        android: value(`${prefix}subtitle_lineheight_android`),
-      })
-    ) || 18,
-  letterSpacing:
-    Number(
-      platformSelect({
-        ios: value(`${prefix}subtitle_letterspacing_ios`),
-        android: value(`${prefix}subtitle_letterspacing_android`),
-      })
-    ) || 0,
-  fontSize:
-    Number(
-      platformSelect({
-        ios: value(`${prefix}subtitle_fontsize_ios`),
-        android: value(`${prefix}subtitle_fontsize_android`),
-      })
-    ) || 13,
-  fontFamily: platformSelect({
-    ios: value(`${prefix}subtitle_font_ios`),
-    android: value(`${prefix}subtitle_font_android`),
-  }),
+const styles = StyleSheet.create({
+  wrapper: {
+    width: "100%",
+    alignSelf: "center",
+    alignItems: "center",
+    justifyContent: "center",
+  },
+  titleText: {
+    textAlign: "center",
+    alignSelf: "center",
+    paddingBottom: TITLE_PADDING_BOTTOM,
+  },
+  summaryText: {
+    textAlign: "left",
+    alignSelf: "center",
+  },
 });
 
+const getTitleStyles = (value: GetValue, prefix: string) =>
+  ({
+    color: value(`${prefix}title_color`),
+    lineHeight:
+      Number(
+        platformSelect({
+          ios: value(`${prefix}title_lineheight_ios`),
+          android: value(`${prefix}title_lineheight_android`),
+        })
+      ) || 18,
+    letterSpacing:
+      Number(
+        platformSelect({
+          ios: value(`${prefix}title_letterspacing_ios`),
+          android: value(`${prefix}title_letterspacing_android`),
+        })
+      ) || 0,
+    fontSize:
+      Number(
+        platformSelect({
+          ios: value(`${prefix}title_fontsize_ios`),
+          android: value(`${prefix}title_fontsize_android`),
+        })
+      ) || 16,
+    fontFamily: platformSelect({
+      ios: value(`${prefix}title_font_ios`),
+      android: value(`${prefix}title_font_android`),
+    }),
+  }) as const;
+
+const getSummaryStyles = (value: GetValue, prefix: string): TextStyle =>
+  ({
+    color: value(`${prefix}subtitle_color`),
+    lineHeight:
+      Number(
+        platformSelect({
+          ios: value(`${prefix}subtitle_lineheight_ios`),
+          android: value(`${prefix}subtitle_lineheight_android`),
+        })
+      ) || 18,
+    letterSpacing:
+      Number(
+        platformSelect({
+          ios: value(`${prefix}subtitle_letterspacing_ios`),
+          android: value(`${prefix}subtitle_letterspacing_android`),
+        })
+      ) || 0,
+    fontSize:
+      Number(
+        platformSelect({
+          ios: value(`${prefix}subtitle_fontsize_ios`),
+          android: value(`${prefix}subtitle_fontsize_android`),
+        })
+      ) || 13,
+    fontFamily: platformSelect({
+      ios: value(`${prefix}subtitle_font_ios`),
+      android: value(`${prefix}subtitle_font_android`),
+    }),
+  }) as const;
+
+const getHeight = (titleLineHeight: number, subtitleLineHeight) =>
+  titleLineHeight * TITLE_LINES + subtitleLineHeight + TITLE_PADDING_BOTTOM;
+
 export const AudioDescription = (props: AudioDescriptionProps) => {
-  const { title, summary, layoutState, value } = props;
+  const { title, summary, layoutState, value, maxWidth } = props;
   const prefix = layoutState.docked ? "docked_player_" : "";
 
+  const summaryStyles = getSummaryStyles(value, prefix);
+  const titleStyles = getTitleStyles(value, prefix);
+
+  const height = getHeight(titleStyles.lineHeight, summaryStyles.lineHeight);
+
   return (
-    <>
-      <Text style={titleStyles(value, prefix)} numberOfLines={1}>
+    <View
+      style={[
+        styles.wrapper,
+        {
+          maxWidth: Math.max(maxWidth, 320),
+          height,
+        },
+      ]}
+    >
+      <Text style={[styles.titleText, titleStyles]} numberOfLines={TITLE_LINES}>
         {title}
       </Text>
-      <Text style={summaryStyles(value, prefix)} numberOfLines={1}>
-        {summary}
-      </Text>
-    </>
+      {summary ? (
+        <Text
+          style={[styles.summaryText, summaryStyles]}
+          numberOfLines={SUBTITLE_LINES}
+        >
+          {summary}
+        </Text>
+      ) : null}
+    </View>
   );
 };

package/src/Player/AudioLayer/AudioPlayerWrapper.tsx

@@ -1,12 +1,13 @@
 import * as React from "react";
+import { useEffect, useState } from "react";
 import {
+  Dimensions as ScreenDimensions,
   StyleSheet,
-  ViewStyle,
   View,
-  Dimensions as ScreenDimensions,
+  ViewStyle,
 } from "react-native";
 
-import { SafeAreaView, Edge } from "react-native-safe-area-context";
+import { Edge, SafeAreaView } from "react-native-safe-area-context";
 import { usePlayerState } from "@applicaster/zapp-react-native-utils/appUtils/playerManager/usePlayerState";
 import { usePlayer } from "@applicaster/zapp-react-native-utils/appUtils/playerManager/usePlayer";
 import * as R from "ramda";
@@ -20,11 +21,8 @@ import { createLogger } from "@applicaster/zapp-react-native-utils/logger";
 import { PlayNextData } from "@applicaster/zapp-react-native-ui-components/Components/PlayerContainer/PlayerContainer";
 import { PlayerDetails } from "@applicaster/zapp-react-native-ui-components/Components/VideoModal/PlayerDetails";
 import { isTV } from "@applicaster/zapp-react-native-utils/reactUtils";
-import { useEffect, useState } from "react";
-import { MagicBG } from "./MagicBG";
 import { formatSpeed } from "./utils";
 import {
-  addQueryParam,
   getBottomSheetModalDefaultItemIcon,
   getBottomSheetModalIconProps,
   getBottomSheetModalItemProps,
@@ -33,21 +31,23 @@ import {
 } from "../Utils";
 import { useTitleSummaryOverlay } from "@applicaster/zapp-react-native-utils/appUtils/playerManager/usePlayerTitleSummaryOverlay";
 import {
+  AnimatedScrollModal,
   AnimationComponent,
   ComponentAnimationType,
-  AnimatedScrollModal,
 } from "@applicaster/zapp-react-native-ui-components/Components/VideoModal/ModalAnimation";
 import { PADDING_HORIZONTAL } from "./Layout/const";
 import { toNumberWithDefault } from "@applicaster/zapp-react-native-utils/numberUtils";
 import {
+  SLEEP_TIMER_OFF,
   SleepTimerController,
   SleepTimerState,
-  SLEEP_TIMER_OFF,
 } from "./SleepTimerManager";
-import { SpeedController, PlaybackSpeed, DEFAULT_SPEED } from "./SpeedManager";
-import { imageSrcFromMediaItem } from "@applicaster/zapp-react-native-utils/configurationUtils";
-import { useTheme } from "@applicaster/zapp-react-native-utils/theme";
-import { openBottomSheetModal } from "@applicaster/zapp-react-native-utils/modalState";
+import { DEFAULT_SPEED, PlaybackSpeed, SpeedController } from "./SpeedManager";
+import {
+  openBottomSheetModal,
+  dismissModal as dismissBottomSheetModal,
+  useModalStoreState,
+} from "@applicaster/zapp-react-native-utils/modalState";
 import { getSleepTimerOptions } from "../Const/sleepTimerOptions";
 import { speedOptions } from "../Const/speedOptions";
 
@@ -65,8 +65,6 @@ type Dimensions = {
 
 type Configuration = {
   [key: string]: any;
-  magic_background?: boolean;
-  audio_player_background_image_query?: string;
   audio_player_background_image_default_color?: string;
   tablet_landscape_sidebar_width?: string;
   tablet_landscape_player_container_background_color?: string;
@@ -75,7 +73,6 @@ type Configuration = {
 type Props = {
   children: React.ReactNode;
   inline?: boolean;
-  docked?: boolean;
   configuration: Configuration;
   style: ViewStyle & Dimensions;
   entry: ZappEntry;
@@ -108,10 +105,10 @@ const edges: Edge[] = ["right", "left", "top"];
 export const AudioPlayerWrapper: React.FC<Props> = (props: Props) => {
   const player = usePlayer();
   const playerState = usePlayerState("audio-player-wrapper");
-  const theme = useTheme();
+
+  const modalBottomSheetState = useModalStoreState();
 
   const {
-    docked,
     configuration,
     style,
     entry,
@@ -148,6 +145,24 @@ export const AudioPlayerWrapper: React.FC<Props> = (props: Props) => {
     }
   }, [player]);
 
+  useEffect(() => {
+    if (!player) return;
+
+    const unsubscribe = player.addListener({
+      id: "audio-player-wrapper-bottom-sheet-modal",
+      listener: {
+        onVideoEnd: () => {
+          // Dismiss the bottom sheet modal when the video ends to avoid audio breaks and app freeze
+          if (modalBottomSheetState.visible) {
+            dismissBottomSheetModal();
+          }
+        },
+      },
+    });
+
+    return () => unsubscribe?.();
+  }, [player, modalBottomSheetState.visible]);
+
   const [playbackSpeed, setPlaybackSpeed] =
     useState<PlaybackSpeed>(DEFAULT_SPEED);
 
@@ -330,114 +345,61 @@ export const AudioPlayerWrapper: React.FC<Props> = (props: Props) => {
     player?.seekTo(0);
   }, [player]);
 
-  const MainContent = React.useMemo(() => {
-    return (
-      <SafeAreaView style={[style, Styles.playerContainer]} edges={edges}>
-        <AnimationComponent
-          animationType={ComponentAnimationType.moveUpComponent}
-          additionalData={{ saveArea: true }}
-          style={Styles.playerContainer}
-        >
-          <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={
-                  sleepTimerState.timer.value === 0
-                    ? "sleep_timer"
-                    : "sleep_timer_active"
-                }
-                sleepTimerDate={sleepTimerState.timerDate}
-                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
-                    isAudioPlayer
-                    configuration={configuration}
-                    style={Styles.playerDetails}
-                    entry={entry}
-                    isTabletLandscape={isTabletLandscape}
-                  />
-                </AnimationComponent>
-              </View>
-            </View>
-          </AnimatedScrollModal>
-        </AnimationComponent>
-      </SafeAreaView>
-    );
-  }, [
-    docked,
-    style,
-    entry,
-    playerState,
-    layoutState,
-    value,
-    onPlaybackButtonPress,
-    onRewindButtonPress,
-    onForwardButtonPress,
-    onPlayerSeek,
-    onCloseVideoModal,
-    maximiseVideoModal,
-    configuration,
-    dimensions,
-    children,
-    playNextData,
-    onSkipStart,
-    onSkipLive,
-    sleepTimerState.timer.value,
-    sleepTimerState.timerDate,
-  ]);
-
-  if (configuration.magic_background) {
-    const baseUrl = imageSrcFromMediaItem(entry, null);
-
-    const queryParamName =
-      configuration.audio_player_background_image_query || "width";
-
-    const defaultBackgroundColor =
-      configuration.audio_player_background_image_default_color ||
-      theme?.app_background_color;
-
-    const queryParamValue = 15;
-
-    const url =
-      baseUrl && addQueryParam(baseUrl, queryParamName, queryParamValue);
-
-    return (
-      <MagicBG
-        image={url}
-        fallbackUrl={baseUrl}
-        colors={entry?.extensions?.backgroundColors}
-        defaultColor={defaultBackgroundColor}
+  return (
+    <SafeAreaView style={[style, Styles.playerContainer]} edges={edges}>
+      <AnimationComponent
+        animationType={ComponentAnimationType.moveUpComponent}
+        additionalData={{ saveArea: true }}
+        style={Styles.playerContainer}
       >
-        {MainContent}
-      </MagicBG>
-    );
-  }
-
-  return MainContent;
+        <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={
+                sleepTimerState.timer.value === 0
+                  ? "sleep_timer"
+                  : "sleep_timer_active"
+              }
+              sleepTimerDate={sleepTimerState.timerDate}
+              cancelSleepTimer={cancelSleepTimer}
+              onSkipLive={onSkipLive}
+              onCloseVideoModal={onCloseVideoModal}
+              maximiseVideoModal={maximiseVideoModal}
+              configuration={configuration}
+              dimensions={dimensions}
+              playNextData={playNextData}
+              title={title}
+              summary={summary}
+            />
+            <View style={Styles.paddingHorizontal}>
+              {children}
+              <AnimationComponent
+                animationType={ComponentAnimationType.componentFade}
+              >
+                <PlayerDetails
+                  isAudioPlayer
+                  configuration={configuration}
+                  style={Styles.playerDetails}
+                  entry={entry}
+                  isTabletLandscape={isTabletLandscape}
+                />
+              </AnimationComponent>
+            </View>
+          </View>
+        </AnimatedScrollModal>
+      </AnimationComponent>
+    </SafeAreaView>
+  );
 };

package/src/Player/AudioLayer/Layout/Controls/VerticalGutter.tsx

@@ -3,25 +3,43 @@ import { View, StyleSheet } from "react-native";
 
 import { useIsTablet } from "@applicaster/zapp-react-native-utils/reactHooks";
 
-import { TABLET_VERTICAL_SEPARATOR_HEIGHT } from "../const";
+import {
+  TABLET_VERTICAL_SEPARATOR_HEIGHT,
+  TABLET_VERTICAL_SEPARATOR_HEIGHT_S,
+} from "../const";
 
 import { withDebug } from "../debug";
+import { useSafeAreaFrame } from "react-native-safe-area-context";
+import { isSmallTabletHeight } from "../utils";
 
 const styles = StyleSheet.create({
   flexingHeight: {
     flex: 1,
-
     ...withDebug({ backgroundColor: "red" }),
   },
   fixedHeight: {
     height: TABLET_VERTICAL_SEPARATOR_HEIGHT,
-
+    ...withDebug({ backgroundColor: "red" }),
+  },
+  fixedHeightSmall: {
+    height: TABLET_VERTICAL_SEPARATOR_HEIGHT_S,
     ...withDebug({ backgroundColor: "red" }),
   },
 });
 
 export const VerticalGutter = () => {
   const isTablet = useIsTablet();
-
-  return <View style={isTablet ? styles.fixedHeight : styles.flexingHeight} />;
+  const { height } = useSafeAreaFrame();
+
+  return (
+    <View
+      style={
+        isTablet
+          ? isSmallTabletHeight(height)
+            ? styles.fixedHeightSmall
+            : styles.fixedHeight
+          : styles.flexingHeight
+      }
+    />
+  );
 };

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

@@ -5,7 +5,6 @@ import { dayjs } from "@applicaster/zapp-react-native-utils/dateUtils";
 import { useIsTablet } from "@applicaster/zapp-react-native-utils/reactHooks";
 import {
   Controls as MobileTransportControls,
-  CountDown,
   ProgressBar,
 } from "@applicaster/quick-brick-mobile-transport-controls";
 import { playerManager } from "@applicaster/zapp-react-native-utils/appUtils";
@@ -39,19 +38,24 @@ const styles = StyleSheet.create({
   progressBar: {
     flex: 0,
   },
+  progressBarTrackStyles: {
+    borderRadius: 3,
+    height: 6,
+  },
+  progressBarThumbStyles: {
+    width: 14,
+    height: 14,
+    borderRadius: 7,
+  },
+  progressBarThumbStyles_pressed: {
+    width: 20,
+    height: 20,
+    borderRadius: 10,
+  },
 });
 
-const controlsStyles = ({
-  isTablet,
-  isLiveShowFullControls,
-}: {
-  isTablet: boolean;
-  isLiveShowFullControls: boolean;
-}) => ({
-  height: isTablet ? undefined : 50,
-  marginHorizontal: isTablet ? undefined : 10,
-  justifyContent: isLiveShowFullControls ? "space-between" : "space-evenly",
-});
+const getControlJustifyContent = (countOfButtons: number) =>
+  countOfButtons <= 1 ? "center" : "space-between";
 
 type Props = {
   entry: ZappEntry;
@@ -75,6 +79,8 @@ type Props = {
   onSpeedButtonPress: Callback;
   onSleepButtonPress: Callback;
 
+  maxWidth?: number;
+
   docked: boolean;
 };
 
@@ -100,6 +106,7 @@ export const Controls = (props: Props) => {
     onSkipLive,
     onSpeedButtonPress,
     onSleepButtonPress,
+    maxWidth = 320,
 
     docked,
   } = props;
@@ -117,14 +124,19 @@ export const Controls = (props: Props) => {
     showFullControls = !!(controller?.hasSeekableDuration?.() && seekEnabled);
   }
 
-  const sleepTitle = value("playback_sleep_countdown_label");
-
   const [timeLeft, setTimeLeft] = React.useState(
     sleepTimerDate !== 0 ? sleepTimerDate - Date.now() : 0
   );
 
   const showCounter = React.useMemo(() => sleepTimerDate > 0, [sleepTimerDate]);
 
+  const countDownOptions = React.useMemo(() => {
+    return {
+      showCounter: showCounter && timeLeft >= 0,
+      timeLeft,
+    };
+  }, [showCounter, timeLeft]);
+
   React.useEffect(() => {
     if (showCounter && sleepTimerDate !== 0) {
       setTimeLeft(sleepTimerDate - Date.now());
@@ -261,6 +273,7 @@ export const Controls = (props: Props) => {
         summary={summary}
         value={value}
         layoutState={layoutState}
+        maxWidth={maxWidth}
       />
 
       <VerticalGutter />
@@ -282,12 +295,12 @@ export const Controls = (props: Props) => {
             isDateBasedLiveContent={isDateBasedLiveContent}
             onSkipLive={onSkipLive}
             progressBarStyles={styles.progressBar}
+            countDownOptions={countDownOptions}
+            thumbStyles={styles.progressBarThumbStyles}
+            thumbStylesPressed={styles.progressBarThumbStyles_pressed}
+            trackStyles={styles.progressBarTrackStyles}
           />
 
-          {showCounter && timeLeft >= 0 ? (
-            <CountDown timeLeft={timeLeft} value={value} title={sleepTitle} />
-          ) : null}
-
           <VerticalGutter />
         </>
       ) : null}
@@ -297,7 +310,9 @@ export const Controls = (props: Props) => {
         visible={true}
         keepAlive={null}
         buttons={controlButtons}
-        style={controlsStyles({ isTablet, isLiveShowFullControls })}
+        style={{
+          justifyContent: getControlJustifyContent(controlButtons().length),
+        }}
         playerState={playerState}
       />
     </AnimationComponent>