Browse Source

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

master
Calin Chitu 3 years ago
parent
commit
8bbee7d1dc

+ 10
- 5
react/features/toolbox/components/native/OverflowMenu.js View File

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

+ 7
- 7
react/features/toolbox/components/web/Toolbox.js View File

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

Loading…
Cancel
Save