feat: add bottom gradient

This commit is contained in:
Bettenbuk Zoltan 2019-07-12 10:06:49 +02:00 committed by Zoltan Bettenbuk
parent 250c61279b
commit a25a504a59
2 changed files with 49 additions and 14 deletions

View File

@ -2,6 +2,7 @@
import React from 'react';
import { NativeModules, SafeAreaView, StatusBar, View } from 'react-native';
import LinearGradient from 'react-native-linear-gradient';
import { appNavigate } from '../../../app';
import { PIP_ENABLED, getFeatureFlag } from '../../../base/flags';
@ -34,7 +35,7 @@ import {
} from '../AbstractConference';
import Labels from './Labels';
import NavigationBar from './NavigationBar';
import styles from './styles';
import styles, { NAVBAR_GRADIENT_COLORS } from './styles';
import type { AbstractProps } from '../AbstractConference';
@ -199,10 +200,14 @@ class Conference extends AbstractConference<Props, *> {
render() {
const {
_connecting,
_filmstripVisible,
_largeVideoParticipantId,
_reducedUI,
_shouldDisplayTileView
_shouldDisplayTileView,
_toolboxVisible
} = this.props;
const showGradient = _toolboxVisible;
const applyGradientStretching = _filmstripVisible && isNarrowAspectRatio(this) && !_shouldDisplayTileView;
return (
<Container style = { styles.conference }>
@ -242,6 +247,22 @@ class Conference extends AbstractConference<Props, *> {
pointerEvents = 'box-none'
style = { styles.toolboxAndFilmstripContainer }>
{ showGradient && <LinearGradient
colors = { NAVBAR_GRADIENT_COLORS }
end = {{
x: 0.0,
y: 0.0
}}
pointerEvents = 'none'
start = {{
x: 0.0,
y: applyGradientStretching ? 0.5 : 1.0
}}
style = { [
styles.bottomGradient,
applyGradientStretching ? styles.gradientStretchBottom : undefined
] } />}
<Labels />
<Captions onPress = { this._onClick } />
@ -249,7 +270,7 @@ class Conference extends AbstractConference<Props, *> {
{ _shouldDisplayTileView || <DisplayNameLabel participantId = { _largeVideoParticipantId } /> }
{/*
* The Toolbox is in a stacking layer bellow the Filmstrip.
* The Toolbox is in a stacking layer below the Filmstrip.
*/}
<Toolbox />

View File

@ -1,18 +1,27 @@
import {
BoxModel,
ColorPalette,
createStyleSheet,
fixAndroidViewClipping
} from '../../../base/styles';
import { BoxModel, ColorPalette, fixAndroidViewClipping } from '../../../base/styles';
import { FILMSTRIP_SIZE } from '../../../filmstrip';
export const NAVBAR_GRADIENT_COLORS = [ 'black', '#00000000' ];
export const NAVBAR_GRADIENT_COLORS = [ '#0000007F', '#00000000' ];
// From brand guideline
const GRADIENT_HEIGHT = 116;
/**
* The styles of the feature conference.
*/
export default createStyleSheet({
export default {
bottomGradient: {
bottom: 0,
flexDirection: 'column',
justifyContent: 'flex-end',
minHeight: GRADIENT_HEIGHT,
left: 0,
position: 'absolute',
right: 0
},
/**
* {@code Conference} style.
*/
@ -30,8 +39,12 @@ export default createStyleSheet({
flex: 1
},
gradientStretchBottom: {
height: GRADIENT_HEIGHT + FILMSTRIP_SIZE
},
gradientStretch: {
height: 116
height: GRADIENT_HEIGHT
},
/**
@ -112,10 +125,11 @@ export default createStyleSheet({
* the {@link Toolbox}.
*/
toolboxAndFilmstripContainer: {
bottom: BoxModel.margin,
bottom: 0,
flexDirection: 'column',
justifyContent: 'flex-end',
left: 0,
paddingBottom: BoxModel.padding,
position: 'absolute',
right: 0,
@ -124,4 +138,4 @@ export default createStyleSheet({
// not enough.
top: BoxModel.margin * 3
}
});
};