feat(toolbox) updated menu items order, dividers for mobile
This commit is contained in:
parent
72d4aa7dd5
commit
8bbee7d1dc
|
@ -1,6 +1,7 @@
|
||||||
// @flow
|
// @flow
|
||||||
|
|
||||||
import React, { PureComponent } from 'react';
|
import React, { PureComponent } from 'react';
|
||||||
|
import { Divider } from 'react-native-paper';
|
||||||
|
|
||||||
import { ColorSchemeRegistry } from '../../../base/color-scheme';
|
import { ColorSchemeRegistry } from '../../../base/color-scheme';
|
||||||
import { BottomSheet, hideDialog, isDialogOpen } from '../../../base/dialog';
|
import { BottomSheet, hideDialog, isDialogOpen } from '../../../base/dialog';
|
||||||
|
@ -16,6 +17,7 @@ import SecurityDialogButton from '../../../security/components/security-dialog/S
|
||||||
import { SharedVideoButton } from '../../../shared-video/components';
|
import { SharedVideoButton } from '../../../shared-video/components';
|
||||||
import { ClosedCaptionButton } from '../../../subtitles';
|
import { ClosedCaptionButton } from '../../../subtitles';
|
||||||
import { TileViewButton } from '../../../video-layout';
|
import { TileViewButton } from '../../../video-layout';
|
||||||
|
import styles from '../../../video-menu/components/native/styles';
|
||||||
import { getMovableButtons } from '../../functions.native';
|
import { getMovableButtons } from '../../functions.native';
|
||||||
import HelpButton from '../HelpButton';
|
import HelpButton from '../HelpButton';
|
||||||
import MuteEveryoneButton from '../MuteEveryoneButton';
|
import MuteEveryoneButton from '../MuteEveryoneButton';
|
||||||
|
@ -140,17 +142,20 @@ class OverflowMenu extends PureComponent<Props, State> {
|
||||||
<ParticipantsPaneButton { ...buttonProps } />
|
<ParticipantsPaneButton { ...buttonProps } />
|
||||||
<AudioOnlyButton { ...buttonProps } />
|
<AudioOnlyButton { ...buttonProps } />
|
||||||
{!_reactionsEnabled && !toolbarButtons.has('raisehand') && <RaiseHandButton { ...buttonProps } />}
|
{!_reactionsEnabled && !toolbarButtons.has('raisehand') && <RaiseHandButton { ...buttonProps } />}
|
||||||
|
<Divider style = { styles.divider } />
|
||||||
<SecurityDialogButton { ...buttonProps } />
|
<SecurityDialogButton { ...buttonProps } />
|
||||||
|
<RecordButton { ...buttonProps } />
|
||||||
|
<LiveStreamButton { ...buttonProps } />
|
||||||
|
<MuteEveryoneButton { ...buttonProps } />
|
||||||
|
<MuteEveryonesVideoButton { ...buttonProps } />
|
||||||
|
<Divider style = { styles.divider } />
|
||||||
|
<SharedVideoButton { ...buttonProps } />
|
||||||
<ScreenSharingButton { ...buttonProps } />
|
<ScreenSharingButton { ...buttonProps } />
|
||||||
{!toolbarButtons.has('togglecamera') && <ToggleCameraButton { ...buttonProps } />}
|
{!toolbarButtons.has('togglecamera') && <ToggleCameraButton { ...buttonProps } />}
|
||||||
{!toolbarButtons.has('tileview') && <TileViewButton { ...buttonProps } />}
|
{!toolbarButtons.has('tileview') && <TileViewButton { ...buttonProps } />}
|
||||||
<RecordButton { ...buttonProps } />
|
<Divider style = { styles.divider } />
|
||||||
<LiveStreamButton { ...buttonProps } />
|
|
||||||
<SharedVideoButton { ...buttonProps } />
|
|
||||||
<ClosedCaptionButton { ...buttonProps } />
|
<ClosedCaptionButton { ...buttonProps } />
|
||||||
<SharedDocumentButton { ...buttonProps } />
|
<SharedDocumentButton { ...buttonProps } />
|
||||||
<MuteEveryoneButton { ...buttonProps } />
|
|
||||||
<MuteEveryonesVideoButton { ...buttonProps } />
|
|
||||||
<HelpButton { ...buttonProps } />
|
<HelpButton { ...buttonProps } />
|
||||||
</BottomSheet>
|
</BottomSheet>
|
||||||
);
|
);
|
||||||
|
|
|
@ -655,6 +655,12 @@ class Toolbox extends Component<Props> {
|
||||||
group: 2
|
group: 2
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const livestreaming = {
|
||||||
|
key: 'livestreaming',
|
||||||
|
Content: LiveStreamButton,
|
||||||
|
group: 2
|
||||||
|
};
|
||||||
|
|
||||||
const muteEveryone = {
|
const muteEveryone = {
|
||||||
key: 'mute-everyone',
|
key: 'mute-everyone',
|
||||||
Content: MuteEveryoneButton,
|
Content: MuteEveryoneButton,
|
||||||
|
@ -667,12 +673,6 @@ class Toolbox extends Component<Props> {
|
||||||
group: 2
|
group: 2
|
||||||
};
|
};
|
||||||
|
|
||||||
const livestreaming = {
|
|
||||||
key: 'livestreaming',
|
|
||||||
Content: LiveStreamButton,
|
|
||||||
group: 2
|
|
||||||
};
|
|
||||||
|
|
||||||
const shareVideo = {
|
const shareVideo = {
|
||||||
key: 'sharedvideo',
|
key: 'sharedvideo',
|
||||||
Content: SharedVideoButton,
|
Content: SharedVideoButton,
|
||||||
|
@ -755,9 +755,9 @@ class Toolbox extends Component<Props> {
|
||||||
cc,
|
cc,
|
||||||
recording,
|
recording,
|
||||||
localRecording,
|
localRecording,
|
||||||
|
livestreaming,
|
||||||
muteEveryone,
|
muteEveryone,
|
||||||
muteVideoEveryone,
|
muteVideoEveryone,
|
||||||
livestreaming,
|
|
||||||
shareVideo,
|
shareVideo,
|
||||||
shareAudio,
|
shareAudio,
|
||||||
etherpad,
|
etherpad,
|
||||||
|
|
Loading…
Reference in New Issue