From 9ea224412dbde31520a5081d7985287628472852 Mon Sep 17 00:00:00 2001 From: hristoterezov Date: Mon, 27 Feb 2017 14:37:53 -0600 Subject: [PATCH] ref(avatar): Move Avatar and Participant view to base/participants --- .../participants}/components/Avatar.native.js | 0 .../components/ParticipantView.native.js | 8 +++---- .../components/ParticipantView.web.js | 0 .../base/participants/components/index.js | 1 + .../base/participants/components/styles.js | 22 +++++++++++++++++++ react/features/base/participants/index.js | 1 + react/features/conference/components/index.js | 1 - .../features/conference/components/styles.js | 18 +-------------- .../film-strip/components/Thumbnail.js | 7 ++++-- .../large-video/components/LargeVideo.js | 2 +- 10 files changed, 35 insertions(+), 25 deletions(-) rename react/features/{conference => base/participants}/components/Avatar.native.js (100%) rename react/features/{conference => base/participants}/components/ParticipantView.native.js (96%) rename react/features/{conference => base/participants}/components/ParticipantView.web.js (100%) create mode 100644 react/features/base/participants/components/index.js create mode 100644 react/features/base/participants/components/styles.js diff --git a/react/features/conference/components/Avatar.native.js b/react/features/base/participants/components/Avatar.native.js similarity index 100% rename from react/features/conference/components/Avatar.native.js rename to react/features/base/participants/components/Avatar.native.js diff --git a/react/features/conference/components/ParticipantView.native.js b/react/features/base/participants/components/ParticipantView.native.js similarity index 96% rename from react/features/conference/components/ParticipantView.native.js rename to react/features/base/participants/components/ParticipantView.native.js index e9da6605e..49835fff7 100644 --- a/react/features/conference/components/ParticipantView.native.js +++ b/react/features/base/participants/components/ParticipantView.native.js @@ -5,12 +5,12 @@ import { MEDIA_TYPE, shouldRenderVideoTrack, VideoTrack -} from '../../base/media'; -import { getParticipantById } from '../../base/participants'; -import { Container } from '../../base/react'; -import { getTrackByMediaTypeAndParticipant } from '../../base/tracks'; +} from '../../media'; +import { Container } from '../../react'; +import { getTrackByMediaTypeAndParticipant } from '../../tracks'; import Avatar from './Avatar'; +import { getParticipantById } from '../functions'; import { styles } from './styles'; /** diff --git a/react/features/conference/components/ParticipantView.web.js b/react/features/base/participants/components/ParticipantView.web.js similarity index 100% rename from react/features/conference/components/ParticipantView.web.js rename to react/features/base/participants/components/ParticipantView.web.js diff --git a/react/features/base/participants/components/index.js b/react/features/base/participants/components/index.js new file mode 100644 index 000000000..59f6ab78b --- /dev/null +++ b/react/features/base/participants/components/index.js @@ -0,0 +1 @@ +export { default as ParticipantView } from './ParticipantView'; diff --git a/react/features/base/participants/components/styles.js b/react/features/base/participants/components/styles.js new file mode 100644 index 000000000..c2179955b --- /dev/null +++ b/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 + } +}); diff --git a/react/features/base/participants/index.js b/react/features/base/participants/index.js index 39f1ee456..0a8f4ad7b 100644 --- a/react/features/base/participants/index.js +++ b/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'; diff --git a/react/features/conference/components/index.js b/react/features/conference/components/index.js index 33ea1426b..7ee56f548 100644 --- a/react/features/conference/components/index.js +++ b/react/features/conference/components/index.js @@ -1,2 +1 @@ export { default as Conference } from './Conference'; -export { default as ParticipantView } from './ParticipantView'; diff --git a/react/features/conference/components/styles.js b/react/features/conference/components/styles.js index f8bd0d8b1..3973a78a7 100644 --- a/react/features/conference/components/styles.js +++ b/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 - } + }) }); diff --git a/react/features/film-strip/components/Thumbnail.js b/react/features/film-strip/components/Thumbnail.js index 7157774b0..3ba4836ad 100644 --- a/react/features/film-strip/components/Thumbnail.js +++ b/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, diff --git a/react/features/large-video/components/LargeVideo.js b/react/features/large-video/components/LargeVideo.js index 2ff5f4524..d485dca44 100644 --- a/react/features/large-video/components/LargeVideo.js +++ b/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';