Browse Source

feat(rn,conference) show invite button on the top navbar

factor2
Saúl Ibarra Corretgé 4 years ago
parent
commit
0833f8c867

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

6
 import { getConferenceName } from '../../../base/conference';
6
 import { getConferenceName } from '../../../base/conference';
7
 import { getFeatureFlag, CONFERENCE_TIMER_ENABLED, MEETING_NAME_ENABLED } from '../../../base/flags';
7
 import { getFeatureFlag, CONFERENCE_TIMER_ENABLED, MEETING_NAME_ENABLED } from '../../../base/flags';
8
 import { connect } from '../../../base/redux';
8
 import { connect } from '../../../base/redux';
9
+import InviteButton from '../../../invite/components/add-people-dialog/native/InviteButton';
9
 import { PictureInPictureButton } from '../../../mobile/picture-in-picture';
10
 import { PictureInPictureButton } from '../../../mobile/picture-in-picture';
10
 import { isToolboxVisible } from '../../../toolbox/functions.native';
11
 import { isToolboxVisible } from '../../../toolbox/functions.native';
11
 import ConferenceTimer from '../ConferenceTimer';
12
 import ConferenceTimer from '../ConferenceTimer';
54
             pointerEvents = 'box-none'
55
             pointerEvents = 'box-none'
55
             style = { styles.navBarWrapper }>
56
             style = { styles.navBarWrapper }>
56
             <View style = { styles.pipButtonContainer }>
57
             <View style = { styles.pipButtonContainer }>
57
-                <PictureInPictureButton
58
-                    styles = { styles.pipButton } />
58
+                <PictureInPictureButton styles = { styles.pipButton } />
59
             </View>
59
             </View>
60
             <View
60
             <View
61
                 pointerEvents = 'box-none'
61
                 pointerEvents = 'box-none'
78
                 }
78
                 }
79
                 <Labels />
79
                 <Labels />
80
             </View>
80
             </View>
81
+            <View style = { styles.inviteButtonContainer }>
82
+                <InviteButton styles = { styles.inviteButton } />
83
+            </View>
81
         </View>
84
         </View>
82
     );
85
     );
83
 };
86
 };

+ 25
- 4
react/features/conference/components/native/styles.js View File

3
 
3
 
4
 export const INSECURE_ROOM_NAME_LABEL_COLOR = ColorPalette.warning;
4
 export const INSECURE_ROOM_NAME_LABEL_COLOR = ColorPalette.warning;
5
 
5
 
6
+const NAVBAR_BUTTON_SIZE = 24;
7
+
6
 /**
8
 /**
7
  * The styles of the feature conference.
9
  * The styles of the feature conference.
8
  */
10
  */
29
         flexDirection: 'row'
31
         flexDirection: 'row'
30
     },
32
     },
31
 
33
 
34
+    inviteButtonContainer: {
35
+        paddingHorizontal: 10,
36
+        paddingVertical: 10,
37
+        position: 'absolute',
38
+        top: 0,
39
+        right: 0,
40
+        zIndex: 1
41
+    },
42
+
43
+    inviteButton: {
44
+        iconStyle: {
45
+            color: ColorPalette.white,
46
+            fontSize: NAVBAR_BUTTON_SIZE
47
+        },
48
+        underlayColor: 'transparent'
49
+    },
32
 
50
 
33
     lonelyButton: {
51
     lonelyButton: {
34
         alignItems: 'center',
52
         alignItems: 'center',
54
     },
72
     },
55
 
73
 
56
     pipButtonContainer: {
74
     pipButtonContainer: {
75
+        paddingHorizontal: 10,
76
+        paddingVertical: 10,
57
         position: 'absolute',
77
         position: 'absolute',
58
-        top: 10,
59
-        left: 5,
78
+        top: 0,
79
+        left: 0,
60
         zIndex: 1
80
         zIndex: 1
61
     },
81
     },
62
 
82
 
63
     pipButton: {
83
     pipButton: {
64
         iconStyle: {
84
         iconStyle: {
65
             color: ColorPalette.white,
85
             color: ColorPalette.white,
66
-            fontSize: 24
86
+            fontSize: NAVBAR_BUTTON_SIZE
67
         },
87
         },
68
         underlayColor: 'transparent'
88
         underlayColor: 'transparent'
69
     },
89
     },
117
     },
137
     },
118
 
138
 
119
     roomNameWrapper: {
139
     roomNameWrapper: {
120
-        flexDirection: 'row'
140
+        flexDirection: 'row',
141
+        marginHorizontal: 35
121
     },
142
     },
122
 
143
 
123
     /**
144
     /**

Loading…
Cancel
Save