Merge pull request #1360 from jitsi/move_avatar

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

react/features/base/participants/components/ParticipantView.native.js

@@ -5,12 +5,12 @@ import {
     MEDIA_TYPE,
     shouldRenderVideoTrack,
     VideoTrack
-} from '../../base/media';
+} from '../../media';
-import { getParticipantById } from '../../base/participants';
+import { Container } from '../../react';
-import { Container } from '../../base/react';
+import { getTrackByMediaTypeAndParticipant } from '../../tracks';
-import { getTrackByMediaTypeAndParticipant } from '../../base/tracks';
 
 import Avatar from './Avatar';
+import { getParticipantById } from '../functions';
 import { styles } from './styles';
 
 /**

react/features/base/participants/components/index.js

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

react/features/base/participants/components/styles.js

@@ -0,0 +1,22 @@
+import { createStyleSheet } from '../../styles';
+
+/**
+ * The style of the avatar and participant view UI (components).
+ */
+export const styles = createStyleSheet({
+    /**
+     * Avatar style.
+     */
+    avatar: {
+        flex: 1,
+        width: '100%'
+    },
+
+    /**
+     * ParticipantView style.
+     */
+    participantView: {
+        alignItems: 'stretch',
+        flex: 1
+    }
+});

react/features/base/participants/index.js

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

react/features/conference/components/index.js

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

react/features/conference/components/styles.js

@@ -8,14 +8,6 @@ import {
  * The style of the conference UI (component).
  */
 export const styles = createStyleSheet({
-    /**
-     * Avatar style.
-     */
-    avatar: {
-        flex: 1,
-        width: '100%'
-    },
-
     /**
      * Conference style.
      */
@@ -23,13 +15,5 @@ export const styles = createStyleSheet({
         alignSelf: 'stretch',
         backgroundColor: ColorPalette.appBackground,
         flex: 1
-    }),
+    })
-
-    /**
-     * ParticipantView style
-     */
-    participantView: {
-        alignItems: 'stretch',
-        flex: 1
-    }
 });

react/features/film-strip/components/Thumbnail.js

@@ -2,10 +2,13 @@ import React, { Component } from 'react';
 import { connect } from 'react-redux';
 
 import { Audio, MEDIA_TYPE } from '../../base/media';
-import { PARTICIPANT_ROLE, pinParticipant } from '../../base/participants';
+import {
+    PARTICIPANT_ROLE,
+    ParticipantView,
+    pinParticipant
+} from '../../base/participants';
 import { Container } from '../../base/react';
 import { getTrackByMediaTypeAndParticipant } from '../../base/tracks';
-import { ParticipantView } from '../../conference';
 
 import {
     AudioMutedIndicator,

react/features/large-video/components/LargeVideo.js

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