@applicaster/quick-brick-player 13.0.0-rc.97 → 13.0.0-rc.99

package/package.json

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

package/src/Player/AudioLayer/AudioDescription.tsx

@@ -82,7 +82,7 @@ export const AudioDescription = (props: AudioDescriptionProps) => {
 
   return (
     <>
-      <Text style={titleStyles(value, prefix)} numberOfLines={1}>
+      <Text style={titleStyles(value, prefix)} numberOfLines={2}>
         {title}
       </Text>
       <Text style={summaryStyles(value, prefix)} numberOfLines={1}>

package/src/Player/AudioLayer/AudioPlayerWrapper.tsx

@@ -48,7 +48,7 @@ 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 { sleepTimerOptions } from "../Const/sleepTimerOptions";
+import { getSleepTimerOptions } from "../Const/sleepTimerOptions";
 import { speedOptions } from "../Const/speedOptions";
 
 const { log_debug } = createLogger({
@@ -278,12 +278,7 @@ export const AudioPlayerWrapper: React.FC<Props> = (props: Props) => {
   const onSleepButtonPress = React.useCallback(() => {
     openBottomSheetModal({
       modalBottomSheetContentProps: {
-        items: [
-          {
-            label: configuration["playback_sleep_off_label"],
-            value: 0,
-          },
-        ].concat(sleepTimerOptions),
+        items: getSleepTimerOptions(configuration),
         current_selection: sleepTimerState.timer,
         onPress: onSleepSelect,
         title: configuration["playback_sleep_title"],

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;
@@ -117,14 +121,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());
@@ -282,12 +291,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 +306,9 @@ export const Controls = (props: Props) => {
         visible={true}
         keepAlive={null}
         buttons={controlButtons}
-        style={controlsStyles({ isTablet, isLiveShowFullControls })}
+        style={{
+          justifyContent: getControlJustifyContent(controlButtons().length),
+        }}
         playerState={playerState}
       />
     </AnimationComponent>

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

@@ -1,14 +1,7 @@
-const rewindButtonSize = (isTablet: boolean): keyof ButtonSizeStyles =>
-  isTablet ? "big" : "smallMargins";
-
-const playbackButtonSize = (isTablet: boolean): keyof ButtonSizeStyles =>
-  isTablet ? "bigExtended" : "mediumExtended";
-
 const playbackButtonMargins = (
   isTablet: boolean,
   isLiveShowFullControls: boolean
-): number =>
-  isLiveShowFullControls ? (isTablet ? 65 : 10) : isTablet ? undefined : 40;
+): number => (isLiveShowFullControls ? (isTablet ? 65 : 10) : undefined);
 
 export const playbackButton = ({
   playerState,
@@ -30,7 +23,7 @@ export const playbackButton = ({
       : "pause";
 
   return {
-    size: playbackButtonSize(isTablet),
+    size: "bigExtended",
     icon: playerState.isBuffering ? "buffering" : icon,
     preferredFocus: true,
     onPress,
@@ -52,10 +45,9 @@ type ButtonsByNameProps = ButtonsProps & { name?: string };
 const rewindButtonByName = ({
   name,
   onPress,
-  isTablet,
   style,
 }: ButtonsByNameProps): ControlsButton => ({
-  size: rewindButtonSize(isTablet),
+  size: "big",
   icon: name,
   onPress,
   style,

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

@@ -0,0 +1,55 @@
+/* eslint react-native/no-color-literals: off */
+/* eslint react-native/no-inline-styles: off */
+
+import * as React from "react";
+import { View } from "react-native";
+
+import { MOBILE } from "../const";
+
+export const LeftDebugSquare = () => (
+  <View
+    style={{
+      position: "absolute",
+      top: 200,
+      left: 0,
+      width: MOBILE.MARGIN_HORIZONTAL,
+      height: MOBILE.MARGIN_HORIZONTAL,
+      backgroundColor: "blue",
+
+      borderWidth: 1,
+      borderColor: "yellow",
+    }}
+  />
+);
+
+export const RightDebugSquare = () => (
+  <View
+    style={{
+      position: "absolute",
+      top: 200,
+      right: 0,
+      width: MOBILE.MARGIN_HORIZONTAL,
+      height: MOBILE.MARGIN_HORIZONTAL,
+      backgroundColor: "blue",
+
+      borderWidth: 1,
+      borderColor: "yellow",
+    }}
+  />
+);
+
+export const BottomDebugSquare = () => (
+  <View
+    style={{
+      position: "absolute",
+      left: 170,
+      bottom: 0,
+      width: MOBILE.MARGIN_BOTTOM,
+      height: MOBILE.MARGIN_BOTTOM,
+      backgroundColor: "blue",
+
+      borderWidth: 1,
+      borderColor: "yellow",
+    }}
+  />
+);

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

@@ -6,14 +6,19 @@ import {
 } from "react-native-safe-area-context";
 import { useModalAnimationContext } from "@applicaster/zapp-react-native-ui-components/Components/VideoModal/ModalAnimation";
 
-import { MOBILE } from "./const";
+import { MOBILE, NAVBAR_HEIGHT } from "./const";
 import { TransportInfo } from "./TransportInfo";
 import { PlayerImage } from "./PlayerImage";
 import { Controls } from "./Controls";
 
-import { useImageSize, useTransportInfoHeight } from "./hooks";
+import { useMobileLayoutImageSize, useTransportInfoHeight } from "./hooks";
 import { DockedControls } from "./DockedControls";
-import { withDebug } from "./debug";
+import { withDebug, DEBUG } from "./debug";
+import {
+  LeftDebugSquare,
+  RightDebugSquare,
+  BottomDebugSquare,
+} from "./Debug/index";
 
 import { Props } from "./types";
 
@@ -90,11 +95,27 @@ export function MobileLayout({
   const { height: screenHeight } = useSafeAreaFrame();
   const { progressBarHeight } = useModalAnimationContext();
 
-  const { imageSize, onLayout } = useImageSize({ isPortraitMode: true });
+  const { imageSize } = useMobileLayoutImageSize();
 
   const { height: transportInfoHeight, onLayout: onTransportInfoLayout } =
     useTransportInfoHeight();
 
+  const controlsContainerHeight = React.useMemo(() => {
+    return (
+      screenHeight -
+      topInset -
+      imageSize -
+      NAVBAR_HEIGHT -
+      MOBILE.MARGIN_BOTTOM -
+      MOBILE.MARGIN_TOP -
+      bottomInset
+    );
+  }, [screenHeight, topInset, imageSize, bottomInset]);
+
+  const verticalOffsetForImage = React.useMemo(() => {
+    return transportInfoHeight + MOBILE.MARGIN_TOP - progressBarHeight;
+  }, [transportInfoHeight, progressBarHeight]);
+
   return (
     <View
       style={[
@@ -107,6 +128,10 @@ export function MobileLayout({
         }),
       ]}
     >
+      {DEBUG ? <LeftDebugSquare /> : null}
+      {DEBUG ? <RightDebugSquare /> : null}
+      {DEBUG ? <BottomDebugSquare /> : null}
+
       {/* TransportInfo */}
       <TransportInfo
         entry={entry}
@@ -139,7 +164,6 @@ export function MobileLayout({
               }),
             },
           ]}
-          onLayout={onLayout}
         >
           <PlayerImage
             entry={entry}
@@ -155,20 +179,15 @@ export function MobileLayout({
             summary={summary}
             docked={docked}
             imageWidth={imageSize}
-            verticalOffset={
-              transportInfoHeight + MOBILE.MARGIN_TOP - progressBarHeight
-            }
+            verticalOffset={verticalOffsetForImage}
           />
         </View>
         {/* PlayerImage */}
 
         <View
-          style={[
-            styles.flex,
-            {
-              marginBottom: MOBILE.MARGIN_BOTTOM,
-            },
-          ]}
+          style={{
+            height: controlsContainerHeight,
+          }}
         >
           <Controls
             entry={entry}

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

@@ -12,7 +12,7 @@ import { TransportInfo } from "./TransportInfo";
 import { PlayerImage } from "./PlayerImage";
 import { Controls } from "./Controls";
 
-import { useImageSize, useTransportInfoHeight } from "./hooks";
+import { useTabletLayoutImageSize, useTransportInfoHeight } from "./hooks";
 import { DockedControls } from "./DockedControls";
 import { withDebug } from "./debug";
 
@@ -104,7 +104,9 @@ export function TabletLandscapeLayout({
   const { height: screenHeight } = useSafeAreaFrame();
   const { progressBarHeight } = useModalAnimationContext();
 
-  const { imageSize, onLayout } = useImageSize({ isPortraitMode: false });
+  const { imageSize, onLayout } = useTabletLayoutImageSize({
+    isPortraitMode: false,
+  });
 
   const { height: transportInfoHeight, onLayout: onTransportInfoLayout } =
     useTransportInfoHeight();

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

@@ -14,7 +14,7 @@ import { TransportInfo } from "./TransportInfo";
 import { PlayerImage } from "./PlayerImage";
 import { Controls } from "./Controls";
 
-import { useImageSize } from "./hooks";
+import { useTabletLayoutImageSize } from "./hooks";
 import { DockedControls } from "./DockedControls";
 import { VerticalGutter } from "./VerticalGutter";
 
@@ -36,7 +36,7 @@ const styles = StyleSheet.create({
 
   fillContainer: {
     ...StyleSheet.absoluteFillObject,
-
+    alignItems: "center",
     ...withDebug({
       borderWidth: 2,
       borderColor: "red",
@@ -104,7 +104,7 @@ export function TabletPortraitLayout({
     imageSize,
     offsetY: topOffset,
     onLayout,
-  } = useImageSize({ isPortraitMode: true });
+  } = useTabletLayoutImageSize({ isPortraitMode: true });
 
   return (
     <View

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

@@ -12,14 +12,23 @@ import {
 import { toPositiveNumberWithDefaultZero } from "@applicaster/zapp-react-native-utils/numberUtils";
 import { noop } from "@applicaster/zapp-react-native-utils/functionUtils";
 
-import { TABLET_LANDSCAPE } from "../const";
+import { TABLET_LANDSCAPE, NAVBAR_HEIGHT } from "../const";
 import { withDebug } from "../debug";
 
 const styles = StyleSheet.create({
   container: {
+    height: NAVBAR_HEIGHT,
+    justifyContent: "center",
+  },
+  animatedContainer: {
     width: "100%",
     alignItems: "center",
     justifyContent: "space-between",
+
+    ...withDebug({
+      borderWidth: 2,
+      borderColor: "yellow",
+    }),
   },
 });
 
@@ -74,19 +83,22 @@ export const TransportInfo = ({
 
   return (
     <View
-      style={{
-        marginBottom: applyMarginBottom({ isTablet, marginBottom }),
+      style={[
+        styles.container,
+        {
+          marginBottom: applyMarginBottom({ isTablet, marginBottom }),
 
-        ...withDebug({
-          borderWidth: 2,
-          borderColor: "red",
-        }),
-      }}
+          ...withDebug({
+            borderWidth: 2,
+            borderColor: "red",
+          }),
+        },
+      ]}
       onLayout={handleLayout}
     >
       <AnimationComponent
         animationType={ComponentAnimationType.componentFade}
-        style={styles.container}
+        style={styles.animatedContainer}
       >
         <MobileTransportInfo
           content={entry}

package/src/Player/AudioLayer/Layout/const.ts

@@ -18,3 +18,5 @@ export const MOBILE = {
   MARGIN_TOP: 10,
   MIN_HEIGHT: 458,
 };
+
+export const NAVBAR_HEIGHT = 60;

package/src/Player/AudioLayer/Layout/debug.ts

@@ -1,5 +1,5 @@
 // use this variable to activate borders on AudioPlayer. It will help you to fix layout if needed.
-const DEBUG = false;
+export const DEBUG = false;
 
 export const withDebug = (style) => {
   return DEBUG ? style : {};

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

@@ -1,3 +1,5 @@
-export { useImageSize } from "./useImageSize";
+export { useTabletLayoutImageSize } from "./useTabletLayoutImageSize";
+
+export { useMobileLayoutImageSize } from "./useMobileLayoutImageSize";
 
 export { useTransportInfoHeight } from "./useTransportInfoHeight";

package/src/Player/AudioLayer/Layout/hooks/useMobileLayoutImageSize.ts

@@ -0,0 +1,14 @@
+import { useDimensions } from "@applicaster/zapp-react-native-utils/reactHooks/layout";
+import { MOBILE } from "../const";
+
+type Return = {
+  imageSize: Option<number>;
+};
+
+export const useMobileLayoutImageSize = (): Return => {
+  const { width } = useDimensions("screen");
+
+  return {
+    imageSize: width - 2 * MOBILE.MARGIN_HORIZONTAL,
+  };
+};

package/src/Player/AudioLayer/Layout/hooks/{useImageSize.ts → useTabletLayoutImageSize.ts}

@@ -3,9 +3,11 @@ import { LayoutChangeEvent } from "react-native";
 
 import { toNumber } from "@applicaster/zapp-react-native-utils/numberUtils";
 import { Subject } from "rxjs";
-import { take, last } from "rxjs/operators";
+import { first, debounceTime, filter } from "rxjs/operators";
 import { useRefWithInitialValue } from "@applicaster/zapp-react-native-utils/reactHooks/state/useRefWithInitialValue";
 
+const TIMEOUT = 200; // ms
+
 type Layout = {
   x: number;
   y: number;
@@ -36,7 +38,7 @@ type Return = {
   onLayout: (event: LayoutChangeEvent) => void;
 };
 
-export const useImageSize = ({ isPortraitMode }: Props): Return => {
+export const useTabletLayoutImageSize = ({ isPortraitMode }: Props): Return => {
   const [imageSize, setImageSize] = React.useState(undefined);
   const [offsetY, setOffsetY] = React.useState(undefined);
 
@@ -45,7 +47,7 @@ export const useImageSize = ({ isPortraitMode }: Props): Return => {
   React.useEffect(() => {
     const subscription = layoutRef.current.layoutChange$
       // for landscape layout we need to wait the second layout change in order to get proper size of image
-      .pipe(take(isPortraitMode ? 1 : 2), last())
+      .pipe(debounceTime(TIMEOUT), first())
       .subscribe({
         next: (layout: Layout) => {
           const size = isPortraitMode
@@ -63,8 +65,11 @@ export const useImageSize = ({ isPortraitMode }: Props): Return => {
 
   React.useEffect(() => {
     const subscription = layoutRef.current.layoutChange$
-      // wait the second layout change in order to get proper offsetY
-      .pipe(take(2), last())
+      .pipe(
+        filter((layout: Layout) => layout.y > 0),
+        debounceTime(TIMEOUT),
+        first()
+      )
       .subscribe({
         next: (layout: Layout) => {
           setOffsetY(layout.y);

package/src/Player/Const/sleepTimerOptions.ts

@@ -1,10 +1,39 @@
-export const sleepTimerOptions = [
-  // { 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 },
-];
+import { toDayJSLocaleMap } from "@applicaster/zapp-react-native-utils/appUtils/localizationsHelper";
+import { dayjs } from "@applicaster/zapp-react-native-utils/dateUtils";
+import { getUILanguage } from "@applicaster/zapp-react-native-utils/localizationUtils";
+
+const createTimerOptions = (value) => {
+  let label = "";
+
+  const str = dayjs
+    .duration(value, "minute")
+    .locale(toDayJSLocaleMap(getUILanguage()))
+    .humanize();
+
+  if (value === 60) {
+    /** Skipping prefix "an"/"un"/"una" for 1 hour */
+
+    if (str.includes(" ")) {
+      label = `1 ${str.split(" ")[1]}`; // Combine "1" with second part of the string
+    } else {
+      label = `1 ${str}`; // Use dayjs provided translation
+    }
+  } else {
+    label = str;
+  }
+
+  return {
+    label,
+    value,
+  };
+};
+
+export const getSleepTimerOptions = (configuration) => {
+  return [
+    {
+      label: configuration["playback_sleep_off_label"],
+      value: 0,
+    },
+    ...[5, 10, 15, 30, 45, 60, 120].map(createTimerOptions),
+  ];
+};