Преглед изворни кода

ref(avatar): Move Avatar and Participant view to base/participants

j8
hristoterezov пре 8 година
родитељ
комит
9ea224412d

react/features/conference/components/Avatar.native.js → react/features/base/participants/components/Avatar.native.js Прегледај датотеку


react/features/conference/components/ParticipantView.native.js → react/features/base/participants/components/ParticipantView.native.js Прегледај датотеку

@@ -5,12 +5,12 @@ import {
5 5
     MEDIA_TYPE,
6 6
     shouldRenderVideoTrack,
7 7
     VideoTrack
8
-} from '../../base/media';
9
-import { getParticipantById } from '../../base/participants';
10
-import { Container } from '../../base/react';
11
-import { getTrackByMediaTypeAndParticipant } from '../../base/tracks';
8
+} from '../../media';
9
+import { Container } from '../../react';
10
+import { getTrackByMediaTypeAndParticipant } from '../../tracks';
12 11
 
13 12
 import Avatar from './Avatar';
13
+import { getParticipantById } from '../functions';
14 14
 import { styles } from './styles';
15 15
 
16 16
 /**

react/features/conference/components/ParticipantView.web.js → react/features/base/participants/components/ParticipantView.web.js Прегледај датотеку


+ 1
- 0
react/features/base/participants/components/index.js Прегледај датотеку

@@ -0,0 +1 @@
1
+export { default as ParticipantView } from './ParticipantView';

+ 22
- 0
react/features/base/participants/components/styles.js Прегледај датотеку

@@ -0,0 +1,22 @@
1
+import { createStyleSheet } from '../../styles';
2
+
3
+/**
4
+ * The style of the avatar and participant view UI (components).
5
+ */
6
+export const styles = createStyleSheet({
7
+    /**
8
+     * Avatar style.
9
+     */
10
+    avatar: {
11
+        flex: 1,
12
+        width: '100%'
13
+    },
14
+
15
+    /**
16
+     * ParticipantView style.
17
+     */
18
+    participantView: {
19
+        alignItems: 'stretch',
20
+        flex: 1
21
+    }
22
+});

+ 1
- 0
react/features/base/participants/index.js Прегледај датотеку

@@ -1,5 +1,6 @@
1 1
 export * from './actions';
2 2
 export * from './actionTypes';
3
+export * from './components';
3 4
 export * from './constants';
4 5
 export * from './functions';
5 6
 

+ 0
- 1
react/features/conference/components/index.js Прегледај датотеку

@@ -1,2 +1 @@
1 1
 export { default as Conference } from './Conference';
2
-export { default as ParticipantView } from './ParticipantView';

+ 1
- 17
react/features/conference/components/styles.js Прегледај датотеку

@@ -8,14 +8,6 @@ import {
8 8
  * The style of the conference UI (component).
9 9
  */
10 10
 export const styles = createStyleSheet({
11
-    /**
12
-     * Avatar style.
13
-     */
14
-    avatar: {
15
-        flex: 1,
16
-        width: '100%'
17
-    },
18
-
19 11
     /**
20 12
      * Conference style.
21 13
      */
@@ -23,13 +15,5 @@ export const styles = createStyleSheet({
23 15
         alignSelf: 'stretch',
24 16
         backgroundColor: ColorPalette.appBackground,
25 17
         flex: 1
26
-    }),
27
-
28
-    /**
29
-     * ParticipantView style
30
-     */
31
-    participantView: {
32
-        alignItems: 'stretch',
33
-        flex: 1
34
-    }
18
+    })
35 19
 });

+ 5
- 2
react/features/film-strip/components/Thumbnail.js Прегледај датотеку

@@ -2,10 +2,13 @@ import React, { Component } from 'react';
2 2
 import { connect } from 'react-redux';
3 3
 
4 4
 import { Audio, MEDIA_TYPE } from '../../base/media';
5
-import { PARTICIPANT_ROLE, pinParticipant } from '../../base/participants';
5
+import {
6
+    PARTICIPANT_ROLE,
7
+    ParticipantView,
8
+    pinParticipant
9
+} from '../../base/participants';
6 10
 import { Container } from '../../base/react';
7 11
 import { getTrackByMediaTypeAndParticipant } from '../../base/tracks';
8
-import { ParticipantView } from '../../conference';
9 12
 
10 13
 import {
11 14
     AudioMutedIndicator,

+ 1
- 1
react/features/large-video/components/LargeVideo.js Прегледај датотеку

@@ -1,7 +1,7 @@
1 1
 import React, { Component } from 'react';
2 2
 import { connect } from 'react-redux';
3 3
 
4
-import { ParticipantView } from '../../conference';
4
+import { ParticipantView } from '../../base/participants';
5 5
 
6 6
 import { styles } from './styles';
7 7
 

Loading…
Откажи
Сачувај