feat(native-participants-pane) resolved rebase conflicts and updated import paths
This commit is contained in:
Calin Chitu
Hristo Terezov
parent
249515ac60
commit
36cb896680
|
|
@ -39,7 +39,7 @@
|
|||
"@react-native-async-storage/async-storage": "1.13.2",
|
||||
"@react-native-community/google-signin": "3.0.1",
|
||||
"@react-native-community/netinfo": "4.1.5",
|
||||
"@react-native-community/slider": "^3.0.3",
|
||||
"@react-native-community/slider": "3.0.3",
|
||||
"@svgr/webpack": "4.3.2",
|
||||
"amplitude-js": "8.2.1",
|
||||
"base64-js": "1.3.1",
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ import { useDispatch } from 'react-redux';
|
|||
|
||||
import { approveParticipant } from '../../av-moderation/actions';
|
||||
|
||||
import { QuickActionButton } from './styled';
|
||||
import { QuickActionButton } from './web/styled';
|
||||
|
||||
type Props = {
|
||||
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ import { MuteEveryonesVideoDialog } from '../../video-menu/components';
|
|||
import {
|
||||
ContextMenu,
|
||||
ContextMenuItem
|
||||
} from './styled';
|
||||
} from './web/styled';
|
||||
|
||||
const useStyles = makeStyles(() => {
|
||||
return {
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ import React from 'react';
|
|||
import { QUICK_ACTION_BUTTON } from '../constants';
|
||||
|
||||
import AskToUnmuteButton from './AskToUnmuteButton';
|
||||
import { QuickActionButton } from './styled';
|
||||
import { QuickActionButton } from './web/styled';
|
||||
|
||||
type Props = {
|
||||
|
||||
|
|
|
|||
|
|
@ -10,8 +10,7 @@ import { Avatar } from '../../../base/avatar';
|
|||
import { hideDialog, openDialog } from '../../../base/dialog/actions';
|
||||
import BottomSheet from '../../../base/dialog/components/native/BottomSheet';
|
||||
import {
|
||||
// eslint-disable-next-line no-unused-vars
|
||||
Icon, IconCloseCircle, IconConnectionActive, IconMessage,
|
||||
Icon, IconCloseCircle, IconMessage,
|
||||
IconMicrophoneEmptySlash,
|
||||
IconMuteEveryoneElse, IconVideoOff
|
||||
} from '../../../base/icons';
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ import {
|
|||
getIsParticipantVideoMuted
|
||||
} from '../../../base/tracks';
|
||||
import { showContextMenuDetails } from '../../actions.native';
|
||||
import { MediaState } from '../../constants';
|
||||
import { MEDIA_STATE } from '../../constants';
|
||||
|
||||
import ParticipantItem from './ParticipantItem';
|
||||
|
||||
|
|
@ -29,11 +29,11 @@ export const MeetingParticipantItem = ({ participant: p }: Props) => {
|
|||
|
||||
return (
|
||||
<ParticipantItem
|
||||
audioMuteState = { isAudioMuted ? MediaState.Muted : MediaState.Unmuted }
|
||||
audioMuteState = { isAudioMuted ? MEDIA_STATE.MUTED : MEDIA_STATE.UNMUTED }
|
||||
isKnockingParticipant = { false }
|
||||
name = { p.name }
|
||||
onPress = { openContextMenuDetails }
|
||||
participant = { p }
|
||||
videoMuteState = { isVideoMuted ? MediaState.Muted : MediaState.Unmuted } />
|
||||
videoMuteState = { isVideoMuted ? MEDIA_STATE.Muted : MEDIA_STATE.Unmuted } />
|
||||
);
|
||||
};
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ type Props = {
|
|||
/**
|
||||
* Media state for audio
|
||||
*/
|
||||
audioMuteState: MediaState,
|
||||
audioMediaState: MediaState,
|
||||
|
||||
/**
|
||||
* React children
|
||||
|
|
@ -58,7 +58,7 @@ type Props = {
|
|||
/**
|
||||
* Media state for video
|
||||
*/
|
||||
videoMuteState: MediaState
|
||||
videoMediaState: MediaState
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -72,8 +72,8 @@ function ParticipantItem({
|
|||
name,
|
||||
onPress,
|
||||
participant: p,
|
||||
audioMuteState = MediaState.None,
|
||||
videoMuteState = MediaState.None
|
||||
audioMediaState = MediaState.None,
|
||||
videoMediaState = MediaState.None
|
||||
}: Props) {
|
||||
|
||||
const displayName = name || useSelector(getParticipantDisplayNameWithId(p.id));
|
||||
|
|
@ -102,8 +102,8 @@ function ParticipantItem({
|
|||
p.raisedHand && <RaisedHandIndicator />
|
||||
}
|
||||
<View style = { styles.participantStatesContainer }>
|
||||
<View style = { styles.participantStateVideo }>{VideoStateIcons[videoMuteState]}</View>
|
||||
<View>{AudioStateIcons[audioMuteState]}</View>
|
||||
<View style = { styles.participantStateVideo }>{VideoStateIcons[videoMediaState]}</View>
|
||||
<View>{AudioStateIcons[audioMediaState]}</View>
|
||||
</View>
|
||||
</>
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@ import React, { useCallback } from 'react';
|
|||
import { useTranslation } from 'react-i18next';
|
||||
import { useDispatch } from 'react-redux';
|
||||
|
||||
import { approveKnockingParticipant, rejectKnockingParticipant } from '../../lobby/actions';
|
||||
import { ACTION_TRIGGER, MEDIA_STATE } from '../constants';
|
||||
import { approveKnockingParticipant, rejectKnockingParticipant } from '../../../lobby/actions';
|
||||
import { ACTION_TRIGGER, MEDIA_STATE } from '../../constants';
|
||||
|
||||
import ParticipantItem from './ParticipantItem';
|
||||
import { ParticipantActionButton } from './styled';
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
import React from 'react';
|
||||
import styled from 'styled-components';
|
||||
|
||||
import { Icon, IconHorizontalPoints } from '../../base/icons';
|
||||
import { ACTION_TRIGGER } from '../constants';
|
||||
import { Icon, IconHorizontalPoints } from '../../../base/icons';
|
||||
import { ACTION_TRIGGER } from '../../constants';
|
||||
|
||||
export const ignoredChildClassName = 'ignore-child';
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue