Переглянути джерело

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

master
Saúl Ibarra Corretgé 3 роки тому
джерело
коміт
0833f8c867

+ 5
- 2
react/features/conference/components/native/NavigationBar.js Переглянути файл

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

+ 25
- 4
react/features/conference/components/native/styles.js Переглянути файл

@@ -3,6 +3,8 @@ import { BoxModel, ColorPalette, fixAndroidViewClipping } from '../../../base/st
3 3
 
4 4
 export const INSECURE_ROOM_NAME_LABEL_COLOR = ColorPalette.warning;
5 5
 
6
+const NAVBAR_BUTTON_SIZE = 24;
7
+
6 8
 /**
7 9
  * The styles of the feature conference.
8 10
  */
@@ -29,6 +31,22 @@ export default {
29 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 51
     lonelyButton: {
34 52
         alignItems: 'center',
@@ -54,16 +72,18 @@ export default {
54 72
     },
55 73
 
56 74
     pipButtonContainer: {
75
+        paddingHorizontal: 10,
76
+        paddingVertical: 10,
57 77
         position: 'absolute',
58
-        top: 10,
59
-        left: 5,
78
+        top: 0,
79
+        left: 0,
60 80
         zIndex: 1
61 81
     },
62 82
 
63 83
     pipButton: {
64 84
         iconStyle: {
65 85
             color: ColorPalette.white,
66
-            fontSize: 24
86
+            fontSize: NAVBAR_BUTTON_SIZE
67 87
         },
68 88
         underlayColor: 'transparent'
69 89
     },
@@ -117,7 +137,8 @@ export default {
117 137
     },
118 138
 
119 139
     roomNameWrapper: {
120
-        flexDirection: 'row'
140
+        flexDirection: 'row',
141
+        marginHorizontal: 35
121 142
     },
122 143
 
123 144
     /**

Завантаження…
Відмінити
Зберегти