Przeglądaj źródła

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

master
Calin Chitu 4 lat temu
rodzic
commit
36cb896680

+ 1
- 1
package.json Wyświetl plik

39
     "@react-native-async-storage/async-storage": "1.13.2",
39
     "@react-native-async-storage/async-storage": "1.13.2",
40
     "@react-native-community/google-signin": "3.0.1",
40
     "@react-native-community/google-signin": "3.0.1",
41
     "@react-native-community/netinfo": "4.1.5",
41
     "@react-native-community/netinfo": "4.1.5",
42
-    "@react-native-community/slider": "^3.0.3",
42
+    "@react-native-community/slider": "3.0.3",
43
     "@svgr/webpack": "4.3.2",
43
     "@svgr/webpack": "4.3.2",
44
     "amplitude-js": "8.2.1",
44
     "amplitude-js": "8.2.1",
45
     "base64-js": "1.3.1",
45
     "base64-js": "1.3.1",

+ 1
- 1
react/features/participants-pane/components/AskToUnmuteButton.js Wyświetl plik

5
 
5
 
6
 import { approveParticipant } from '../../av-moderation/actions';
6
 import { approveParticipant } from '../../av-moderation/actions';
7
 
7
 
8
-import { QuickActionButton } from './styled';
8
+import { QuickActionButton } from './web/styled';
9
 
9
 
