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
 } from '../AbstractConference';
33
 } from '../AbstractConference';
34
 import type { AbstractProps } from '../AbstractConference';
34
 import type { AbstractProps } from '../AbstractConference';
35
 
35
 
36
-import Labels from './Labels';
37
 import LonelyMeetingExperience from './LonelyMeetingExperience';
36
 import LonelyMeetingExperience from './LonelyMeetingExperience';
38
 import NavigationBar from './NavigationBar';
37
 import NavigationBar from './NavigationBar';
39
 import styles from './styles';
38
 import styles from './styles';
277
                     pointerEvents = 'box-none'
276
                     pointerEvents = 'box-none'
278
                     style = { styles.toolboxAndFilmstripContainer }>
277
                     style = { styles.toolboxAndFilmstripContainer }>
279
 
278
 
280
-                    <Labels />
281
-
282
                     <Captions onPress = { this._onClick } />
279
                     <Captions onPress = { this._onClick } />
283
 
280
 
284
                     { _shouldDisplayTileView || <Container style = { styles.displayNameContainer }>
281
                     { _shouldDisplayTileView || <Container style = { styles.displayNameContainer }>

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

10
 import { isToolboxVisible } from '../../../toolbox/functions.native';
10
 import { isToolboxVisible } from '../../../toolbox/functions.native';
11
 import ConferenceTimer from '../ConferenceTimer';
11
 import ConferenceTimer from '../ConferenceTimer';
12
 
12
 
13
+import Labels from './Labels';
13
 import styles from './styles';
14
 import styles from './styles';
14
 
15
 
15
 
16
 
68
                 {
69
                 {
69
                     props._conferenceTimerEnabled && <ConferenceTimer />
70
                     props._conferenceTimerEnabled && <ConferenceTimer />
70
                 }
71
                 }
72
+                <Labels />
71
             </View>
73
             </View>
72
         </View>
74
         </View>
73
     );
75
     );

Loading…
Cancel
Save