@applicaster/quick-brick-player 13.0.0-alpha.2886020207 → 13.0.0-alpha.3003916059

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applicaster/quick-brick-player",
-  "version": "13.0.0-alpha.2886020207",
+  "version": "13.0.0-alpha.3003916059",
   "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.112",
+    "@applicaster/quick-brick-mobile-transport-controls": "13.0.0-rc.124",
     "@applicaster/quick-brick-tv-transport-controls": "13.0.0-rc.56",
-    "@applicaster/zapp-react-native-tvos-app": "13.0.0-alpha.2886020207",
-    "@applicaster/zapp-react-native-ui-components": "13.0.0-alpha.2886020207",
-    "@applicaster/zapp-react-native-utils": "13.0.0-alpha.2886020207",
+    "@applicaster/zapp-react-native-tvos-app": "13.0.0-alpha.3003916059",
+    "@applicaster/zapp-react-native-ui-components": "13.0.0-alpha.3003916059",
+    "@applicaster/zapp-react-native-utils": "13.0.0-alpha.3003916059",
     "query-string": "7.1.3",
     "react-native-web-linear-gradient": "1.1.2",
     "shaka-player": "4.3.5",

package/src/Player/AudioLayer/AudioDescription.tsx

@@ -113,7 +113,7 @@ export const AudioDescription = (props: AudioDescriptionProps) => {
       style={[
         styles.wrapper,
         {
-          maxWidth,
+          maxWidth: Math.max(maxWidth, 320),
           height,
         },
       ]}

package/src/Player/AudioLayer/AudioPlayerWrapper.tsx

@@ -37,14 +37,13 @@ import {
 } 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,
-} from "./SleepTimerManager";
+
 import { DEFAULT_SPEED, PlaybackSpeed, SpeedController } from "./SpeedManager";
