From 42c85c22a9f7df3a0dc5d1c1a7d668984f180c68 Mon Sep 17 00:00:00 2001 From: Bettenbuk Zoltan Date: Thu, 11 Apr 2019 10:28:51 +0200 Subject: [PATCH] [RN] rearrange display-name files for later refactor --- .../components/native/Conference.js | 2 +- .../conference/components/native/styles.js | 14 -------------- .../components/DisplayName.native.js | 0 .../display-name/components/index.native.js | 3 +++ .../display-name/components/index.web.js | 3 +++ .../components/native/DisplayNameLabel.js | 1 - .../DisplayNamePrompt.js} | 6 +++--- .../display-name/components/native/index.js | 4 ++++ .../display-name/components/native/styles.js | 19 +++++++++++++++++++ .../DisplayName.js} | 12 ++++++------ .../DisplayNamePrompt.js} | 8 ++++---- .../components/{ => web}/index.js | 2 ++ react/features/display-name/index.js | 2 ++ 13 files changed, 47 insertions(+), 29 deletions(-) delete mode 100644 react/features/display-name/components/DisplayName.native.js create mode 100644 react/features/display-name/components/index.native.js create mode 100644 react/features/display-name/components/index.web.js rename react/features/{conference => display-name}/components/native/DisplayNameLabel.js (99%) rename react/features/display-name/components/{DisplayNamePrompt.native.js => native/DisplayNamePrompt.js} (76%) create mode 100644 react/features/display-name/components/native/index.js create mode 100644 react/features/display-name/components/native/styles.js rename react/features/display-name/components/{DisplayName.web.js => web/DisplayName.js} (96%) rename react/features/display-name/components/{DisplayNamePrompt.web.js => web/DisplayNamePrompt.js} (93%) rename react/features/display-name/components/{ => web}/index.js (92%) diff --git a/react/features/conference/components/native/Conference.js b/react/features/conference/components/native/Conference.js index 698e27246..b0f4885de 100644 --- a/react/features/conference/components/native/Conference.js +++ b/react/features/conference/components/native/Conference.js @@ -17,6 +17,7 @@ import { TestConnectionInfo } from '../../../base/testing'; import { createDesiredLocalTracks } from '../../../base/tracks'; import { ConferenceNotification } from '../../../calendar-sync'; import { Chat } from '../../../chat'; +import { DisplayNameLabel } from '../../../display-name/components/native'; import { FILMSTRIP_SIZE, Filmstrip, @@ -32,7 +33,6 @@ import { AbstractConference, abstractMapStateToProps } from '../AbstractConference'; -import DisplayNameLabel from './DisplayNameLabel'; import Labels from './Labels'; import NavigationBar from './NavigationBar'; import styles from './styles'; diff --git a/react/features/conference/components/native/styles.js b/react/features/conference/components/native/styles.js index 9d71f6fc0..43d1b767f 100644 --- a/react/features/conference/components/native/styles.js +++ b/react/features/conference/components/native/styles.js @@ -22,20 +22,6 @@ export default createStyleSheet({ flex: 1 }), - displayNameBackdrop: { - alignSelf: 'center', - backgroundColor: 'rgba(28, 32, 37, 0.6)', - borderRadius: 4, - margin: 16, - paddingHorizontal: 16, - paddingVertical: 4 - }, - - displayNameText: { - color: ColorPalette.white, - fontSize: 14 - }, - gradient: { position: 'absolute', top: 0, diff --git a/react/features/display-name/components/DisplayName.native.js b/react/features/display-name/components/DisplayName.native.js deleted file mode 100644 index e69de29bb..000000000 diff --git a/react/features/display-name/components/index.native.js b/react/features/display-name/components/index.native.js new file mode 100644 index 000000000..a32ec6061 --- /dev/null +++ b/react/features/display-name/components/index.native.js @@ -0,0 +1,3 @@ +// @flow + +export * from './native'; diff --git a/react/features/display-name/components/index.web.js b/react/features/display-name/components/index.web.js new file mode 100644 index 000000000..40d5f4652 --- /dev/null +++ b/react/features/display-name/components/index.web.js @@ -0,0 +1,3 @@ +// @flow + +export * from './web'; diff --git a/react/features/conference/components/native/DisplayNameLabel.js b/react/features/display-name/components/native/DisplayNameLabel.js similarity index 99% rename from react/features/conference/components/native/DisplayNameLabel.js rename to react/features/display-name/components/native/DisplayNameLabel.js index 36d3991b2..be89d9c38 100644 --- a/react/features/conference/components/native/DisplayNameLabel.js +++ b/react/features/display-name/components/native/DisplayNameLabel.js @@ -9,7 +9,6 @@ import { shouldRenderParticipantVideo } from '../../../base/participants'; import { connect } from '../../../base/redux'; - import { shouldDisplayTileView } from '../../../video-layout'; import styles from './styles'; diff --git a/react/features/display-name/components/DisplayNamePrompt.native.js b/react/features/display-name/components/native/DisplayNamePrompt.js similarity index 76% rename from react/features/display-name/components/DisplayNamePrompt.native.js rename to react/features/display-name/components/native/DisplayNamePrompt.js index e3626f804..abdedbe56 100644 --- a/react/features/display-name/components/DisplayNamePrompt.native.js +++ b/react/features/display-name/components/native/DisplayNamePrompt.js @@ -1,11 +1,11 @@ // @flow import React from 'react'; -import { connect } from '../../base/redux'; +import { connect } from '../../../base/redux'; -import { InputDialog } from '../../base/dialog'; +import { InputDialog } from '../../../base/dialog'; -import AbstractDisplayNamePrompt from './AbstractDisplayNamePrompt'; +import AbstractDisplayNamePrompt from '../AbstractDisplayNamePrompt'; /** * Implements a component to render a display name prompt. diff --git a/react/features/display-name/components/native/index.js b/react/features/display-name/components/native/index.js new file mode 100644 index 000000000..fc844badf --- /dev/null +++ b/react/features/display-name/components/native/index.js @@ -0,0 +1,4 @@ +// @flow + +export { default as DisplayNameLabel } from './DisplayNameLabel'; +export { default as DisplayNamePrompt } from './DisplayNamePrompt'; diff --git a/react/features/display-name/components/native/styles.js b/react/features/display-name/components/native/styles.js new file mode 100644 index 000000000..79efe2a06 --- /dev/null +++ b/react/features/display-name/components/native/styles.js @@ -0,0 +1,19 @@ +// @flow + +import { ColorPalette } from '../../../base/styles'; + +export default { + displayNameBackdrop: { + alignSelf: 'center', + backgroundColor: 'rgba(28, 32, 37, 0.6)', + borderRadius: 4, + margin: 16, + paddingHorizontal: 16, + paddingVertical: 4 + }, + + displayNameText: { + color: ColorPalette.white, + fontSize: 14 + } +}; diff --git a/react/features/display-name/components/DisplayName.web.js b/react/features/display-name/components/web/DisplayName.js similarity index 96% rename from react/features/display-name/components/DisplayName.web.js rename to react/features/display-name/components/web/DisplayName.js index 759b5941f..42f620129 100644 --- a/react/features/display-name/components/DisplayName.web.js +++ b/react/features/display-name/components/web/DisplayName.js @@ -1,17 +1,17 @@ /* @flow */ import React, { Component } from 'react'; -import { connect } from '../../base/redux'; +import { connect } from '../../../base/redux'; import type { Dispatch } from 'redux'; -import { appendSuffix } from '../functions'; - -import { translate } from '../../base/i18n'; +import { translate } from '../../../base/i18n'; import { getParticipantDisplayName, getParticipantById -} from '../../base/participants'; -import { updateSettings } from '../../base/settings'; +} from '../../../base/participants'; +import { updateSettings } from '../../../base/settings'; + +import { appendSuffix } from '../../functions'; /** * The type of the React {@code Component} props of {@link DisplayName}. diff --git a/react/features/display-name/components/DisplayNamePrompt.web.js b/react/features/display-name/components/web/DisplayNamePrompt.js similarity index 93% rename from react/features/display-name/components/DisplayNamePrompt.web.js rename to react/features/display-name/components/web/DisplayNamePrompt.js index a8e2a2656..2fbd99ca6 100644 --- a/react/features/display-name/components/DisplayNamePrompt.web.js +++ b/react/features/display-name/components/web/DisplayNamePrompt.js @@ -1,15 +1,15 @@ /* @flow */ import React from 'react'; -import { connect } from '../../base/redux'; import { FieldTextStateless as TextField } from '@atlaskit/field-text'; -import { Dialog } from '../../base/dialog'; -import { translate } from '../../base/i18n'; +import { Dialog } from '../../../base/dialog'; +import { translate } from '../../../base/i18n'; +import { connect } from '../../../base/redux'; import AbstractDisplayNamePrompt, { type Props -} from './AbstractDisplayNamePrompt'; +} from '../AbstractDisplayNamePrompt'; /** * The type of the React {@code Component} props of {@link DisplayNamePrompt}. diff --git a/react/features/display-name/components/index.js b/react/features/display-name/components/web/index.js similarity index 92% rename from react/features/display-name/components/index.js rename to react/features/display-name/components/web/index.js index 29a1a619f..93301ecee 100644 --- a/react/features/display-name/components/index.js +++ b/react/features/display-name/components/web/index.js @@ -1,2 +1,4 @@ +// @flow + export { default as DisplayName } from './DisplayName'; export { default as DisplayNamePrompt } from './DisplayNamePrompt'; diff --git a/react/features/display-name/index.js b/react/features/display-name/index.js index cc25e46aa..c13d3e017 100644 --- a/react/features/display-name/index.js +++ b/react/features/display-name/index.js @@ -1,3 +1,5 @@ +// @flow + export * from './actions'; export * from './components'; export * from './functions';