@applicaster/quick-brick-player 12.0.0-alpha.5053228432 → 12.0.0-alpha.5061452310
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +5 -5
- package/src/Player/AudioLayer/AudioPlayerWrapper.tsx +89 -79
- package/src/Player/AudioLayer/Layout/DefaultLayout.tsx +145 -66
- package/src/Player/AudioLayer/Layout/DockedLayout.tsx +62 -17
- package/src/Player/AudioLayer/Layout/defaultLayoutsConts.ts +2 -0
- package/src/Player/AudioLayer/Layout/index.tsx +1 -7
- package/src/Player/AudioLayer/MagicBG/index.tsx +40 -22
- package/src/Player/index.tsx +45 -35
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@applicaster/quick-brick-player",
|
|
3
|
-
"version": "12.0.0-alpha.
|
|
3
|
+
"version": "12.0.0-alpha.5061452310",
|
|
4
4
|
"description": "Quick Brick Player",
|
|
5
5
|
"main": "./src/index.ts",
|
|
6
6
|
"types": "index.d.ts",
|
|
@@ -36,11 +36,11 @@
|
|
|
36
36
|
},
|
|
37
37
|
"homepage": "https://github.com/applicaster/quickbrick#readme",
|
|
38
38
|
"dependencies": {
|
|
39
|
-
"@applicaster/quick-brick-mobile-transport-controls": "12.0.0-rc.
|
|
39
|
+
"@applicaster/quick-brick-mobile-transport-controls": "12.0.0-rc.49",
|
|
40
40
|
"@applicaster/quick-brick-tv-transport-controls": "11.0.0-rc.133",
|
|
41
|
-
"@applicaster/zapp-react-native-tvos-app": "12.0.0-alpha.
|
|
42
|
-
"@applicaster/zapp-react-native-ui-components": "12.0.0-alpha.
|
|
43
|
-
"@applicaster/zapp-react-native-utils": "12.0.0-alpha.
|
|
41
|
+
"@applicaster/zapp-react-native-tvos-app": "12.0.0-alpha.5061452310",
|
|
42
|
+
"@applicaster/zapp-react-native-ui-components": "12.0.0-alpha.5061452310",
|
|
43
|
+
"@applicaster/zapp-react-native-utils": "12.0.0-alpha.5061452310",
|
|
44
44
|
"keymirror": "^0.1.1",
|
|
45
45
|
"query-string": "7.1.3",
|
|
46
46
|
"react-native-web-linear-gradient": "1.1.2",
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import * as React from "react";
|
|
2
|
-
import { ViewStyle, View
|
|
2
|
+
import { ViewStyle, View } from "react-native";
|
|
3
3
|
|
|
4
4
|
import { SafeAreaView, Edge } from "react-native-safe-area-context";
|
|
5
5
|
import { usePlayerState } from "@applicaster/zapp-react-native-utils/appUtils/playerManager/usePlayerState";
|
|
@@ -24,8 +24,14 @@ import {
|
|
|
24
24
|
NAMESPACE,
|
|
25
25
|
} from "./utils";
|
|
26
26
|
import { localStorage } from "@applicaster/zapp-react-native-bridge/ZappStorage/LocalStorage";
|
|
27
|
-
import { getLiveUrl } from "../Utils";
|
|
27
|
+
import { addQueryParam, getLiveUrl } from "../Utils";
|
|
28
28
|
import { useTitleSummaryOverlay } from "@applicaster/zapp-react-native-utils/appUtils/playerManager/usePlayerTitleSummaryOverlay";
|
|
29
|
+
import {
|
|
30
|
+
AnimationComponent,
|
|
31
|
+
ComponentAnimationType,
|
|
32
|
+
AnimatedScrollModal,
|
|
33
|
+
} from "@applicaster/zapp-react-native-ui-components/Components/VideoModal/ModalAnimation";
|
|
34
|
+
import { PADDING_HORIZONTAL } from "./Layout/defaultLayoutsConts";
|
|
29
35
|
|
|
30
36
|
const { log_debug } = createLogger({
|
|
31
37
|
subsystem: "UIComponent",
|
|
@@ -48,7 +54,7 @@ type Configuration = {
|
|
|
48
54
|
};
|
|
49
55
|
|
|
50
56
|
type Props = {
|
|
51
|
-
children
|
|
57
|
+
children?: React.ReactNode;
|
|
52
58
|
inline?: boolean;
|
|
53
59
|
docked?: boolean;
|
|
54
60
|
configuration: Configuration;
|
|
@@ -68,29 +74,20 @@ export const defaultAspectRatioWidth = (height: number): number =>
|
|
|
68
74
|
(height / 9) * 16;
|
|
69
75
|
|
|
70
76
|
const Styles = {
|
|
71
|
-
mainContainer: (
|
|
77
|
+
mainContainer: (style: ViewStyle) => {
|
|
72
78
|
const combinedStyle: ViewStyle = {
|
|
73
79
|
flex: 1,
|
|
74
80
|
};
|
|
75
81
|
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
style
|
|
79
|
-
}
|
|
80
|
-
|
|
81
|
-
return { ...combinedStyle, ...style };
|
|
82
|
-
},
|
|
83
|
-
playerContainer: (docked: boolean, style: ViewStyle) => {
|
|
84
|
-
const combinedStyle: ViewStyle = {
|
|
85
|
-
flex: 1,
|
|
82
|
+
return {
|
|
83
|
+
...combinedStyle,
|
|
84
|
+
...style,
|
|
86
85
|
};
|
|
87
|
-
|
|
88
|
-
if (docked) {
|
|
89
|
-
combinedStyle.height = style.height;
|
|
90
|
-
}
|
|
91
|
-
|
|
92
|
-
return combinedStyle;
|
|
93
86
|
},
|
|
87
|
+
playerContainer: {
|
|
88
|
+
flex: 1,
|
|
89
|
+
},
|
|
90
|
+
paddingHorizontal: { paddingTop: 0, paddingHorizontal: PADDING_HORIZONTAL },
|
|
94
91
|
|
|
95
92
|
controlsMobile: {
|
|
96
93
|
height: 50,
|
|
@@ -144,9 +141,9 @@ export const AudioPlayerWrapper: React.FC<Props> = (props: Props) => {
|
|
|
144
141
|
const isTablet = useIsTablet();
|
|
145
142
|
|
|
146
143
|
const isTabletLandscape = !isTV() && isTablet && !isTabletPortrait;
|
|
147
|
-
|
|
144
|
+
|
|
148
145
|
// TODO: Have generic place for live url from configuration. Currently its hardcoded for client.
|
|
149
|
-
|
|
146
|
+
|
|
150
147
|
const feedUrl = getLiveUrl(entry?.extensions?.live?.channel_src ?? "");
|
|
151
148
|
|
|
152
149
|
const { title, summary } = useTitleSummaryOverlay(
|
|
@@ -168,6 +165,9 @@ export const AudioPlayerWrapper: React.FC<Props> = (props: Props) => {
|
|
|
168
165
|
|
|
169
166
|
const [sleepTimerDate, setSleepTimerDate] = useState(0);
|
|
170
167
|
|
|
168
|
+
const [defaultDimensions, setDefaultDimensions] =
|
|
169
|
+
React.useState<Dimensions>(undefined);
|
|
170
|
+
|
|
171
171
|
const [dimensions, setDimensions] = React.useState<Dimensions>({
|
|
172
172
|
width: 0,
|
|
173
173
|
height: 0,
|
|
@@ -181,9 +181,11 @@ export const AudioPlayerWrapper: React.FC<Props> = (props: Props) => {
|
|
|
181
181
|
const { width, height } = event.nativeEvent.layout;
|
|
182
182
|
|
|
183
183
|
setDimensions({
|
|
184
|
-
width
|
|
184
|
+
width,
|
|
185
185
|
height,
|
|
186
186
|
});
|
|
187
|
+
|
|
188
|
+
if (!defaultDimensions) setDefaultDimensions({ width, height });
|
|
187
189
|
};
|
|
188
190
|
|
|
189
191
|
const cancelSleepTimer = async () => {
|
|
@@ -195,7 +197,6 @@ export const AudioPlayerWrapper: React.FC<Props> = (props: Props) => {
|
|
|
195
197
|
});
|
|
196
198
|
|
|
197
199
|
setSleepTimerDate(0);
|
|
198
|
-
player?.pause();
|
|
199
200
|
|
|
200
201
|
await localStorage.removeItem("sleep", NAMESPACE);
|
|
201
202
|
};
|
|
@@ -376,58 +377,64 @@ export const AudioPlayerWrapper: React.FC<Props> = (props: Props) => {
|
|
|
376
377
|
player?.seekTo(0);
|
|
377
378
|
}, [player]);
|
|
378
379
|
|
|
379
|
-
const edges = React.useMemo<Edge[]>(
|
|
380
|
-
() => (docked ? [] : ["right", "left", "top"]),
|
|
381
|
-
[docked]
|
|
382
|
-
);
|
|
380
|
+
const edges = React.useMemo<Edge[]>(() => ["right", "left", "top"], [docked]);
|
|
383
381
|
|
|
384
|
-
const ContainerView =
|
|
382
|
+
const ContainerView = SafeAreaView;
|
|
385
383
|
|
|
386
384
|
const MainContent = React.useMemo(() => {
|
|
387
385
|
return (
|
|
388
|
-
<ContainerView style={Styles.mainContainer(
|
|
389
|
-
<
|
|
390
|
-
|
|
391
|
-
|
|
386
|
+
<ContainerView style={Styles.mainContainer(style)} edges={edges}>
|
|
387
|
+
<AnimationComponent
|
|
388
|
+
animationType={ComponentAnimationType.moveUpComponent}
|
|
389
|
+
additionalData={{ saveArea: true }}
|
|
392
390
|
>
|
|
393
|
-
<
|
|
394
|
-
|
|
395
|
-
|
|
396
|
-
|
|
397
|
-
|
|
398
|
-
|
|
399
|
-
|
|
400
|
-
|
|
401
|
-
|
|
402
|
-
|
|
403
|
-
|
|
404
|
-
|
|
405
|
-
|
|
406
|
-
|
|
407
|
-
|
|
408
|
-
|
|
409
|
-
|
|
410
|
-
|
|
411
|
-
|
|
412
|
-
|
|
413
|
-
|
|
414
|
-
|
|
415
|
-
|
|
416
|
-
|
|
417
|
-
|
|
418
|
-
|
|
419
|
-
|
|
420
|
-
|
|
421
|
-
|
|
422
|
-
|
|
423
|
-
|
|
424
|
-
|
|
425
|
-
|
|
426
|
-
|
|
427
|
-
|
|
428
|
-
|
|
429
|
-
|
|
430
|
-
|
|
391
|
+
<AnimatedScrollModal>
|
|
392
|
+
<View style={Styles.playerContainer} onLayout={onLayout}>
|
|
393
|
+
<Layout
|
|
394
|
+
entry={entry}
|
|
395
|
+
playerState={playerState}
|
|
396
|
+
layoutState={layoutState}
|
|
397
|
+
value={value}
|
|
398
|
+
onPlaybackButtonPress={onPlaybackButtonPress}
|
|
399
|
+
onRewindButtonPress={onRewindButtonPress}
|
|
400
|
+
onForwardButtonPress={onForwardButtonPress}
|
|
401
|
+
onPlayerSeek={onPlayerSeek}
|
|
402
|
+
onSkipStart={onSkipStart}
|
|
403
|
+
onSpeedButtonPress={onSpeedButtonPress}
|
|
404
|
+
onSleepButtonPress={onSleepButtonPress}
|
|
405
|
+
playbackSpeedName={formatSpeed(playbackSpeed.value)}
|
|
406
|
+
playbackSleepName={
|
|
407
|
+
sleepTimer.value === 0 ? "sleep_timer" : "sleep_timer_active"
|
|
408
|
+
}
|
|
409
|
+
sleepTimerDate={sleepTimerDate}
|
|
410
|
+
cancelSleepTimer={cancelSleepTimer}
|
|
411
|
+
onSkipLive={onSkipLive}
|
|
412
|
+
onCloseVideoModal={onCloseVideoModal}
|
|
413
|
+
maximiseVideoModal={maximiseVideoModal}
|
|
414
|
+
configuration={configuration}
|
|
415
|
+
dimensions={dimensions}
|
|
416
|
+
playNextData={playNextData}
|
|
417
|
+
title={title}
|
|
418
|
+
summary={summary}
|
|
419
|
+
defaultDimensions={defaultDimensions}
|
|
420
|
+
/>
|
|
421
|
+
<View style={Styles.paddingHorizontal}>
|
|
422
|
+
{children}
|
|
423
|
+
<AnimationComponent
|
|
424
|
+
animationType={ComponentAnimationType.componentFade}
|
|
425
|
+
>
|
|
426
|
+
<PlayerDetails
|
|
427
|
+
configuration={configuration}
|
|
428
|
+
style={Styles.playerDetails}
|
|
429
|
+
entry={entry}
|
|
430
|
+
isTabletLandscape={isTabletLandscape}
|
|
431
|
+
isAudioPlayer={true}
|
|
432
|
+
/>
|
|
433
|
+
</AnimationComponent>
|
|
434
|
+
</View>
|
|
435
|
+
</View>
|
|
436
|
+
</AnimatedScrollModal>
|
|
437
|
+
</AnimationComponent>
|
|
431
438
|
</ContainerView>
|
|
432
439
|
);
|
|
433
440
|
}, [
|
|
@@ -456,17 +463,20 @@ export const AudioPlayerWrapper: React.FC<Props> = (props: Props) => {
|
|
|
456
463
|
if (configuration.magic_background) {
|
|
457
464
|
const baseUrl = entry?.extensions?.audio_player_background_image ?? "";
|
|
458
465
|
|
|
459
|
-
|
|
466
|
+
const queryParamName =
|
|
467
|
+
configuration.audio_player_background_image_query || "width";
|
|
468
|
+
|
|
469
|
+
const queryParamValue = 15;
|
|
460
470
|
|
|
461
|
-
|
|
462
|
-
// configuration.audio_player_background_image_query || "width";
|
|
463
|
-
//
|
|
464
|
-
// const queryParamValue = 15;
|
|
465
|
-
//
|
|
466
|
-
// const url = addQueryParam(baseUrl, queryParamName, queryParamValue);
|
|
471
|
+
const url = addQueryParam(baseUrl, queryParamName, queryParamValue);
|
|
467
472
|
|
|
468
473
|
return (
|
|
469
|
-
<MagicBG
|
|
474
|
+
<MagicBG
|
|
475
|
+
image={url}
|
|
476
|
+
fallbackUrl={baseUrl}
|
|
477
|
+
colors={entry?.extensions?.backgroundColors}
|
|
478
|
+
defaultColor="#000000"
|
|
479
|
+
>
|
|
470
480
|
{MainContent}
|
|
471
481
|
</MagicBG>
|
|
472
482
|
);
|
|
@@ -18,13 +18,21 @@ import {
|
|
|
18
18
|
rewindButton,
|
|
19
19
|
skipToStartButton,
|
|
20
20
|
skipToLiveButton,
|
|
21
|
+
PADDING_HORIZONTAL,
|
|
21
22
|
speedButton,
|
|
22
23
|
sleepButton,
|
|
23
24
|
} from "./defaultLayoutsConts";
|
|
24
25
|
import { AudioDescription } from "../AudioDescription";
|
|
25
26
|
import { PlayerImageBackground } from "@applicaster/zapp-react-native-ui-components/Components/PlayerImageBackground";
|
|
26
27
|
import { useLanguageData } from "@applicaster/zapp-react-native-utils/reactHooks/player";
|
|
28
|
+
import { PlayNextData } from "@applicaster/zapp-react-native-ui-components/Components/PlayerContainer/PlayerContainer";
|
|
27
29
|
import { useEffect, useMemo, useState } from "react";
|
|
30
|
+
import {
|
|
31
|
+
useModalAnimationContext,
|
|
32
|
+
AnimationComponent,
|
|
33
|
+
ComponentAnimationType,
|
|
34
|
+
} from "@applicaster/zapp-react-native-ui-components/Components/VideoModal/ModalAnimation";
|
|
35
|
+
import DockedLayout from "./DockedLayout";
|
|
28
36
|
|
|
29
37
|
type Dimensions = {
|
|
30
38
|
width: number;
|
|
@@ -60,9 +68,13 @@ type LayoutProps = {
|
|
|
60
68
|
onPlayerSeek: (targetTime: number) => void;
|
|
61
69
|
onSkipLive: () => void;
|
|
62
70
|
onSkipStart: () => void;
|
|
71
|
+
onCloseVideoModal: () => void;
|
|
72
|
+
maximiseVideoModal: () => void;
|
|
63
73
|
dimensions: Dimensions;
|
|
74
|
+
playNextData: PlayNextData;
|
|
64
75
|
title: string | number;
|
|
65
76
|
summary: string | number;
|
|
77
|
+
defaultDimensions: Dimensions;
|
|
66
78
|
};
|
|
67
79
|
|
|
68
80
|
const Styles = {
|
|
@@ -72,10 +84,13 @@ const Styles = {
|
|
|
72
84
|
alignItems: "center",
|
|
73
85
|
justifyContent: isPortraitMode ? "center" : "flex-start",
|
|
74
86
|
}),
|
|
75
|
-
|
|
76
|
-
width:
|
|
87
|
+
playerImageWrapper: {
|
|
88
|
+
width: "100%",
|
|
77
89
|
maxHeight: 750,
|
|
78
90
|
marginTop: 80,
|
|
91
|
+
},
|
|
92
|
+
tabletLayout: {
|
|
93
|
+
width: 463,
|
|
79
94
|
marginBottom: 80,
|
|
80
95
|
},
|
|
81
96
|
controls: (isTablet: boolean, isLiveShowFullControls: boolean) => ({
|
|
@@ -84,24 +99,31 @@ const Styles = {
|
|
|
84
99
|
justifyContent: isLiveShowFullControls ? "space-between" : "space-evenly",
|
|
85
100
|
}),
|
|
86
101
|
backgroundImageContainer: (dimensions: Dimensions, isTablet: boolean) => {
|
|
102
|
+
const mobileValue = dimensions.width
|
|
103
|
+
? dimensions.width - PADDING_HORIZONTAL * 2
|
|
104
|
+
: 330;
|
|
105
|
+
|
|
87
106
|
return {
|
|
88
|
-
width: isTablet ? 463 :
|
|
89
|
-
height: isTablet ? 463 :
|
|
107
|
+
width: isTablet ? 463 : mobileValue,
|
|
108
|
+
height: isTablet ? 463 : mobileValue,
|
|
90
109
|
};
|
|
91
110
|
},
|
|
92
|
-
backgroundImageContainerImageStyle: (
|
|
93
|
-
|
|
111
|
+
backgroundImageContainerImageStyle: (
|
|
112
|
+
isTablet,
|
|
113
|
+
docked,
|
|
114
|
+
startComponentsAnimation,
|
|
115
|
+
isActiveGesture
|
|
116
|
+
) => ({
|
|
117
|
+
borderRadius:
|
|
118
|
+
(startComponentsAnimation && isActiveGesture) || docked
|
|
119
|
+
? 0
|
|
120
|
+
: isTablet
|
|
121
|
+
? 24
|
|
122
|
+
: 10,
|
|
94
123
|
}),
|
|
95
|
-
playerContainer: (docked: boolean, style) => {
|
|
96
|
-
const combinedStyle = {
|
|
97
|
-
flex: 1,
|
|
98
|
-
};
|
|
99
|
-
|
|
100
|
-
if (docked) {
|
|
101
|
-
combinedStyle["height"] = style.height;
|
|
102
|
-
}
|
|
103
124
|
|
|
104
|
-
|
|
125
|
+
paddingHorizontal: {
|
|
126
|
+
paddingHorizontal: PADDING_HORIZONTAL,
|
|
105
127
|
},
|
|
106
128
|
|
|
107
129
|
controlsMobile: {
|
|
@@ -115,6 +137,12 @@ const Styles = {
|
|
|
115
137
|
separator: {
|
|
116
138
|
height: 20,
|
|
117
139
|
},
|
|
140
|
+
flexDirectionRow: {
|
|
141
|
+
flexDirection: "row",
|
|
142
|
+
},
|
|
143
|
+
alignItemsCenter: {
|
|
144
|
+
alignItems: "center",
|
|
145
|
+
},
|
|
118
146
|
};
|
|
119
147
|
|
|
120
148
|
export default function DefaultLayout(props: LayoutProps) {
|
|
@@ -139,12 +167,14 @@ export default function DefaultLayout(props: LayoutProps) {
|
|
|
139
167
|
sleepTimerDate,
|
|
140
168
|
title,
|
|
141
169
|
summary,
|
|
170
|
+
defaultDimensions,
|
|
142
171
|
} = props;
|
|
143
172
|
|
|
144
173
|
const isTablet = useIsTablet();
|
|
145
174
|
const { width, height } = dimensions;
|
|
146
175
|
const isPortraitMode = width < height;
|
|
147
176
|
const isLiveContent = playerState.isLive;
|
|
177
|
+
const docked = layoutState.docked;
|
|
148
178
|
|
|
149
179
|
const languageData = useLanguageData("audio-player");
|
|
150
180
|
|
|
@@ -283,71 +313,120 @@ export default function DefaultLayout(props: LayoutProps) {
|
|
|
283
313
|
const needsToShowProgressBar =
|
|
284
314
|
(isLiveContent && liveSeekingEnabled) || !isLiveContent;
|
|
285
315
|
|
|
316
|
+
const defaultImageDimensions = React.useMemo(
|
|
317
|
+
() =>
|
|
318
|
+
defaultDimensions &&
|
|
319
|
+
Styles.backgroundImageContainer(defaultDimensions, isTablet),
|
|
320
|
+
[defaultDimensions]
|
|
321
|
+
);
|
|
322
|
+
|
|
323
|
+
const { isActiveGesture, startComponentsAnimation } =
|
|
324
|
+
useModalAnimationContext();
|
|
325
|
+
|
|
286
326
|
return (
|
|
287
327
|
<View
|
|
288
328
|
style={
|
|
289
329
|
isTablet ? Styles.tabletContainer(isPortraitMode) : Styles.container
|
|
290
330
|
}
|
|
291
331
|
>
|
|
292
|
-
<
|
|
293
|
-
|
|
294
|
-
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
|
|
298
|
-
|
|
299
|
-
|
|
300
|
-
|
|
301
|
-
|
|
302
|
-
|
|
303
|
-
}
|
|
332
|
+
<AnimationComponent animationType={ComponentAnimationType.componentFade}>
|
|
333
|
+
<TransportInfo
|
|
334
|
+
content={entry}
|
|
335
|
+
value={value}
|
|
336
|
+
visible={true}
|
|
337
|
+
languageData={languageData}
|
|
338
|
+
layoutState={layoutState}
|
|
339
|
+
actionButtons={actionButtons}
|
|
340
|
+
/>
|
|
341
|
+
</AnimationComponent>
|
|
342
|
+
<AnimationComponent
|
|
343
|
+
animationType={ComponentAnimationType.moveUpComponent}
|
|
344
|
+
style={isTablet ? Styles.playerImageWrapper : null}
|
|
304
345
|
>
|
|
305
|
-
<
|
|
346
|
+
<AnimationComponent
|
|
347
|
+
animationType={ComponentAnimationType.moveComponentHorizontal}
|
|
348
|
+
additionalData={{
|
|
349
|
+
disableAnimatedComponent: !isTablet,
|
|
350
|
+
moveValue: (dimensions.width - 463) / 2,
|
|
351
|
+
extraAnimation: !isTablet
|
|
352
|
+
? {
|
|
353
|
+
[ComponentAnimationType.audioPlayerPaddingHorizontal]: {
|
|
354
|
+
style: Styles.paddingHorizontal,
|
|
355
|
+
},
|
|
356
|
+
}
|
|
357
|
+
: null,
|
|
358
|
+
}}
|
|
359
|
+
style={isTablet ? Styles.alignItemsCenter : null}
|
|
360
|
+
>
|
|
306
361
|
<PlayerImageBackground
|
|
307
362
|
entry={entry}
|
|
308
363
|
style={Styles.backgroundImageContainer(dimensions, isTablet)}
|
|
309
|
-
imageStyle={Styles.backgroundImageContainerImageStyle(
|
|
310
|
-
|
|
311
|
-
|
|
312
|
-
|
|
313
|
-
|
|
314
|
-
|
|
315
|
-
|
|
364
|
+
imageStyle={Styles.backgroundImageContainerImageStyle(
|
|
365
|
+
isTablet,
|
|
366
|
+
docked,
|
|
367
|
+
startComponentsAnimation,
|
|
368
|
+
isActiveGesture
|
|
369
|
+
)}
|
|
370
|
+
defaultImageDimensions={defaultImageDimensions}
|
|
316
371
|
/>
|
|
317
|
-
|
|
318
|
-
|
|
319
|
-
|
|
320
|
-
|
|
321
|
-
|
|
322
|
-
|
|
323
|
-
|
|
324
|
-
|
|
325
|
-
|
|
326
|
-
|
|
327
|
-
|
|
328
|
-
|
|
329
|
-
|
|
330
|
-
|
|
331
|
-
|
|
332
|
-
|
|
333
|
-
|
|
372
|
+
</AnimationComponent>
|
|
373
|
+
|
|
374
|
+
<DockedLayout {...props} />
|
|
375
|
+
</AnimationComponent>
|
|
376
|
+
<View
|
|
377
|
+
style={[
|
|
378
|
+
Styles.paddingHorizontal,
|
|
379
|
+
isTablet ? Styles.tabletLayout : null,
|
|
380
|
+
]}
|
|
381
|
+
>
|
|
382
|
+
{!docked && (
|
|
383
|
+
<AnimationComponent
|
|
384
|
+
animationType={ComponentAnimationType.componentFade}
|
|
385
|
+
>
|
|
386
|
+
<AudioDescription
|
|
387
|
+
title={title}
|
|
388
|
+
summary={summary}
|
|
389
|
+
value={value}
|
|
390
|
+
layoutState={layoutState}
|
|
391
|
+
/>
|
|
392
|
+
<Separator />
|
|
393
|
+
{needsToShowProgressBar && (
|
|
394
|
+
<View>
|
|
395
|
+
<ProgressBar
|
|
396
|
+
content={entry}
|
|
334
397
|
value={value}
|
|
335
|
-
|
|
398
|
+
visible={true}
|
|
399
|
+
layoutState={layoutState}
|
|
400
|
+
onPlayerSeek={onPlayerSeek}
|
|
401
|
+
playerState={playerState}
|
|
402
|
+
disableFullscreen={true}
|
|
403
|
+
sliderStyle={2}
|
|
336
404
|
/>
|
|
337
|
-
)}
|
|
338
405
|
|
|
339
|
-
|
|
340
|
-
|
|
341
|
-
|
|
342
|
-
|
|
343
|
-
|
|
344
|
-
|
|
345
|
-
|
|
346
|
-
|
|
347
|
-
|
|
348
|
-
|
|
349
|
-
|
|
350
|
-
|
|
406
|
+
{showCounter && timeLeft >= 0 && (
|
|
407
|
+
<CountDown
|
|
408
|
+
timeLeft={timeLeft}
|
|
409
|
+
value={value}
|
|
410
|
+
title={sleepTitle}
|
|
411
|
+
/>
|
|
412
|
+
)}
|
|
413
|
+
|
|
414
|
+
<Separator />
|
|
415
|
+
</View>
|
|
416
|
+
)}
|
|
417
|
+
<Controls
|
|
418
|
+
value={value}
|
|
419
|
+
visible={true}
|
|
420
|
+
keepAlive={null}
|
|
421
|
+
buttons={controlButtons}
|
|
422
|
+
style={Styles.controls(
|
|
423
|
+
isTablet,
|
|
424
|
+
isLiveContent && showFullControls
|
|
425
|
+
)}
|
|
426
|
+
playerState={playerState}
|
|
427
|
+
/>
|
|
428
|
+
</AnimationComponent>
|
|
429
|
+
)}
|
|
351
430
|
</View>
|
|
352
431
|
</View>
|
|
353
432
|
);
|
|
@@ -15,8 +15,13 @@ import {
|
|
|
15
15
|
Button,
|
|
16
16
|
} from "@applicaster/quick-brick-mobile-transport-controls";
|
|
17
17
|
|
|
18
|
-
import { PlayerImageBackground } from "@applicaster/zapp-react-native-ui-components/Components/PlayerImageBackground";
|
|
19
18
|
import { PlayNextData } from "@applicaster/zapp-react-native-ui-components/Components/PlayerContainer/PlayerContainer";
|
|
19
|
+
import {
|
|
20
|
+
useModalAnimationContext,
|
|
21
|
+
AnimationComponent,
|
|
22
|
+
ComponentAnimationType,
|
|
23
|
+
PlayerAnimationStateEnum,
|
|
24
|
+
} from "@applicaster/zapp-react-native-ui-components/Components/VideoModal/ModalAnimation";
|
|
20
25
|
|
|
21
26
|
type Dimensions = {
|
|
22
27
|
width: number;
|
|
@@ -104,14 +109,26 @@ const backgroundColorStyle = (value: GetValue): ViewStyle => ({
|
|
|
104
109
|
backgroundColor: value("docked_player_background_color"),
|
|
105
110
|
});
|
|
106
111
|
|
|
107
|
-
const playerDimensionsStyle = (
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
112
|
+
const playerDimensionsStyle = (
|
|
113
|
+
minimisedHeight: number,
|
|
114
|
+
addPadding: boolean
|
|
115
|
+
): ViewStyle => ({
|
|
116
|
+
paddingLeft: addPadding ? minimisedHeight || 100 : 0,
|
|
111
117
|
});
|
|
112
118
|
|
|
113
|
-
const
|
|
114
|
-
|
|
119
|
+
const animatedContainerStyle = (docked: boolean): ViewStyle => ({
|
|
120
|
+
top: docked ? 2 : null,
|
|
121
|
+
position: "absolute",
|
|
122
|
+
width: "100%",
|
|
123
|
+
zIndex: docked ? 1 : -1,
|
|
124
|
+
});
|
|
125
|
+
|
|
126
|
+
const backgroundImageStyle = (
|
|
127
|
+
dimensions: Dimensions,
|
|
128
|
+
minimisedHeight: number,
|
|
129
|
+
isActiveGesture: boolean
|
|
130
|
+
): ViewStyle => ({
|
|
131
|
+
height: isActiveGesture ? minimisedHeight : dimensions.height,
|
|
115
132
|
aspectRatio: 1,
|
|
116
133
|
position: "absolute",
|
|
117
134
|
});
|
|
@@ -193,7 +210,6 @@ export default function DockedLayout(props: LayoutProps) {
|
|
|
193
210
|
dimensions,
|
|
194
211
|
entry,
|
|
195
212
|
onCloseVideoModal,
|
|
196
|
-
maximiseVideoModal,
|
|
197
213
|
onPlayerSeek,
|
|
198
214
|
playerState,
|
|
199
215
|
configuration,
|
|
@@ -207,9 +223,29 @@ export default function DockedLayout(props: LayoutProps) {
|
|
|
207
223
|
const visible = true;
|
|
208
224
|
const liveButton = Boolean(value("live_badge_enabled"));
|
|
209
225
|
|
|
226
|
+
const {
|
|
227
|
+
isActiveGesture,
|
|
228
|
+
setPlayerAnimationState,
|
|
229
|
+
startComponentsAnimation,
|
|
230
|
+
minimisedHeight,
|
|
231
|
+
} = useModalAnimationContext();
|
|
232
|
+
|
|
233
|
+
const maximazeVideoModal = React.useCallback(
|
|
234
|
+
() => setPlayerAnimationState(PlayerAnimationStateEnum.maximaze),
|
|
235
|
+
[]
|
|
236
|
+
);
|
|
237
|
+
|
|
238
|
+
if (!layoutState.docked && !startComponentsAnimation) return null;
|
|
239
|
+
|
|
210
240
|
return (
|
|
211
|
-
<
|
|
212
|
-
{
|
|
241
|
+
<AnimationComponent
|
|
242
|
+
animationType={ComponentAnimationType.componentAppears}
|
|
243
|
+
style={[
|
|
244
|
+
styles.container,
|
|
245
|
+
animatedContainerStyle(isActiveGesture || layoutState.docked),
|
|
246
|
+
]}
|
|
247
|
+
>
|
|
248
|
+
{!playerState.isLive && layoutState.docked && (
|
|
213
249
|
<ProgressBar
|
|
214
250
|
content={entry}
|
|
215
251
|
value={value}
|
|
@@ -217,18 +253,27 @@ export default function DockedLayout(props: LayoutProps) {
|
|
|
217
253
|
layoutState={layoutState}
|
|
218
254
|
onPlayerSeek={onPlayerSeek}
|
|
219
255
|
playerState={playerState}
|
|
256
|
+
docked
|
|
220
257
|
/>
|
|
221
258
|
)}
|
|
222
259
|
|
|
223
260
|
<View style={styles.content}>
|
|
224
|
-
<
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
261
|
+
<View
|
|
262
|
+
style={backgroundImageStyle(
|
|
263
|
+
dimensions,
|
|
264
|
+
minimisedHeight,
|
|
265
|
+
isActiveGesture
|
|
266
|
+
)}
|
|
228
267
|
/>
|
|
229
|
-
<TouchableWithoutFeedback onPress={
|
|
268
|
+
<TouchableWithoutFeedback onPress={maximazeVideoModal}>
|
|
230
269
|
<View
|
|
231
|
-
style={[
|
|
270
|
+
style={[
|
|
271
|
+
styles.touchableArea,
|
|
272
|
+
playerDimensionsStyle(
|
|
273
|
+
minimisedHeight,
|
|
274
|
+
isActiveGesture || layoutState.docked
|
|
275
|
+
),
|
|
276
|
+
]}
|
|
232
277
|
>
|
|
233
278
|
<View
|
|
234
279
|
style={[
|
|
@@ -272,6 +317,6 @@ export default function DockedLayout(props: LayoutProps) {
|
|
|
272
317
|
/>
|
|
273
318
|
</View>
|
|
274
319
|
</View>
|
|
275
|
-
</
|
|
320
|
+
</AnimationComponent>
|
|
276
321
|
);
|
|
277
322
|
}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import React from "react";
|
|
2
2
|
import DefaultLayout from "./DefaultLayout";
|
|
3
|
-
import DockedLayout from "./DockedLayout";
|
|
4
3
|
import { PlayNextData } from "@applicaster/zapp-react-native-ui-components/Components/PlayerContainer/PlayerContainer";
|
|
5
4
|
|
|
6
5
|
type Dimensions = {
|
|
@@ -40,6 +39,7 @@ type LayoutProps = {
|
|
|
40
39
|
onSkipLive: () => void;
|
|
41
40
|
maximiseVideoModal: () => void;
|
|
42
41
|
dimensions: Dimensions;
|
|
42
|
+
defaultDimensions: Dimensions;
|
|
43
43
|
playNextData: PlayNextData;
|
|
44
44
|
title: string | number;
|
|
45
45
|
summary: string | number;
|
|
@@ -48,11 +48,5 @@ type LayoutProps = {
|
|
|
48
48
|
export default function Layout(
|
|
49
49
|
props: LayoutProps
|
|
50
50
|
): React.ReactElement<LayoutProps> {
|
|
51
|
-
const { layoutState } = props;
|
|
52
|
-
|
|
53
|
-
if (layoutState.docked) {
|
|
54
|
-
return <DockedLayout {...props} />;
|
|
55
|
-
}
|
|
56
|
-
|
|
57
51
|
return <DefaultLayout {...props} />;
|
|
58
52
|
}
|
|
@@ -11,9 +11,10 @@ type MagicBGProps = {
|
|
|
11
11
|
image: string;
|
|
12
12
|
fallbackUrl?: string;
|
|
13
13
|
defaultColor: string;
|
|
14
|
+
colors: string[]; // Updated to type string[] as it holds hex values
|
|
14
15
|
};
|
|
15
16
|
|
|
16
|
-
const
|
|
17
|
+
const defaultColors = {
|
|
17
18
|
overlay: "rgba(0, 0, 0, 0.35)",
|
|
18
19
|
defaultGradientStart: "rgba(0, 0, 0, 0.25)",
|
|
19
20
|
defaultGradientEnd: "rgba(0, 0, 0, 0)",
|
|
@@ -25,7 +26,7 @@ const styles = StyleSheet.create({
|
|
|
25
26
|
},
|
|
26
27
|
fullScreenOverlay: {
|
|
27
28
|
...StyleSheet.absoluteFillObject,
|
|
28
|
-
backgroundColor:
|
|
29
|
+
backgroundColor: defaultColors.overlay,
|
|
29
30
|
},
|
|
30
31
|
gradientOverlay: {
|
|
31
32
|
position: "absolute",
|
|
@@ -54,46 +55,63 @@ export const MagicBG: React.FC<MagicBGProps> = ({
|
|
|
54
55
|
children,
|
|
55
56
|
image,
|
|
56
57
|
fallbackUrl = "",
|
|
58
|
+
colors = [],
|
|
57
59
|
defaultColor,
|
|
58
60
|
}) => {
|
|
59
61
|
const [dominantColor, setDominantColor] =
|
|
60
62
|
React.useState<string>(defaultColor);
|
|
61
63
|
|
|
62
64
|
const [gradientColors, setGradientColors] = React.useState<string[]>([
|
|
63
|
-
|
|
64
|
-
|
|
65
|
+
defaultColors.defaultGradientStart,
|
|
66
|
+
defaultColors.defaultGradientEnd,
|
|
65
67
|
]);
|
|
66
68
|
|
|
67
69
|
useEffect(() => {
|
|
68
70
|
const fetchColors = async () => {
|
|
69
|
-
if
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
setDominantColor(dominantColor);
|
|
77
|
-
} catch (error) {
|
|
71
|
+
// Check if colors are provided and not empty
|
|
72
|
+
if (colors && colors.length > 0) {
|
|
73
|
+
// Use provided colors for gradient and dominant color
|
|
74
|
+
setGradientColors(colors.slice(0, 2)); // First 2 colors for gradient
|
|
75
|
+
setDominantColor(colors[0]); // First color as dominant
|
|
76
|
+
} else if (image) {
|
|
77
|
+
// If no colors, try fetching from image
|
|
78
78
|
try {
|
|
79
79
|
const { gradientColors, dominantColor } =
|
|
80
|
-
await fetchPaletteAndDominantColor(
|
|
80
|
+
await fetchPaletteAndDominantColor(image);
|
|
81
81
|
|
|
82
82
|
setGradientColors(gradientColors);
|
|
83
83
|
setDominantColor(dominantColor);
|
|
84
|
-
} catch {
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
84
|
+
} catch (error) {
|
|
85
|
+
// If image fetch fails, try fallback URL
|
|
86
|
+
try {
|
|
87
|
+
const { gradientColors, dominantColor } =
|
|
88
|
+
await fetchPaletteAndDominantColor(fallbackUrl);
|
|
89
|
+
|
|
90
|
+
setGradientColors(gradientColors);
|
|
91
|
+
setDominantColor(dominantColor);
|
|
92
|
+
} catch {
|
|
93
|
+
// If everything fails, use default color
|
|
94
|
+
setGradientColors([
|
|
95
|
+
defaultColors.defaultGradientStart,
|
|
96
|
+
defaultColors.defaultGradientEnd,
|
|
97
|
+
]);
|
|
98
|
+
|
|
99
|
+
setDominantColor(defaultColor);
|
|
100
|
+
}
|
|
91
101
|
}
|
|
102
|
+
} else {
|
|
103
|
+
// If no image or colors, use default color
|
|
104
|
+
setGradientColors([
|
|
105
|
+
defaultColors.defaultGradientStart,
|
|
106
|
+
defaultColors.defaultGradientEnd,
|
|
107
|
+
]);
|
|
108
|
+
|
|
109
|
+
setDominantColor(defaultColor);
|
|
92
110
|
}
|
|
93
111
|
};
|
|
94
112
|
|
|
95
113
|
fetchColors();
|
|
96
|
-
}, [
|
|
114
|
+
}, []);
|
|
97
115
|
|
|
98
116
|
return (
|
|
99
117
|
<View style={[styles.container, { backgroundColor: dominantColor }]}>
|
package/src/Player/index.tsx
CHANGED
|
@@ -38,6 +38,10 @@ import { getAllAccessibilityProps } from "@applicaster/zapp-react-native-utils/c
|
|
|
38
38
|
import { PlayNextData } from "@applicaster/zapp-react-native-ui-components/Components/PlayerContainer/PlayerContainer";
|
|
39
39
|
import { getTargetScreenDataFromEntry } from "@applicaster/zapp-react-native-utils/reactHooks/screen/useTargetScreenData";
|
|
40
40
|
import { isAppleTV } from "@applicaster/zapp-react-native-ui-components/Helpers/Platform";
|
|
41
|
+
import {
|
|
42
|
+
AnimationComponent,
|
|
43
|
+
ComponentAnimationType,
|
|
44
|
+
} from "@applicaster/zapp-react-native-ui-components/Components/VideoModal/ModalAnimation";
|
|
41
45
|
|
|
42
46
|
const RNPlayerManager = {
|
|
43
47
|
QuickBrickPlayerPlugin: isApplePlatform()
|
|
@@ -57,6 +61,7 @@ const styles = StyleSheet.create({
|
|
|
57
61
|
position: "absolute",
|
|
58
62
|
zIndex: 1,
|
|
59
63
|
},
|
|
64
|
+
playerSize: { width: "100%", height: "100%" },
|
|
60
65
|
});
|
|
61
66
|
|
|
62
67
|
const logger = createLogger({
|
|
@@ -853,11 +858,10 @@ export default class VideoPlayer extends React.Component<
|
|
|
853
858
|
!!this.props.controller?.supportsNativeControls?.();
|
|
854
859
|
|
|
855
860
|
const controls = isAppleTV()
|
|
856
|
-
? supportsNativeControls && isInlineTV && !this.getPlayNextData()
|
|
861
|
+
? supportsNativeControls && !isInlineTV && !this.getPlayNextData()
|
|
857
862
|
: supportsNativeControls && !this.getPlayNextData();
|
|
858
863
|
|
|
859
|
-
const shouldUseNativeControls =
|
|
860
|
-
controls && supportsNativeControls && !docked;
|
|
864
|
+
const shouldUseNativeControls = controls && !docked;
|
|
861
865
|
|
|
862
866
|
platformSpecificProps = {
|
|
863
867
|
...platformSpecificProps,
|
|
@@ -1010,8 +1014,6 @@ export default class VideoPlayer extends React.Component<
|
|
|
1010
1014
|
this.props.mode !== "PIP";
|
|
1011
1015
|
|
|
1012
1016
|
if (shouldUseNativeControls) {
|
|
1013
|
-
logger.debug({ message: "Use native controls" });
|
|
1014
|
-
|
|
1015
1017
|
return null;
|
|
1016
1018
|
}
|
|
1017
1019
|
|
|
@@ -1071,22 +1073,7 @@ export default class VideoPlayer extends React.Component<
|
|
|
1071
1073
|
{...nativeProps}
|
|
1072
1074
|
/>
|
|
1073
1075
|
)}
|
|
1074
|
-
<AudioPlayerWrapper {...sharedWrapperViewProps}
|
|
1075
|
-
<View>
|
|
1076
|
-
{
|
|
1077
|
-
<PlayNextOverlay
|
|
1078
|
-
item={entry}
|
|
1079
|
-
playerIsDocked={docked}
|
|
1080
|
-
pluginConfiguration={this.getPluginConfiguration()}
|
|
1081
|
-
playerId={this.props.playerId}
|
|
1082
|
-
playNextData={this.getPlayNextData()}
|
|
1083
|
-
setNextVideoPreloadThresholdPercentage={
|
|
1084
|
-
this.props.setNextVideoPreloadThresholdPercentage
|
|
1085
|
-
}
|
|
1086
|
-
/>
|
|
1087
|
-
}
|
|
1088
|
-
</View>
|
|
1089
|
-
</AudioPlayerWrapper>
|
|
1076
|
+
<AudioPlayerWrapper {...sharedWrapperViewProps} />
|
|
1090
1077
|
</View>
|
|
1091
1078
|
) : (
|
|
1092
1079
|
<PlayerWrapper {...sharedWrapperViewProps}>
|
|
@@ -1101,11 +1088,24 @@ export default class VideoPlayer extends React.Component<
|
|
|
1101
1088
|
<View style={styles.container}>
|
|
1102
1089
|
<View style={[playerContainerStyles, playerDimensions]}>
|
|
1103
1090
|
{isAudioItem && (
|
|
1104
|
-
<
|
|
1105
|
-
|
|
1106
|
-
|
|
1107
|
-
|
|
1108
|
-
|
|
1091
|
+
<AnimationComponent
|
|
1092
|
+
animationType={ComponentAnimationType.player}
|
|
1093
|
+
additionalData={{
|
|
1094
|
+
...playerDimensions,
|
|
1095
|
+
inlineAudioPlayer: true,
|
|
1096
|
+
}}
|
|
1097
|
+
style={getStyle(playerDimensions)}
|
|
1098
|
+
>
|
|
1099
|
+
<AudioPlayer
|
|
1100
|
+
style={
|
|
1101
|
+
isTV()
|
|
1102
|
+
? getStyle(playerDimensions)
|
|
1103
|
+
: styles.playerSize
|
|
1104
|
+
}
|
|
1105
|
+
audio_item={entry}
|
|
1106
|
+
plugin_configuration={this.getPluginConfiguration()}
|
|
1107
|
+
/>
|
|
1108
|
+
</AnimationComponent>
|
|
1109
1109
|
)}
|
|
1110
1110
|
|
|
1111
1111
|
{shouldRenderBackground && (
|
|
@@ -1118,17 +1118,27 @@ export default class VideoPlayer extends React.Component<
|
|
|
1118
1118
|
)}
|
|
1119
1119
|
|
|
1120
1120
|
{!castAction?.state?.connected && (
|
|
1121
|
-
<
|
|
1122
|
-
|
|
1123
|
-
{
|
|
1124
|
-
{...nativeProps}
|
|
1125
|
-
listener={this.props.listener}
|
|
1121
|
+
<AnimationComponent
|
|
1122
|
+
animationType={ComponentAnimationType.player}
|
|
1123
|
+
additionalData={playerDimensions}
|
|
1126
1124
|
style={getStyle(playerDimensions)}
|
|
1127
|
-
pluginConfiguration={this.getPluginConfiguration()}
|
|
1128
|
-
controller={this.props.controller}
|
|
1129
1125
|
>
|
|
1130
|
-
|
|
1131
|
-
|
|
1126
|
+
<this.props.PlayerComponent
|
|
1127
|
+
ref={this._assignRoot}
|
|
1128
|
+
{...nativeEvents}
|
|
1129
|
+
{...nativeProps}
|
|
1130
|
+
listener={this.props.listener}
|
|
1131
|
+
style={
|
|
1132
|
+
isTV()
|
|
1133
|
+
? getStyle(playerDimensions)
|
|
1134
|
+
: styles.playerSize
|
|
1135
|
+
}
|
|
1136
|
+
pluginConfiguration={this.getPluginConfiguration()}
|
|
1137
|
+
controller={this.props.controller}
|
|
1138
|
+
>
|
|
1139
|
+
{this.childrenWithPlayNext()}
|
|
1140
|
+
</this.props.PlayerComponent>
|
|
1141
|
+
</AnimationComponent>
|
|
1132
1142
|
)}
|
|
1133
1143
|
</View>
|
|
1134
1144
|
|