-import { openBottomSheetModal } from "@applicaster/zapp-react-native-utils/modalState";
-import { getSleepTimerOptions } from "../Const/sleepTimerOptions";
+import {
+  dismissModal as dismissBottomSheetModal,
+  openBottomSheetModal,
+  useModalStoreState,
+} from "@applicaster/zapp-react-native-utils/modalState";
 import { speedOptions } from "../Const/speedOptions";
 
 const { log_debug } = createLogger({
@@ -61,7 +60,6 @@ type Dimensions = {
 
 type Configuration = {
   [key: string]: any;
-  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;
@@ -103,6 +101,8 @@ export const AudioPlayerWrapper: React.FC<Props> = (props: Props) => {
   const player = usePlayer();
   const playerState = usePlayerState("audio-player-wrapper");
 
+  const modalBottomSheetState = useModalStoreState();
+
   const {
     configuration,
     style,
@@ -123,30 +123,39 @@ export const AudioPlayerWrapper: React.FC<Props> = (props: Props) => {
     configuration?.audio_live_player_update_interval
   );
 
-  const [sleepTimerManager, setSleepTimerManager] =
-    useState<SleepTimerController | null>(null);
-
   const [speedManager, setSpeedManager] = useState<SpeedController | null>(
     null
   );
 
   useEffect(() => {
     if (player) {
-      setSleepTimerManager(new SleepTimerController(player));
       setSpeedManager(new SpeedController(player));
     } else {
-      setSleepTimerManager(null);
       setSpeedManager(null);
     }
   }, [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);
 
-  const [sleepTimerState, setSleepTimerState] = useState<SleepTimerState>(
-    new SleepTimerState(SLEEP_TIMER_OFF, 0)
-  );
-
   const [defaultDimensions, setDefaultDimensions] =
     React.useState<Dimensions>(undefined);
 
@@ -169,17 +178,13 @@ export const AudioPlayerWrapper: React.FC<Props> = (props: Props) => {
   };
 
   useEffect(() => {
-    const sleepSubscription =
-      sleepTimerManager?.sleepTimerState$.subscribe(setSleepTimerState);
-
     const speedSubscription =
       speedManager?.playbackSpeed$.subscribe(setPlaybackSpeed);
 
     return () => {
-      sleepSubscription?.unsubscribe();
       speedSubscription?.unsubscribe();
     };
-  }, [sleepTimerManager, speedManager]);
+  }, [speedManager]);
 
   useEffect(() => {
     if (!playerState.isReadyToPlay) {
@@ -187,8 +192,7 @@ export const AudioPlayerWrapper: React.FC<Props> = (props: Props) => {
     }
 
     void speedManager?.loadSpeed();
-    void sleepTimerManager?.loadSleep();
-  }, [playerState.isReadyToPlay, speedManager, sleepTimerManager]);
+  }, [playerState.isReadyToPlay, speedManager]);
 
   const getValue = (key: string, stylesObj: {}) =>
     R.propOr(null, key, stylesObj);
@@ -236,13 +240,6 @@ export const AudioPlayerWrapper: React.FC<Props> = (props: Props) => {
     [speedManager]
   );
 
-  const onSleepSelect = React.useCallback(
-    async (item) => {
-      await sleepTimerManager?.setSleepTimer(item);
-    },
-    [sleepTimerManager]
-  );
-
   const onSpeedButtonPress = React.useCallback(() => {
     openBottomSheetModal({
       modalBottomSheetContentProps: {
@@ -267,42 +264,6 @@ export const AudioPlayerWrapper: React.FC<Props> = (props: Props) => {
     });
   }, [playbackSpeed, onSpeedSelect, configuration["playback_speed_title"]]);
 
-  const onSleepButtonPress = React.useCallback(() => {
-    openBottomSheetModal({
-      modalBottomSheetContentProps: {
-        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",
-          "landscape",
-          "portrait-upside-down",
-        ],
-      },
-    });
-  }, [
-    sleepTimerState.timer,
-    configuration["playback_sleep_title"],
-    configuration["playback_sleep_off_label"],
-    onSleepSelect,
-  ]);
-
-  // This method does not actually cancel the sleep timer
-  // (and should not to avoid race condition),
-  // it just performs the cleanup when timer expires
-  // TODO: rename it in code above
-  const cancelSleepTimer = React.useCallback(() => {
-    sleepTimerManager?.onTimerExpired();
-  }, [sleepTimerManager]);
-
   const onCloseVideoModal = React.useCallback(() => {
     playerManager.close();
   }, [playerManager]);
@@ -342,15 +303,7 @@ export const AudioPlayerWrapper: React.FC<Props> = (props: Props) => {
               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}

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

@@ -2,7 +2,10 @@ import * as React from "react";
 import { StyleSheet } from "react-native";
 
 import { dayjs } from "@applicaster/zapp-react-native-utils/dateUtils";
-import { useIsTablet } from "@applicaster/zapp-react-native-utils/reactHooks";
+import {
+  useIsTablet,
+  useZStore,
+} from "@applicaster/zapp-react-native-utils/reactHooks";
 import {
   Controls as MobileTransportControls,
   ProgressBar,
@@ -27,6 +30,7 @@ import {
   sleepButton,
   speedButton,
 } from "./utils";
+import { useSleepTimerModal } from "../../useSleepTimerModal";
 
 const styles = StyleSheet.create({
   flex: {
@@ -64,11 +68,8 @@ type Props = {
   value: GetValue;
   title: string | number;
   summary: string | number;
-  sleepTimerDate: number;
-  cancelSleepTimer: Callback;
 
   playbackSpeedName: string;
-  playbackSleepName: string;
 
   onPlaybackButtonPress: Callback;
   onRewindButtonPress: Callback;
@@ -77,7 +78,6 @@ type Props = {
   onSkipStart: Callback;
   onSkipLive: Callback;
   onSpeedButtonPress: Callback;
-  onSleepButtonPress: Callback;
 
   maxWidth?: number;
 
@@ -92,11 +92,8 @@ export const Controls = (props: Props) => {
     value,
     title,
     summary,
-    sleepTimerDate,
-    cancelSleepTimer,
 
     playbackSpeedName,
-    playbackSleepName,
 
     onPlaybackButtonPress,
     onRewindButtonPress,
@@ -105,12 +102,21 @@ export const Controls = (props: Props) => {
     onSkipStart,
     onSkipLive,
     onSpeedButtonPress,
-    onSleepButtonPress,
     maxWidth = 320,
 
     docked,
   } = props;
 
+  const configuration = useZStore("playerConfiguration");
+
+  const { sleepTimerState, onSleepButtonPress } = useSleepTimerModal(
+    playerManager.getActivePlayer(),
+    configuration
+  );
+
+  const playbackSleepName =
+    sleepTimerState.timer.value === 0 ? "sleep_timer" : "sleep_timer_active";
+
   const isTablet = useIsTablet();
   const controller = playerManager.getActivePlayer();
   let showFullControls = !controller?.isAd();
@@ -124,45 +130,6 @@ export const Controls = (props: Props) => {
     showFullControls = !!(controller?.hasSeekableDuration?.() && seekEnabled);
   }
 
-  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());
-
-      const intervalId = setInterval(() => {
-        setTimeLeft(() => {
-          const newTimeLeft = sleepTimerDate - Date.now();
-
-          if (newTimeLeft <= 0) {
-            clearInterval(intervalId);
-
-            cancelSleepTimer();
-
-            return 0;
-          } else {
-            return newTimeLeft;
-          }
-        });
-      }, 1000);
-
-      return () => clearInterval(intervalId);
-    } else {
-      setTimeLeft(0);
-    }
-  }, [sleepTimerDate, showCounter, cancelSleepTimer]);
-
   const startTime = entry.extensions?.live?.start_time;
   const endTime = entry.extensions?.live?.end_time;
 
@@ -295,7 +262,6 @@ export const Controls = (props: Props) => {
             isDateBasedLiveContent={isDateBasedLiveContent}
             onSkipLive={onSkipLive}
             progressBarStyles={styles.progressBar}
-            countDownOptions={countDownOptions}
             thumbStyles={styles.progressBarThumbStyles}
             thumbStylesPressed={styles.progressBarThumbStyles_pressed}
             trackStyles={styles.progressBarTrackStyles}

package/src/Player/AudioLayer/Layout/Controls/utils.ts

@@ -99,7 +99,7 @@ export const skipToLiveButton = (props: ButtonsProps): ControlsButton =>
   skipButtonByName({ ...props, name: "skip_live" });
 
 export const speedButton = (props: ButtonsProps): ControlsButton =>
-  speedButtonByName({ ...props });
+  speedButtonByName(props);
 
 export const sleepButton = (props: ButtonsProps): ControlsButton =>
-  sleepButtonByName({ ...props });
+  sleepButtonByName(props);

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

@@ -24,6 +24,10 @@ import {
   useModalAnimationContext,
 } from "@applicaster/zapp-react-native-ui-components/Components/VideoModal/ModalAnimation";
 import { toNumberWithDefault } from "@applicaster/zapp-react-native-utils/numberUtils";
+import { useSafeAreaInsets } from "react-native-safe-area-context";
+import { getTabBarHeight } from "@applicaster/zapp-react-native-utils/reactHooks/navigation/getTabBarHeight";
+
+const bottomTabBarHeight = getTabBarHeight();
 
 type Props = {
   entry: ZappEntry;
@@ -88,10 +92,6 @@ const styles = StyleSheet.create({
   },
 });
 
-const backgroundColorStyle = (value: GetValue): ViewStyle => ({
-  backgroundColor: value("docked_player_background_color"),
-});
-
 const playerDimensionsStyle = (
   minimisedHeight: number,
   addPadding: boolean
@@ -208,6 +208,10 @@ export const DockedControls = (props: Props) => {
     []
   );
 
+  const dockedBackgroundColor = value("docked_player_background_color");
+
+  const insets = useSafeAreaInsets();
+
   if (!layoutState.docked && !startComponentsAnimation) return null;
 
   return (
@@ -219,7 +223,9 @@ export const DockedControls = (props: Props) => {
           isActiveGesture || layoutState.docked,
           progressBarHeight
         ),
-        { height: minimisedHeight },
+        {
+          height: minimisedHeight + bottomTabBarHeight + insets.bottom,
+        },
       ]}
     >
       {!playerState.isLive &&
@@ -261,7 +267,12 @@ export const DockedControls = (props: Props) => {
                 )}
               />
             )}
-            <View style={[styles.contentInfo, backgroundColorStyle(value)]}>
+            <View
+              style={[
+                styles.contentInfo,
+                { backgroundColor: dockedBackgroundColor },
+              ]}
+            >
               <ContentInfo
                 content={{ ...entry, title, summary }}
                 value={value}
@@ -275,7 +286,7 @@ export const DockedControls = (props: Props) => {
             isTablet
               ? styles.controlsContainerForTablet
               : styles.controlsContainerForMobile,
-            backgroundColorStyle(value),
+            { backgroundColor: dockedBackgroundColor },
           ]}
         >
           <Controls
@@ -297,6 +308,12 @@ export const DockedControls = (props: Props) => {
           />
         </View>
       </View>
+      <View
+        style={{
+          height: insets.bottom + bottomTabBarHeight,
+          backgroundColor: dockedBackgroundColor,
+        }}
+      />
     </AnimationComponent>
   );
 };

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

@@ -77,15 +77,11 @@ export function MobileLayout({
   onSkipStart,
   onSkipLive,
   onSpeedButtonPress,
-  onSleepButtonPress,
   onCloseVideoModal,
   playbackSpeedName,
-  playbackSleepName,
   configuration,
   dimensions,
   playNextData,
-  cancelSleepTimer,
-  sleepTimerDate,
   title,
   summary,
 }: Props) {
@@ -196,10 +192,7 @@ export function MobileLayout({
             value={value}
             title={title}
             summary={summary}
-            sleepTimerDate={sleepTimerDate}
-            cancelSleepTimer={cancelSleepTimer}
             playbackSpeedName={playbackSpeedName}
-            playbackSleepName={playbackSleepName}
             onPlaybackButtonPress={onPlaybackButtonPress}
             onRewindButtonPress={onRewindButtonPress}
             onForwardButtonPress={onForwardButtonPress}
@@ -207,7 +200,6 @@ export function MobileLayout({
             onSkipStart={onSkipStart}
             onSkipLive={onSkipLive}
             onSpeedButtonPress={onSpeedButtonPress}
-            onSleepButtonPress={onSleepButtonPress}
             docked={docked}
           />
         </View>

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

@@ -1,5 +1,5 @@
 import React, { PropsWithChildren } from "react";
-import { Image, Animated, StyleSheet, ViewStyle } from "react-native";
+import { Image, Animated, StyleSheet, ImageStyle } from "react-native";
 
 import { imageSrcFromMediaItem } from "@applicaster/zapp-react-native-utils/configurationUtils";
 import {
@@ -8,31 +8,26 @@ import {
   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 { useChangePlayerState } from "./hooks";
 
 const styles = StyleSheet.create({
   container: {
     // we have to specify flex:0 and dimensions to make animation work
     flex: 0,
     aspectRatio: 1,
-    overflow: "hidden",
   },
 });
 
 type Props = PropsWithChildren<{
   entry: ZappEntry;
-  style?: { [K: string]: any };
-  imageStyle?: { [K: string]: any };
-  wrapperViewStyle?: ViewStyle;
+  style?: ImageStyle | ImageStyle[];
   imageWidth: number;
+  docked: boolean;
 }>;
 
-export const AnimatedImage = ({
-  entry,
-  style,
-  imageStyle,
-  wrapperViewStyle,
-  imageWidth,
-}: Props) => {
+export const AnimatedImage = ({ entry, style, imageWidth, docked }: Props) => {
   const heightAnim = React.useRef(new Animated.Value(imageWidth)).current;
 
   const source = React.useMemo(
@@ -40,27 +35,40 @@ export const AnimatedImage = ({
     [entry]
   );
 
-  const { playerAnimationState, minimisedHeight } = useModalAnimationContext();
+  const { minimisedHeight } = useModalAnimationContext();
+
+  const changePlayerState$ = useChangePlayerState({ docked });
 
   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();
+    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();
+        }
 
-      return;
-    }
+        if (nextPlayerState === PlayerAnimationStateEnum.appear_as_docked) {
+          // minimize image immediatly
+          heightAnim.setValue(minimisedHeight);
+        }
+      },
+    });
 
-    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]);
+    return () => {
+      subscription.unsubscribe();
+    };
+  }, [changePlayerState$, minimisedHeight, imageWidth]);
 
   if (!source) return null;
 
@@ -68,16 +76,12 @@ export const AnimatedImage = ({
     <Animated.View
       style={[
         styles.container,
-        wrapperViewStyle,
-        imageStyle,
         {
           width: heightAnim,
         },
       ]}
     >
-      <Image resizeMode="cover" style={style} source={source}>
-        {null}
-      </Image>
+      <Image resizeMode="cover" style={style} source={source} />
     </Animated.View>
   );
 };

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

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

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

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