haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(native-participants-pane) resolved rebase conflicts and updated import paths

This commit is contained in:
Calin Chitu 2021-06-24 16:26:55 +03:00 committed by Hristo Terezov
parent 249515ac60
commit 36cb896680
9 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -39,7 +39,7 @@
"@react-native-async-storage/async-storage": "1.13.2", "@react-native-async-storage/async-storage": "1.13.2",
"@react-native-community/google-signin": "3.0.1", "@react-native-community/google-signin": "3.0.1",
"@react-native-community/netinfo": "4.1.5", "@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", "@svgr/webpack": "4.3.2",
"amplitude-js": "8.2.1", "amplitude-js": "8.2.1",
"base64-js": "1.3.1", "base64-js": "1.3.1",

2
react/features/participants-pane/components/AskToUnmuteButton.js
View File

@ -5,7 +5,7 @@ import { useDispatch } from 'react-redux';
import { approveParticipant } from '../../av-moderation/actions'; import { approveParticipant } from '../../av-moderation/actions';
import { QuickActionButton } from './styled'; import { QuickActionButton } from './web/styled';
type Props = { type Props = {

2
react/features/participants-pane/components/FooterContextMenu.js
View File

@ -22,7 +22,7 @@ import { MuteEveryonesVideoDialog } from '../../video-menu/components';
import { import {
ContextMenu, ContextMenu,
ContextMenuItem ContextMenuItem
} from './styled'; } from './web/styled';
const useStyles = makeStyles(() => { const useStyles = makeStyles(() => {
return { return {

2
react/features/participants-pane/components/ParticipantQuickAction.js
View File

@ -5,7 +5,7 @@ import React from 'react';
import { QUICK_ACTION_BUTTON } from '../constants'; import { QUICK_ACTION_BUTTON } from '../constants';
import AskToUnmuteButton from './AskToUnmuteButton'; import AskToUnmuteButton from './AskToUnmuteButton';
import { QuickActionButton } from './styled'; import { QuickActionButton } from './web/styled';
type Props = { type Props = {

3
react/features/participants-pane/components/native/ContextMenuMeetingParticipantDetails.js
View File

@ -10,8 +10,7 @@ import { Avatar } from '../../../base/avatar';
import { hideDialog, openDialog } from '../../../base/dialog/actions'; import { hideDialog, openDialog } from '../../../base/dialog/actions';
import BottomSheet from '../../../base/dialog/components/native/BottomSheet'; import BottomSheet from '../../../base/dialog/components/native/BottomSheet';
import { import {
// eslint-disable-next-line no-unused-vars Icon, IconCloseCircle, IconMessage,
Icon, IconCloseCircle, IconConnectionActive, IconMessage,
IconMicrophoneEmptySlash, IconMicrophoneEmptySlash,
IconMuteEveryoneElse, IconVideoOff IconMuteEveryoneElse, IconVideoOff
} from '../../../base/icons'; } from '../../../base/icons';

6
react/features/participants-pane/components/native/MeetingParticipantItem.js
View File

@ -8,7 +8,7 @@ import {
getIsParticipantVideoMuted getIsParticipantVideoMuted
} from '../../../base/tracks'; } from '../../../base/tracks';
import { showContextMenuDetails } from '../../actions.native'; import { showContextMenuDetails } from '../../actions.native';
import { MediaState } from '../../constants'; import { MEDIA_STATE } from '../../constants';
import ParticipantItem from './ParticipantItem'; import ParticipantItem from './ParticipantItem';
@ -29,11 +29,11 @@ export const MeetingParticipantItem = ({ participant: p }: Props) => {
return ( return (
<ParticipantItem <ParticipantItem
audioMuteState = { isAudioMuted ? MediaState.Muted : MediaState.Unmuted } audioMuteState = { isAudioMuted ? MEDIA_STATE.MUTED : MEDIA_STATE.UNMUTED }
isKnockingParticipant = { false } isKnockingParticipant = { false }
name = { p.name } name = { p.name }
onPress = { openContextMenuDetails } onPress = { openContextMenuDetails }
participant = { p } participant = { p }
videoMuteState = { isVideoMuted ? MediaState.Muted : MediaState.Unmuted } /> videoMuteState = { isVideoMuted ? MEDIA_STATE.Muted : MEDIA_STATE.Unmuted } />
); );
}; };

12
react/features/participants-pane/components/native/ParticipantItem.js
View File

@ -23,7 +23,7 @@ type Props = {
/** /**
* Media state for audio * Media state for audio
*/ */
audioMuteState: MediaState, audioMediaState: MediaState,
/** /**
* React children * React children
@ -58,7 +58,7 @@ type Props = {
/** /**
* Media state for video * Media state for video
*/ */
videoMuteState: MediaState videoMediaState: MediaState
} }
/** /**
@ -72,8 +72,8 @@ function ParticipantItem({
name, name,
onPress, onPress,
participant: p, participant: p,
audioMuteState = MediaState.None, audioMediaState = MediaState.None,
videoMuteState = MediaState.None videoMediaState = MediaState.None
}: Props) { }: Props) {
const displayName = name || useSelector(getParticipantDisplayNameWithId(p.id)); const displayName = name || useSelector(getParticipantDisplayNameWithId(p.id));
@ -102,8 +102,8 @@ function ParticipantItem({
p.raisedHand && <RaisedHandIndicator /> p.raisedHand && <RaisedHandIndicator />
} }
<View style = { styles.participantStatesContainer }> <View style = { styles.participantStatesContainer }>
<View style = { styles.participantStateVideo }>{VideoStateIcons[videoMuteState]}</View> <View style = { styles.participantStateVideo }>{VideoStateIcons[videoMediaState]}</View>
<View>{AudioStateIcons[audioMuteState]}</View> <View>{AudioStateIcons[audioMediaState]}</View>
</View> </View>
</> </>
} }

4
react/features/participants-pane/components/web/LobbyParticipantItem.js
View File

@ -4,8 +4,8 @@ import React, { useCallback } from 'react';
import { useTranslation } from 'react-i18next'; import { useTranslation } from 'react-i18next';
import { useDispatch } from 'react-redux'; import { useDispatch } from 'react-redux';
import { approveKnockingParticipant, rejectKnockingParticipant } from '../../lobby/actions'; import { approveKnockingParticipant, rejectKnockingParticipant } from '../../../lobby/actions';
import { ACTION_TRIGGER, MEDIA_STATE } from '../constants'; import { ACTION_TRIGGER, MEDIA_STATE } from '../../constants';
import ParticipantItem from './ParticipantItem'; import ParticipantItem from './ParticipantItem';
import { ParticipantActionButton } from './styled'; import { ParticipantActionButton } from './styled';

4
react/features/participants-pane/components/web/styled.js
View File

@ -1,8 +1,8 @@
import React from 'react'; import React from 'react';
import styled from 'styled-components'; import styled from 'styled-components';
import { Icon, IconHorizontalPoints } from '../../base/icons'; import { Icon, IconHorizontalPoints } from '../../../base/icons';
import { ACTION_TRIGGER } from '../constants'; import { ACTION_TRIGGER } from '../../constants';
export const ignoredChildClassName = 'ignore-child'; export const ignoredChildClassName = 'ignore-child';