浏览代码

feat(participants-pane) changed to standard header

master
Calin Chitu 4 年前
父节点
当前提交
bc9f5773fb

+ 1
- 0
lang/main.json 查看文件

592
     },
592
     },
593
     "participantsPane": {
593
     "participantsPane": {
594
         "close": "Close",
594
         "close": "Close",
595
+        "header": "Participants",
595
         "headings": {
596
         "headings": {
596
             "lobby": "Lobby ({{count}})",
597
             "lobby": "Lobby ({{count}})",
597
             "participantsList": "Meeting participants ({{count}})",
598
             "participantsList": "Meeting participants ({{count}})",

+ 5
- 15
react/features/participants-pane/components/native/ParticipantsPane.js 查看文件

7
 import { useDispatch, useSelector } from 'react-redux';
7
 import { useDispatch, useSelector } from 'react-redux';
8
 
8
 
9
 import { openDialog } from '../../../base/dialog';
9
 import { openDialog } from '../../../base/dialog';
10
-import { Icon, IconClose, IconHorizontalPoints } from '../../../base/icons';
10
+import { Icon, IconHorizontalPoints } from '../../../base/icons';
11
 import { JitsiModal } from '../../../base/modal';
11
 import { JitsiModal } from '../../../base/modal';
12
 import {
12
 import {
13
     getParticipantCount,
13
     getParticipantCount,
40
 
40
 
41
     return (
41
     return (
42
         <JitsiModal
42
         <JitsiModal
43
-            hideHeaderWithNavigation = { true }
43
+            headerProps = {{
44
+                headerLabelKey: 'participantsPane.header'
45
+            }}
46
+            onClose = { closePane }
44
             style = { styles.participantsPane }>
47
             style = { styles.participantsPane }>
45
-            <View style = { styles.header }>
46
-                <Button
47
-                    /* eslint-disable-next-line react/jsx-no-bind */
48
-                    icon = { () =>
49
-                        (<Icon
50
-                            size = { 20 }
51
-                            src = { IconClose } />)
52
-                    }
53
-                    labelStyle = { styles.closeIcon }
54
-                    mode = 'contained'
55
-                    onPress = { closePane }
56
-                    style = { styles.closeButton } />
57
-            </View>
58
             <ScrollView>
48
             <ScrollView>
59
                 <LobbyParticipantList />
49
                 <LobbyParticipantList />
60
                 <MeetingParticipantList />
50
                 <MeetingParticipantList />

+ 0
- 24
react/features/participants-pane/components/native/styles.js 查看文件

213
         marginLeft: BaseTheme.spacing[3]
213
         marginLeft: BaseTheme.spacing[3]
214
     },
214
     },
215
 
215
 
216
-    header: {
217
-        alignItems: 'center',
218
-        backgroundColor: BaseTheme.palette.ui01,
219
-        top: BaseTheme.spacing[0],
220
-        display: 'flex',
221
-        flexDirection: 'row',
222
-        height: BaseTheme.spacing[10],
223
-        paddingRight: BaseTheme.spacing[3],
224
-        position: 'relative',
225
-        right: BaseTheme.spacing[0],
226
-        left: BaseTheme.spacing[0]
227
-    },
228
-
229
     footer: {
216
     footer: {
230
         alignItems: 'center',
217
         alignItems: 'center',
231
         backgroundColor: BaseTheme.palette.ui01,
218
         backgroundColor: BaseTheme.palette.ui01,
240
         left: BaseTheme.spacing[0]
227
         left: BaseTheme.spacing[0]
241
     },
228
     },
242
 
229
 
243
-    closeButton: {
244
-        ...smallButton,
245
-        marginLeft: 'auto'
246
-    },
247
-
248
-    closeIcon: {
249
-        ...buttonContent,
250
-        height: BaseTheme.spacing[5],
251
-        marginLeft: 'auto'
252
-    },
253
-
254
     inviteButton: {
230
     inviteButton: {
255
         backgroundColor: BaseTheme.palette.action01,
231
         backgroundColor: BaseTheme.palette.action01,
256
         marginTop: BaseTheme.spacing[2],
232
         marginTop: BaseTheme.spacing[2],

正在加载...
取消
保存