Browse Source

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

master
Saúl Ibarra Corretgé 4 years ago
parent
commit
6b4d25c0d3

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

@@ -33,7 +33,6 @@ import {
33 33
 } from '../AbstractConference';
34 34
 import type { AbstractProps } from '../AbstractConference';
35 35
 
36
-import Labels from './Labels';
37 36
 import LonelyMeetingExperience from './LonelyMeetingExperience';
38 37
 import NavigationBar from './NavigationBar';
39 38
 import styles from './styles';
@@ -277,8 +276,6 @@ class Conference extends AbstractConference<Props, *> {
277 276
                     pointerEvents = 'box-none'
278 277
                     style = { styles.toolboxAndFilmstripContainer }>
279 278
 
280
-                    <Labels />
281
-
282 279
                     <Captions onPress = { this._onClick } />
283 280
 
284 281
                     { _shouldDisplayTileView || <Container style = { styles.displayNameContainer }>

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

@@ -10,6 +10,7 @@ import { PictureInPictureButton } from '../../../mobile/picture-in-picture';
10 10
 import { isToolboxVisible } from '../../../toolbox/functions.native';
11 11
 import ConferenceTimer from '../ConferenceTimer';
12 12
 
13
+import Labels from './Labels';
13 14
 import styles from './styles';
14 15
 
15 16
 
@@ -68,6 +69,7 @@ const NavigationBar = (props: Props) => {
68 69
                 {
69 70
                     props._conferenceTimerEnabled && <ConferenceTimer />
70 71
                 }
72
+                <Labels />
71 73
             </View>
72 74
         </View>
73 75
     );

Loading…
Cancel
Save