10
 type Props = {
10
 type Props = {
11
 
11
 

+ 1
- 1
react/features/participants-pane/components/FooterContextMenu.js Wyświetl plik

22
 import {
22
 import {
23
     ContextMenu,
23
     ContextMenu,
24
     ContextMenuItem
24
     ContextMenuItem
25
-} from './styled';
25
+} from './web/styled';
26
 
26
 
27
 const useStyles = makeStyles(() => {
27
 const useStyles = makeStyles(() => {
28
     return {
28
     return {

+ 1
- 1
react/features/participants-pane/components/ParticipantQuickAction.js Wyświetl plik

5
 import { QUICK_ACTION_BUTTON } from '../constants';
5
 import { QUICK_ACTION_BUTTON } from '../constants';
6
 
6
 
7
 import AskToUnmuteButton from './AskToUnmuteButton';
7
 import AskToUnmuteButton from './AskToUnmuteButton';
8
-import { QuickActionButton } from './styled';
8
+import { QuickActionButton } from './web/styled';
9
 
9
 
10
 type Props = {
10
 type Props = {
11
 
11
 

+ 1
- 2
react/features/participants-pane/components/native/ContextMenuMeetingParticipantDetails.js Wyświetl plik

10
 import { hideDialog, openDialog } from '../../../base/dialog/actions';
10
 import { hideDialog, openDialog } from '../../../base/dialog/actions';
11
 import BottomSheet from '../../../base/dialog/components/native/BottomSheet';
11
 import BottomSheet from '../../../base/dialog/components/native/BottomSheet';
12
 import {
12
 import {
13
-    // eslint-disable-next-line no-unused-vars
14
-    Icon, IconCloseCircle, IconConnectionActive, IconMessage,
13
+    Icon, IconCloseCircle, IconMessage,
15
     IconMicrophoneEmptySlash,
14
     IconMicrophoneEmptySlash,
16
     IconMuteEveryoneElse, IconVideoOff
15
     IconMuteEveryoneElse, IconVideoOff
17
 } from '../../../base/icons';
16
 } from '../../../base/icons';

+ 3
- 3
react/features/participants-pane/components/native/MeetingParticipantItem.js Wyświetl plik

8
     getIsParticipantVideoMuted
8
     getIsParticipantVideoMuted
9
 } from '../../../base/tracks';
9
 } from '../../../base/tracks';
10
 import { showContextMenuDetails } from '../../actions.native';
10
 import { showContextMenuDetails } from '../../actions.native';
11
-import { MediaState } from '../../constants';
11
+import { MEDIA_STATE } from '../../constants';
12
 
12
 
13
 import ParticipantItem from './ParticipantItem';
13
 import ParticipantItem from './ParticipantItem';
14
 
14
 
29
 
29
 
30
     return (
30
     return (
31
         <ParticipantItem
31
         <ParticipantItem
32
-            audioMuteState = { isAudioMuted ? MediaState.Muted : MediaState.Unmuted }
32
+            audioMuteState = { isAudioMuted ? MEDIA_STATE.MUTED : MEDIA_STATE.UNMUTED }
33
             isKnockingParticipant = { false }
33
             isKnockingParticipant = { false }
34
             name = { p.name }
34
             name = { p.name }
35
             onPress = { openContextMenuDetails }
35
             onPress = { openContextMenuDetails }
36
             participant = { p }
36
             participant = { p }
37
-            videoMuteState = { isVideoMuted ? MediaState.Muted : MediaState.Unmuted } />
37
+            videoMuteState = { isVideoMuted ? MEDIA_STATE.Muted : MEDIA_STATE.Unmuted } />
38
     );
38
     );
39
 };
39
 };

+ 6
- 6
react/features/participants-pane/components/native/ParticipantItem.js Wyświetl plik

23
     /**
23
     /**
24
      * Media state for audio
24
      * Media state for audio
25
      */
25
      */
26
-    audioMuteState: MediaState,
26
+    audioMediaState: MediaState,
27
 
27
 
28
     /**
28
     /**
29
      * React children
29
      * React children
58
     /**
58
     /**
59
      * Media state for video
59
      * Media state for video
60
      */
60
      */
61
-    videoMuteState: MediaState
61
+    videoMediaState: MediaState
62
 }
62
 }
63
 
63
 
64
 /**
64
 /**
72
     name,
72
     name,
73
     onPress,
73
     onPress,
74
     participant: p,
74
     participant: p,
75
-    audioMuteState = MediaState.None,
76
-    videoMuteState = MediaState.None
75
+    audioMediaState = MediaState.None,
76
+    videoMediaState = MediaState.None
77
 }: Props) {
77
 }: Props) {
78
 
78
 
79
     const displayName = name || useSelector(getParticipantDisplayNameWithId(p.id));
79
     const displayName = name || useSelector(getParticipantDisplayNameWithId(p.id));
102
                             p.raisedHand && <RaisedHandIndicator />
102
                             p.raisedHand && <RaisedHandIndicator />
103
                         }
103
                         }
104
                         <View style = { styles.participantStatesContainer }>
104
                         <View style = { styles.participantStatesContainer }>
105
-                            <View style = { styles.participantStateVideo }>{VideoStateIcons[videoMuteState]}</View>
106
-                            <View>{AudioStateIcons[audioMuteState]}</View>
105
+                            <View style = { styles.participantStateVideo }>{VideoStateIcons[videoMediaState]}</View>
106
+                            <View>{AudioStateIcons[audioMediaState]}</View>
107
                         </View>
107
                         </View>
108
                     </>
108
                     </>
109
                 }
109
                 }

+ 2
- 2
react/features/participants-pane/components/web/LobbyParticipantItem.js Wyświetl plik

4
 import { useTranslation } from 'react-i18next';
4
 import { useTranslation } from 'react-i18next';
5
 import { useDispatch } from 'react-redux';
5
 import { useDispatch } from 'react-redux';
6
 
6
 
7
-import { approveKnockingParticipant, rejectKnockingParticipant } from '../../lobby/actions';
8
-import { ACTION_TRIGGER, MEDIA_STATE } from '../constants';
7
+import { approveKnockingParticipant, rejectKnockingParticipant } from '../../../lobby/actions';
8
+import { ACTION_TRIGGER, MEDIA_STATE } from '../../constants';
9
 
9
 
10
 import ParticipantItem from './ParticipantItem';
10
 import ParticipantItem from './ParticipantItem';
11
 import { ParticipantActionButton } from './styled';
11
 import { ParticipantActionButton } from './styled';

+ 2
- 2
react/features/participants-pane/components/web/styled.js Wyświetl plik

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

Ładowanie…
Anuluj
Zapisz