@applicaster/quick-brick-player 13.0.0-alpha.3637360334 → 13.0.0-alpha.3732093334

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applicaster/quick-brick-player",
-  "version": "13.0.0-alpha.3637360334",
+  "version": "13.0.0-alpha.3732093334",
   "description": "Quick Brick Player",
   "main": "./src/index.ts",
   "types": "index.d.ts",
@@ -35,12 +35,11 @@
   },
   "homepage": "https://github.com/applicaster/quickbrick#readme",
   "dependencies": {
-    "@applicaster/quick-brick-mobile-transport-controls": "13.0.0-alpha.3637360334",
+    "@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.3637360334",
-    "@applicaster/zapp-react-native-ui-components": "13.0.0-alpha.3637360334",
-    "@applicaster/zapp-react-native-utils": "13.0.0-alpha.3637360334",
-    "keymirror": "^0.1.1",
+    "@applicaster/zapp-react-native-tvos-app": "13.0.0-alpha.3732093334",
+    "@applicaster/zapp-react-native-ui-components": "13.0.0-alpha.3732093334",
+    "@applicaster/zapp-react-native-utils": "13.0.0-alpha.3732093334",
     "query-string": "7.1.3",
     "react-native-web-linear-gradient": "1.1.2",
     "shaka-player": "4.3.5",
@@ -53,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, View, StyleSheet } from "react-native";
+import { StyleSheet, Text, TextStyle, View } from "react-native";
 import { platformSelect } from "@applicaster/zapp-react-native-utils/reactUtils";
 
 type AudioDescriptionProps = {
@@ -10,88 +10,125 @@ type AudioDescriptionProps = {
     docked: boolean;
     isModal: boolean;
   };
+  maxWidth?: number;
   value: GetValue;
 };
 
+const TITLE_PADDING_BOTTOM = 5;
+const TITLE_LINES = 2;
+const SUBTITLE_LINES = 1;
+
 const styles = StyleSheet.create({
-  container: {},
+  wrapper: {
+    width: "100%",
+    alignSelf: "center",
+    alignItems: "center",
+    justifyContent: "center",
+  },
+  titleText: {
+    textAlign: "center",
+    alignSelf: "center",
+    paddingBottom: TITLE_PADDING_BOTTOM,
+  },
+  summaryText: {
+    textAlign: "left",
+    alignSelf: "center",
+  },
 });
 
