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

feat(toolbox) updated menu items order, dividers for mobile

master
Calin Chitu 3 роки тому
джерело
коміт
8bbee7d1dc

+ 10
- 5
react/features/toolbox/components/native/OverflowMenu.js Переглянути файл

@@ -1,6 +1,7 @@
1 1
 // @flow
2 2
 
3 3
 import React, { PureComponent } from 'react';
4
+import { Divider } from 'react-native-paper';
4 5
 
5 6
 import { ColorSchemeRegistry } from '../../../base/color-scheme';
6 7
 import { BottomSheet, hideDialog, isDialogOpen } from '../../../base/dialog';
@@ -16,6 +17,7 @@ import SecurityDialogButton from '../../../security/components/security-dialog/S
16 17
 import { SharedVideoButton } from '../../../shared-video/components';
17 18
 import { ClosedCaptionButton } from '../../../subtitles';
18 19
 import { TileViewButton } from '../../../video-layout';
20
+import styles from '../../../video-menu/components/native/styles';
19 21
 import { getMovableButtons } from '../../functions.native';
20 22
 import HelpButton from '../HelpButton';
21 23
 import MuteEveryoneButton from '../MuteEveryoneButton';
@@ -140,17 +142,20 @@ class OverflowMenu extends PureComponent<Props, State> {
140 142
                 <ParticipantsPaneButton { ...buttonProps } />
141 143
                 <AudioOnlyButton { ...buttonProps } />
142 144
                 {!_reactionsEnabled && !toolbarButtons.has('raisehand') && <RaiseHandButton { ...buttonProps } />}
145
+                <Divider style = { styles.divider } />
143 146
                 <SecurityDialogButton { ...buttonProps } />
144
-                <ScreenSharingButton { ...buttonProps } />
145
-                {!toolbarButtons.has('togglecamera') && <ToggleCameraButton { ...buttonProps } />}
146
-                {!toolbarButtons.has('tileview') && <TileViewButton { ...buttonProps } />}
147 147
                 <RecordButton { ...buttonProps } />
148 148
                 <LiveStreamButton { ...buttonProps } />
149
+                <MuteEveryoneButton { ...buttonProps } />
150
+                <MuteEveryonesVideoButton { ...buttonProps } />
151
+                <Divider style = { styles.divider } />
149 152
                 <SharedVideoButton { ...buttonProps } />
153
+                <ScreenSharingButton { ...buttonProps } />
154
+                {!toolbarButtons.has('togglecamera') && <ToggleCameraButton { ...buttonProps } />}
155
+                {!toolbarButtons.has('tileview') && <TileViewButton { ...buttonProps } />}
156
+                <Divider style = { styles.divider } />
150 157
                 <ClosedCaptionButton { ...buttonProps } />
151 158
                 <SharedDocumentButton { ...buttonProps } />
152
-                <MuteEveryoneButton { ...buttonProps } />
153
-                <MuteEveryonesVideoButton { ...buttonProps } />
154 159
                 <HelpButton { ...buttonProps } />
155 160
             </BottomSheet>
156 161
         );

+ 7
- 7
react/features/toolbox/components/web/Toolbox.js Переглянути файл

@@ -655,6 +655,12 @@ class Toolbox extends Component<Props> {
655 655
             group: 2
656 656
         };
657 657
 
658
+        const livestreaming = {
659
+            key: 'livestreaming',
660
+            Content: LiveStreamButton,
661
+            group: 2
662
+        };
663
+
658 664
         const muteEveryone = {
659 665
             key: 'mute-everyone',
660 666
             Content: MuteEveryoneButton,
@@ -667,12 +673,6 @@ class Toolbox extends Component<Props> {
667 673
             group: 2
668 674
         };
669 675
 
670
-        const livestreaming = {
671
-            key: 'livestreaming',
672
-            Content: LiveStreamButton,
673
-            group: 2
674
-        };
675
-
676 676
         const shareVideo = {
677 677
             key: 'sharedvideo',
678 678
             Content: SharedVideoButton,
@@ -755,9 +755,9 @@ class Toolbox extends Component<Props> {
755 755
             cc,
756 756
             recording,
757 757
             localRecording,
758
+            livestreaming,
758 759
             muteEveryone,
759 760
             muteVideoEveryone,
760
-            livestreaming,
761 761
             shareVideo,
762 762
             shareAudio,
763 763
             etherpad,

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