haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(rn,ui) move top labels to navbar component

This commit is contained in:
Saúl Ibarra Corretgé 2021-03-18 11:56:06 +01:00 committed by Saúl Ibarra Corretgé
parent 2f5ab2757f
commit 6b4d25c0d3
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
react/features/conference/components/native/Conference.js
View File

@ -33,7 +33,6 @@ import {
} from '../AbstractConference'; } from '../AbstractConference';
import type { AbstractProps } from '../AbstractConference'; import type { AbstractProps } from '../AbstractConference';
import Labels from './Labels';
import LonelyMeetingExperience from './LonelyMeetingExperience'; import LonelyMeetingExperience from './LonelyMeetingExperience';
import NavigationBar from './NavigationBar'; import NavigationBar from './NavigationBar';
import styles from './styles'; import styles from './styles';
@ -277,8 +276,6 @@ class Conference extends AbstractConference<Props, *> {
pointerEvents = 'box-none' pointerEvents = 'box-none'
style = { styles.toolboxAndFilmstripContainer }> style = { styles.toolboxAndFilmstripContainer }>
<Labels />
<Captions onPress = { this._onClick } /> <Captions onPress = { this._onClick } />
{ _shouldDisplayTileView || <Container style = { styles.displayNameContainer }> { _shouldDisplayTileView || <Container style = { styles.displayNameContainer }>

2
react/features/conference/components/native/NavigationBar.js
View File

@ -10,6 +10,7 @@ import { PictureInPictureButton } from '../../../mobile/picture-in-picture';
import { isToolboxVisible } from '../../../toolbox/functions.native'; import { isToolboxVisible } from '../../../toolbox/functions.native';
import ConferenceTimer from '../ConferenceTimer'; import ConferenceTimer from '../ConferenceTimer';
import Labels from './Labels';
import styles from './styles'; import styles from './styles';
@ -68,6 +69,7 @@ const NavigationBar = (props: Props) => {
{ {
props._conferenceTimerEnabled && <ConferenceTimer /> props._conferenceTimerEnabled && <ConferenceTimer />
} }
<Labels />
</View> </View>
</View> </View>
); );