-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 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 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 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 (
-    <View style={styles.container}>
-      <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,7 +1,13 @@
 import * as React from "react";
-import { ViewStyle, View, Dimensions as ScreenDimensions } from "react-native";
+import { useEffect, useState } from "react";
+import {
+  Dimensions as ScreenDimensions,
+  StyleSheet,
+  View,
+  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";
@@ -15,33 +21,35 @@ 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, getLiveUrl } from "../Utils";
+import {
+  getBottomSheetModalDefaultItemIcon,
+  getBottomSheetModalIconProps,
+  getBottomSheetModalItemProps,
+  getBottomSheetModalLabelProps,
+  getBottomSheetModalSelectedItemIcon,
+} 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 {
-  speed_0_8,
-  speed_1,
-  speed_1_2,
-  speed_1_5,
-  speed_2,
-} from "@applicaster/quick-brick-mobile-transport-controls";
-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 { 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";
 
 const { log_debug } = createLogger({
   subsystem: "UIComponent",
@@ -57,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;
@@ -67,7 +73,6 @@ type Configuration = {
 type Props = {
   children: React.ReactNode;
   inline?: boolean;
-  docked?: boolean;
   configuration: Configuration;
   style: ViewStyle & Dimensions;
   entry: ZappEntry;
@@ -83,61 +88,27 @@ type Props = {
 
 const { width: SCREEN_WIDTH } = ScreenDimensions.get("screen");
 
-const Styles = {
-  mainContainer: (style: ViewStyle) => {
-    const combinedStyle: ViewStyle = {
-      flex: 1,
-    };
-
-    return {
-      ...combinedStyle,
-      ...style,
-    };
-  },
+const Styles = StyleSheet.create({
   playerContainer: {
     flex: 1,
   },
   paddingHorizontal: { paddingTop: 0, paddingHorizontal: PADDING_HORIZONTAL },
-
-  controlsMobile: {
-    height: 50,
-    marginHorizontal: 24,
-  },
-  controlsTablet: {
-    height: 96,
-    marginHorizontal: 24,
-  },
   playerDetails: {
     marginTop: 60,
     alignSelf: "center",
     width: SCREEN_WIDTH - PADDING_HORIZONTAL * 2,
   },
-
-  linearGradient: {
-    flex: 1,
-  },
-};
-
-const sleeps = [
-  // { label: "End of episode", value: "episode" },
-  { label: "5 minutes", value: 5 },
-  { label: "10 minutes", value: 10 },
-  { label: "15 minutes", value: 15 },
-  { label: "30 minutes", value: 30 },
-  { label: "45 minutes", value: 45 },
-  { label: "1 hour", value: 60 },
-  { label: "2 hours", value: 120 },
-];
+});
 
 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,
@@ -147,24 +118,11 @@ export const AudioPlayerWrapper: React.FC<Props> = (props: Props) => {
     isTabletPortrait,
   } = props;
 
-  const speeds = [
-    { asset: configuration["speed_0_8"] || speed_0_8, value: 0.8 },
-    { asset: configuration["speed_1"] || speed_1, value: 1.0 },
-    { asset: configuration["speed_1_2"] || speed_1_2, value: 1.2 },
-    { asset: configuration["speed_1_5"] || speed_1_5, value: 1.5 },
-    { asset: configuration["speed_2"] || speed_2, value: 2.0 },
-  ];
-
   const isTablet = useIsTablet();
 
   const isTabletLandscape = !isTV() && isTablet && !isTabletPortrait;
 
-  // TODO: Have generic place for live url from configuration. Currently its hardcoded for client.
-
-  const feedUrl = getLiveUrl(entry?.extensions?.live?.channel_src ?? "");
-
   const { title, summary } = useTitleSummaryOverlay(
-    feedUrl,
     entry,
     playerState?.isLive,
     configuration?.audio_live_player_update_interval
@@ -187,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);
 
@@ -202,8 +178,6 @@ export const AudioPlayerWrapper: React.FC<Props> = (props: Props) => {
     height: 0,
   });
 
-  const navigator = useNavigation();
-
   const { maximiseVideoModal } = useNavigation();
 
   const onLayout = (event: any) => {
@@ -293,44 +267,51 @@ export const AudioPlayerWrapper: React.FC<Props> = (props: Props) => {
   );
 
   const onSpeedButtonPress = React.useCallback(() => {
-    navigator.openModalBottomSheet({
+    openBottomSheetModal({
       modalBottomSheetContentProps: {
-        items: speeds,
+        items: speedOptions,
         current_selection: playbackSpeed,
         onPress: onSpeedSelect,
         title: configuration["playback_speed_title"],
+        itemProps: getBottomSheetModalItemProps,
+        iconProps: getBottomSheetModalIconProps,
+        labelProps: getBottomSheetModalLabelProps,
+        getSelectedItemIcon: getBottomSheetModalSelectedItemIcon,
+        getDefaultItemIcon: getBottomSheetModalDefaultItemIcon,
+        iconPlacement: "right",
       },
       options: {
-        supportedOrientations: ["portrait"],
+        supportedOrientations: [
+          "portrait",
+          "landscape",
+          "portrait-upside-down",
+        ],
       },
     });
-  }, [
-    playbackSpeed,
-    setPlaybackSpeed,
-    navigator,
-    onSpeedSelect,
-    configuration["playback_speed_title"],
-  ]);
+  }, [playbackSpeed, onSpeedSelect, configuration["playback_speed_title"]]);
 
   const onSleepButtonPress = React.useCallback(() => {
-    navigator.openModalBottomSheet({
+    openBottomSheetModal({
       modalBottomSheetContentProps: {
-        items: [
-          {
-            label: configuration["playback_sleep_off_label"],
-            value: 0,
-          },
-        ].concat(sleeps),
+        items: getSleepTimerOptions(configuration),
         current_selection: sleepTimerState.timer,
         onPress: onSleepSelect,
         title: configuration["playback_sleep_title"],
+        itemProps: getBottomSheetModalItemProps,
+        iconProps: getBottomSheetModalIconProps,
+        labelProps: getBottomSheetModalLabelProps,
+        getSelectedItemIcon: getBottomSheetModalSelectedItemIcon,
+        iconPlacement: "right",
       },
       options: {
-        supportedOrientations: ["portrait"],
+        supportedOrientations: [
+          "portrait",
+          "landscape",
+          "portrait-upside-down",
+        ],
       },
     });
   }, [
-    navigator,
     sleepTimerState.timer,
     configuration["playback_sleep_title"],
     configuration["playback_sleep_off_label"],
@@ -364,114 +345,61 @@ export const AudioPlayerWrapper: React.FC<Props> = (props: Props) => {
     player?.seekTo(0);
   }, [player]);
 
-  const MainContent = React.useMemo(() => {
-    return (
-      <SafeAreaView style={Styles.mainContainer(style)} 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
-                    configuration={configuration}
-                    style={Styles.playerDetails}
-                    entry={entry}
-                    isTabletLandscape={isTabletLandscape}
-                    isAudioPlayer={true}
-                  />
-                </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>
+  );
 };