From 71edea8aac4763357bb9ccc38245fb7d3bfeec4e Mon Sep 17 00:00:00 2001 From: Bettenbuk Zoltan Date: Mon, 19 Nov 2018 15:09:09 +0100 Subject: [PATCH] Rearrange recording feature files --- .../LiveStream/AbstractLiveStreamButton.js | 6 ++++-- .../LiveStream/GoogleSigninForm.web.js | 0 .../recording/components/LiveStream/_.native.js | 3 +++ .../recording/components/LiveStream/_.web.js | 3 +++ .../recording/components/LiveStream/index.js | 6 +++--- .../GoogleSigninForm.js} | 4 ++-- .../LiveStreamButton.js} | 4 ++-- .../StartLiveStreamDialog.js} | 9 +++++---- .../StopLiveStreamDialog.js} | 6 +++--- .../StreamKeyForm.js} | 5 +++-- .../StreamKeyPicker.js} | 2 +- .../components/LiveStream/native/index.js | 5 +++++ .../{styles.native.js => native/styles.js} | 6 +++++- .../components/LiveStream/styles.web.js | 0 .../LiveStreamButton.js} | 6 +++--- .../StartLiveStreamDialog.js} | 7 ++++--- .../StopLiveStreamDialog.js} | 4 ++-- .../StreamKeyForm.js} | 4 ++-- .../StreamKeyPicker.js} | 2 +- .../components/LiveStream/web/index.js | 5 +++++ .../Recording/AbstractRecordButton.js | 2 +- .../recording/components/Recording/_.native.js | 3 +++ .../recording/components/Recording/_.web.js | 3 +++ .../recording/components/Recording/index.js | 6 +++--- .../RecordButton.js} | 4 ++-- .../StopRecordingDialog.js} | 6 +++--- .../components/Recording/native/index.js | 4 ++++ .../RecordButton.js} | 4 ++-- .../StopRecordingDialog.js} | 4 ++-- .../recording/components/Recording/web/index.js | 4 ++++ .../components/RecordingExpandedLabel.web.js | 0 react/features/recording/components/_.native.js | 3 +++ react/features/recording/components/_.web.js | 3 +++ react/features/recording/components/index.js | 17 +++++------------ .../RecordingExpandedLabel.js} | 8 ++++---- .../RecordingLabel.js} | 9 +++++---- .../recording/components/native/index.js | 4 ++++ .../recording/components/{ => native}/styles.js | 2 +- .../RecordingLabel.js} | 8 ++++---- .../features/recording/components/web/index.js | 3 +++ 40 files changed, 115 insertions(+), 69 deletions(-) delete mode 100644 react/features/recording/components/LiveStream/GoogleSigninForm.web.js create mode 100644 react/features/recording/components/LiveStream/_.native.js create mode 100644 react/features/recording/components/LiveStream/_.web.js rename react/features/recording/components/LiveStream/{GoogleSigninForm.native.js => native/GoogleSigninForm.js} (98%) rename react/features/recording/components/LiveStream/{LiveStreamButton.native.js => native/LiveStreamButton.js} (81%) rename react/features/recording/components/LiveStream/{StartLiveStreamDialog.native.js => native/StartLiveStreamDialog.js} (94%) rename react/features/recording/components/LiveStream/{StopLiveStreamDialog.native.js => native/StopLiveStreamDialog.js} (83%) rename react/features/recording/components/LiveStream/{StreamKeyForm.native.js => native/StreamKeyForm.js} (96%) rename react/features/recording/components/LiveStream/{StreamKeyPicker.native.js => native/StreamKeyPicker.js} (98%) create mode 100644 react/features/recording/components/LiveStream/native/index.js rename react/features/recording/components/LiveStream/{styles.native.js => native/styles.js} (95%) delete mode 100644 react/features/recording/components/LiveStream/styles.web.js rename react/features/recording/components/LiveStream/{LiveStreamButton.web.js => web/LiveStreamButton.js} (96%) rename react/features/recording/components/LiveStream/{StartLiveStreamDialog.web.js => web/StartLiveStreamDialog.js} (98%) rename react/features/recording/components/LiveStream/{StopLiveStreamDialog.web.js => web/StopLiveStreamDialog.js} (86%) rename react/features/recording/components/LiveStream/{StreamKeyForm.web.js => web/StreamKeyForm.js} (96%) rename react/features/recording/components/LiveStream/{StreamKeyPicker.web.js => web/StreamKeyPicker.js} (99%) create mode 100644 react/features/recording/components/LiveStream/web/index.js create mode 100644 react/features/recording/components/Recording/_.native.js create mode 100644 react/features/recording/components/Recording/_.web.js rename react/features/recording/components/Recording/{RecordButton.native.js => native/RecordButton.js} (82%) rename react/features/recording/components/Recording/{StopRecordingDialog.native.js => native/StopRecordingDialog.js} (83%) create mode 100644 react/features/recording/components/Recording/native/index.js rename react/features/recording/components/Recording/{RecordButton.web.js => web/RecordButton.js} (97%) rename react/features/recording/components/Recording/{StopRecordingDialog.web.js => web/StopRecordingDialog.js} (87%) create mode 100644 react/features/recording/components/Recording/web/index.js delete mode 100644 react/features/recording/components/RecordingExpandedLabel.web.js create mode 100644 react/features/recording/components/_.native.js create mode 100644 react/features/recording/components/_.web.js rename react/features/recording/components/{RecordingExpandedLabel.native.js => native/RecordingExpandedLabel.js} (92%) rename react/features/recording/components/{RecordingLabel.native.js => native/RecordingLabel.js} (87%) create mode 100644 react/features/recording/components/native/index.js rename react/features/recording/components/{ => native}/styles.js (87%) rename react/features/recording/components/{RecordingLabel.web.js => web/RecordingLabel.js} (82%) create mode 100644 react/features/recording/components/web/index.js diff --git a/react/features/recording/components/LiveStream/AbstractLiveStreamButton.js b/react/features/recording/components/LiveStream/AbstractLiveStreamButton.js index 02cdb51cb..445d027b5 100644 --- a/react/features/recording/components/LiveStream/AbstractLiveStreamButton.js +++ b/react/features/recording/components/LiveStream/AbstractLiveStreamButton.js @@ -10,8 +10,10 @@ import { import { getActiveSession } from '../../functions'; -import StartLiveStreamDialog from './StartLiveStreamDialog'; -import StopLiveStreamDialog from './StopLiveStreamDialog'; +import { + StartLiveStreamDialog, + StopLiveStreamDialog +} from './_'; /** * The type of the React {@code Component} props of diff --git a/react/features/recording/components/LiveStream/GoogleSigninForm.web.js b/react/features/recording/components/LiveStream/GoogleSigninForm.web.js deleted file mode 100644 index e69de29bb..000000000 diff --git a/react/features/recording/components/LiveStream/_.native.js b/react/features/recording/components/LiveStream/_.native.js new file mode 100644 index 000000000..a32ec6061 --- /dev/null +++ b/react/features/recording/components/LiveStream/_.native.js @@ -0,0 +1,3 @@ +// @flow + +export * from './native'; diff --git a/react/features/recording/components/LiveStream/_.web.js b/react/features/recording/components/LiveStream/_.web.js new file mode 100644 index 000000000..40d5f4652 --- /dev/null +++ b/react/features/recording/components/LiveStream/_.web.js @@ -0,0 +1,3 @@ +// @flow + +export * from './web'; diff --git a/react/features/recording/components/LiveStream/index.js b/react/features/recording/components/LiveStream/index.js index 07b9ab7b6..bf0c7deb0 100644 --- a/react/features/recording/components/LiveStream/index.js +++ b/react/features/recording/components/LiveStream/index.js @@ -1,3 +1,3 @@ -export { default as LiveStreamButton } from './LiveStreamButton'; -export { default as StartLiveStreamDialog } from './StartLiveStreamDialog'; -export { default as StopLiveStreamDialog } from './StopLiveStreamDialog'; +// @flow + +export * from './_'; diff --git a/react/features/recording/components/LiveStream/GoogleSigninForm.native.js b/react/features/recording/components/LiveStream/native/GoogleSigninForm.js similarity index 98% rename from react/features/recording/components/LiveStream/GoogleSigninForm.native.js rename to react/features/recording/components/LiveStream/native/GoogleSigninForm.js index 40efe80cf..131d51a2b 100644 --- a/react/features/recording/components/LiveStream/GoogleSigninForm.native.js +++ b/react/features/recording/components/LiveStream/native/GoogleSigninForm.js @@ -4,7 +4,7 @@ import React, { Component } from 'react'; import { Platform, Text, View } from 'react-native'; import { connect } from 'react-redux'; -import { translate } from '../../../base/i18n'; +import { translate } from '../../../../base/i18n'; import { GOOGLE_API_STATES, @@ -12,7 +12,7 @@ import { googleApi, GoogleSignInButton, setGoogleAPIState -} from '../../../google-api'; +} from '../../../../google-api'; import styles from './styles'; diff --git a/react/features/recording/components/LiveStream/LiveStreamButton.native.js b/react/features/recording/components/LiveStream/native/LiveStreamButton.js similarity index 81% rename from react/features/recording/components/LiveStream/LiveStreamButton.native.js rename to react/features/recording/components/LiveStream/native/LiveStreamButton.js index 5e13f58ea..d43579793 100644 --- a/react/features/recording/components/LiveStream/LiveStreamButton.native.js +++ b/react/features/recording/components/LiveStream/native/LiveStreamButton.js @@ -2,12 +2,12 @@ import { connect } from 'react-redux'; -import { translate } from '../../../base/i18n'; +import { translate } from '../../../../base/i18n'; import AbstractLiveStreamButton, { _mapStateToProps, type Props -} from './AbstractLiveStreamButton'; +} from '../AbstractLiveStreamButton'; /** * An implementation of a button for starting and stopping live streaming. diff --git a/react/features/recording/components/LiveStream/StartLiveStreamDialog.native.js b/react/features/recording/components/LiveStream/native/StartLiveStreamDialog.js similarity index 94% rename from react/features/recording/components/LiveStream/StartLiveStreamDialog.native.js rename to react/features/recording/components/LiveStream/native/StartLiveStreamDialog.js index 0e0bcfb99..4ad93bdb8 100644 --- a/react/features/recording/components/LiveStream/StartLiveStreamDialog.native.js +++ b/react/features/recording/components/LiveStream/native/StartLiveStreamDialog.js @@ -4,14 +4,15 @@ import React from 'react'; import { View } from 'react-native'; import { connect } from 'react-redux'; -import { translate } from '../../../base/i18n'; -import { googleApi } from '../../../google-api'; +import { translate } from '../../../../base/i18n'; +import { googleApi } from '../../../../google-api'; -import { setLiveStreamKey } from '../../actions'; +import { setLiveStreamKey } from '../../../actions'; import AbstractStartLiveStreamDialog, -{ _mapStateToProps, type Props } from './AbstractStartLiveStreamDialog'; +{ _mapStateToProps, type Props } from '../AbstractStartLiveStreamDialog'; + import GoogleSigninForm from './GoogleSigninForm'; import StreamKeyForm from './StreamKeyForm'; import StreamKeyPicker from './StreamKeyPicker'; diff --git a/react/features/recording/components/LiveStream/StopLiveStreamDialog.native.js b/react/features/recording/components/LiveStream/native/StopLiveStreamDialog.js similarity index 83% rename from react/features/recording/components/LiveStream/StopLiveStreamDialog.native.js rename to react/features/recording/components/LiveStream/native/StopLiveStreamDialog.js index 764a7c4f8..808b857a4 100644 --- a/react/features/recording/components/LiveStream/StopLiveStreamDialog.native.js +++ b/react/features/recording/components/LiveStream/native/StopLiveStreamDialog.js @@ -3,12 +3,12 @@ import React from 'react'; import { connect } from 'react-redux'; -import { DialogContent } from '../../../base/dialog'; -import { translate } from '../../../base/i18n'; +import { DialogContent } from '../../../../base/dialog'; +import { translate } from '../../../../base/i18n'; import AbstractStopLiveStreamDialog, { _mapStateToProps -} from './AbstractStopLiveStreamDialog'; +} from '../AbstractStopLiveStreamDialog'; /** * A React Component for confirming the participant wishes to stop the currently diff --git a/react/features/recording/components/LiveStream/StreamKeyForm.native.js b/react/features/recording/components/LiveStream/native/StreamKeyForm.js similarity index 96% rename from react/features/recording/components/LiveStream/StreamKeyForm.native.js rename to react/features/recording/components/LiveStream/native/StreamKeyForm.js index 409fc4efc..91606ff62 100644 --- a/react/features/recording/components/LiveStream/StreamKeyForm.native.js +++ b/react/features/recording/components/LiveStream/native/StreamKeyForm.js @@ -3,11 +3,12 @@ import React from 'react'; import { Linking, Text, TextInput, TouchableOpacity, View } from 'react-native'; -import { translate } from '../../../base/i18n'; +import { translate } from '../../../../base/i18n'; import AbstractStreamKeyForm, { type Props -} from './AbstractStreamKeyForm'; +} from '../AbstractStreamKeyForm'; + import styles from './styles'; /** diff --git a/react/features/recording/components/LiveStream/StreamKeyPicker.native.js b/react/features/recording/components/LiveStream/native/StreamKeyPicker.js similarity index 98% rename from react/features/recording/components/LiveStream/StreamKeyPicker.native.js rename to react/features/recording/components/LiveStream/native/StreamKeyPicker.js index 89eb45197..954bce01f 100644 --- a/react/features/recording/components/LiveStream/StreamKeyPicker.native.js +++ b/react/features/recording/components/LiveStream/native/StreamKeyPicker.js @@ -3,7 +3,7 @@ import React, { Component } from 'react'; import { Text, TouchableHighlight, View } from 'react-native'; -import { translate } from '../../../base/i18n'; +import { translate } from '../../../../base/i18n'; import styles, { ACTIVE_OPACITY, TOUCHABLE_UNDERLAY } from './styles'; diff --git a/react/features/recording/components/LiveStream/native/index.js b/react/features/recording/components/LiveStream/native/index.js new file mode 100644 index 000000000..fa574bac7 --- /dev/null +++ b/react/features/recording/components/LiveStream/native/index.js @@ -0,0 +1,5 @@ +// @flow + +export { default as LiveStreamButton } from './LiveStreamButton'; +export { default as StartLiveStreamDialog } from './StartLiveStreamDialog'; +export { default as StopLiveStreamDialog } from './StopLiveStreamDialog'; diff --git a/react/features/recording/components/LiveStream/styles.native.js b/react/features/recording/components/LiveStream/native/styles.js similarity index 95% rename from react/features/recording/components/LiveStream/styles.native.js rename to react/features/recording/components/LiveStream/native/styles.js index 07fc2a17c..8cb4d21b8 100644 --- a/react/features/recording/components/LiveStream/styles.native.js +++ b/react/features/recording/components/LiveStream/native/styles.js @@ -1,6 +1,10 @@ // @flow -import { BoxModel, ColorPalette, createStyleSheet } from '../../../base/styles'; +import { + BoxModel, + ColorPalette, + createStyleSheet +} from '../../../../base/styles'; /** * Opacity of the TouchableHighlight. diff --git a/react/features/recording/components/LiveStream/styles.web.js b/react/features/recording/components/LiveStream/styles.web.js deleted file mode 100644 index e69de29bb..000000000 diff --git a/react/features/recording/components/LiveStream/LiveStreamButton.web.js b/react/features/recording/components/LiveStream/web/LiveStreamButton.js similarity index 96% rename from react/features/recording/components/LiveStream/LiveStreamButton.web.js rename to react/features/recording/components/LiveStream/web/LiveStreamButton.js index 7d4346a38..3921440db 100644 --- a/react/features/recording/components/LiveStream/LiveStreamButton.web.js +++ b/react/features/recording/components/LiveStream/web/LiveStreamButton.js @@ -3,13 +3,13 @@ import React from 'react'; import { connect } from 'react-redux'; -import { translate } from '../../../base/i18n'; -import { Container, Text } from '../../../base/react'; +import { translate } from '../../../../base/i18n'; +import { Container, Text } from '../../../../base/react'; import AbstractLiveStreamButton, { _mapStateToProps as _abstractMapStateToProps, type Props as AbstractProps -} from './AbstractLiveStreamButton'; +} from '../AbstractLiveStreamButton'; declare var interfaceConfig: Object; diff --git a/react/features/recording/components/LiveStream/StartLiveStreamDialog.web.js b/react/features/recording/components/LiveStream/web/StartLiveStreamDialog.js similarity index 98% rename from react/features/recording/components/LiveStream/StartLiveStreamDialog.web.js rename to react/features/recording/components/LiveStream/web/StartLiveStreamDialog.js index e46d1ca4c..419b8a8dd 100644 --- a/react/features/recording/components/LiveStream/StartLiveStreamDialog.web.js +++ b/react/features/recording/components/LiveStream/web/StartLiveStreamDialog.js @@ -4,7 +4,7 @@ import Spinner from '@atlaskit/spinner'; import React from 'react'; import { connect } from 'react-redux'; -import { translate } from '../../../base/i18n'; +import { translate } from '../../../../base/i18n'; import { GOOGLE_API_STATES, @@ -15,12 +15,13 @@ import { showAccountSelection, signIn, updateProfile -} from '../../../google-api'; +} from '../../../../google-api'; import AbstractStartLiveStreamDialog, { _mapStateToProps as _abstractMapStateToProps, type Props as AbstractProps -} from './AbstractStartLiveStreamDialog'; +} from '../AbstractStartLiveStreamDialog'; + import StreamKeyPicker from './StreamKeyPicker'; import StreamKeyForm from './StreamKeyForm'; diff --git a/react/features/recording/components/LiveStream/StopLiveStreamDialog.web.js b/react/features/recording/components/LiveStream/web/StopLiveStreamDialog.js similarity index 86% rename from react/features/recording/components/LiveStream/StopLiveStreamDialog.web.js rename to react/features/recording/components/LiveStream/web/StopLiveStreamDialog.js index fb334deab..14cc6e03a 100644 --- a/react/features/recording/components/LiveStream/StopLiveStreamDialog.web.js +++ b/react/features/recording/components/LiveStream/web/StopLiveStreamDialog.js @@ -2,11 +2,11 @@ import { connect } from 'react-redux'; -import { translate } from '../../../base/i18n'; +import { translate } from '../../../../base/i18n'; import AbstractStopLiveStreamDialog, { _mapStateToProps -} from './AbstractStopLiveStreamDialog'; +} from '../AbstractStopLiveStreamDialog'; /** * A React Component for confirming the participant wishes to stop the currently diff --git a/react/features/recording/components/LiveStream/StreamKeyForm.web.js b/react/features/recording/components/LiveStream/web/StreamKeyForm.js similarity index 96% rename from react/features/recording/components/LiveStream/StreamKeyForm.web.js rename to react/features/recording/components/LiveStream/web/StreamKeyForm.js index 97c0cac0a..9ce96d621 100644 --- a/react/features/recording/components/LiveStream/StreamKeyForm.web.js +++ b/react/features/recording/components/LiveStream/web/StreamKeyForm.js @@ -3,11 +3,11 @@ import { FieldTextStateless } from '@atlaskit/field-text'; import React from 'react'; -import { translate } from '../../../base/i18n'; +import { translate } from '../../../../base/i18n'; import AbstractStreamKeyForm, { type Props -} from './AbstractStreamKeyForm'; +} from '../AbstractStreamKeyForm'; /** * A React Component for entering a key for starting a YouTube live stream. diff --git a/react/features/recording/components/LiveStream/StreamKeyPicker.web.js b/react/features/recording/components/LiveStream/web/StreamKeyPicker.js similarity index 99% rename from react/features/recording/components/LiveStream/StreamKeyPicker.web.js rename to react/features/recording/components/LiveStream/web/StreamKeyPicker.js index 9b0be54cd..f83ae05dd 100644 --- a/react/features/recording/components/LiveStream/StreamKeyPicker.web.js +++ b/react/features/recording/components/LiveStream/web/StreamKeyPicker.js @@ -7,7 +7,7 @@ import { } from '@atlaskit/dropdown-menu'; import React, { PureComponent } from 'react'; -import { translate } from '../../../base/i18n'; +import { translate } from '../../../../base/i18n'; /** * The type of the React {@code Component} props of {@link StreamKeyPicker}. diff --git a/react/features/recording/components/LiveStream/web/index.js b/react/features/recording/components/LiveStream/web/index.js new file mode 100644 index 000000000..fa574bac7 --- /dev/null +++ b/react/features/recording/components/LiveStream/web/index.js @@ -0,0 +1,5 @@ +// @flow + +export { default as LiveStreamButton } from './LiveStreamButton'; +export { default as StartLiveStreamDialog } from './StartLiveStreamDialog'; +export { default as StopLiveStreamDialog } from './StopLiveStreamDialog'; diff --git a/react/features/recording/components/Recording/AbstractRecordButton.js b/react/features/recording/components/Recording/AbstractRecordButton.js index 4270f8239..1e642c3a2 100644 --- a/react/features/recording/components/Recording/AbstractRecordButton.js +++ b/react/features/recording/components/Recording/AbstractRecordButton.js @@ -19,7 +19,7 @@ import { import { getActiveSession } from '../../functions'; import StartRecordingDialog from './StartRecordingDialog'; -import StopRecordingDialog from './StopRecordingDialog'; +import { StopRecordingDialog } from './_'; /** * The type of the React {@code Component} props of diff --git a/react/features/recording/components/Recording/_.native.js b/react/features/recording/components/Recording/_.native.js new file mode 100644 index 000000000..a32ec6061 --- /dev/null +++ b/react/features/recording/components/Recording/_.native.js @@ -0,0 +1,3 @@ +// @flow + +export * from './native'; diff --git a/react/features/recording/components/Recording/_.web.js b/react/features/recording/components/Recording/_.web.js new file mode 100644 index 000000000..40d5f4652 --- /dev/null +++ b/react/features/recording/components/Recording/_.web.js @@ -0,0 +1,3 @@ +// @flow + +export * from './web'; diff --git a/react/features/recording/components/Recording/index.js b/react/features/recording/components/Recording/index.js index 198854835..bf0c7deb0 100644 --- a/react/features/recording/components/Recording/index.js +++ b/react/features/recording/components/Recording/index.js @@ -1,3 +1,3 @@ -export { default as RecordButton } from './RecordButton'; -export { default as StartRecordingDialog } from './StartRecordingDialog'; -export { default as StopRecordingDialog } from './StopRecordingDialog'; +// @flow + +export * from './_'; diff --git a/react/features/recording/components/Recording/RecordButton.native.js b/react/features/recording/components/Recording/native/RecordButton.js similarity index 82% rename from react/features/recording/components/Recording/RecordButton.native.js rename to react/features/recording/components/Recording/native/RecordButton.js index 62e283e93..5c77a4a37 100644 --- a/react/features/recording/components/Recording/RecordButton.native.js +++ b/react/features/recording/components/Recording/native/RecordButton.js @@ -2,12 +2,12 @@ import { connect } from 'react-redux'; -import { translate } from '../../../base/i18n'; +import { translate } from '../../../../base/i18n'; import AbstractRecordButton, { _mapStateToProps, type Props -} from './AbstractRecordButton'; +} from '../AbstractRecordButton'; /** * An implementation of a button for starting and stopping recording. diff --git a/react/features/recording/components/Recording/StopRecordingDialog.native.js b/react/features/recording/components/Recording/native/StopRecordingDialog.js similarity index 83% rename from react/features/recording/components/Recording/StopRecordingDialog.native.js rename to react/features/recording/components/Recording/native/StopRecordingDialog.js index acee52dfe..9bf9216fc 100644 --- a/react/features/recording/components/Recording/StopRecordingDialog.native.js +++ b/react/features/recording/components/Recording/native/StopRecordingDialog.js @@ -3,13 +3,13 @@ import React from 'react'; import { connect } from 'react-redux'; -import { DialogContent } from '../../../base/dialog'; -import { translate } from '../../../base/i18n'; +import { DialogContent } from '../../../../base/dialog'; +import { translate } from '../../../../base/i18n'; import AbstractStopRecordingDialog, { type Props, _mapStateToProps -} from './AbstractStopRecordingDialog'; +} from '../AbstractStopRecordingDialog'; /** * React Component for getting confirmation to stop a file recording session in diff --git a/react/features/recording/components/Recording/native/index.js b/react/features/recording/components/Recording/native/index.js new file mode 100644 index 000000000..852c69138 --- /dev/null +++ b/react/features/recording/components/Recording/native/index.js @@ -0,0 +1,4 @@ +// @flow + +export { default as RecordButton } from './RecordButton'; +export { default as StopRecordingDialog } from './StopRecordingDialog'; diff --git a/react/features/recording/components/Recording/RecordButton.web.js b/react/features/recording/components/Recording/web/RecordButton.js similarity index 97% rename from react/features/recording/components/Recording/RecordButton.web.js rename to react/features/recording/components/Recording/web/RecordButton.js index 91727324a..8abc848f1 100644 --- a/react/features/recording/components/Recording/RecordButton.web.js +++ b/react/features/recording/components/Recording/web/RecordButton.js @@ -2,12 +2,12 @@ import { connect } from 'react-redux'; -import { translate } from '../../../base/i18n'; +import { translate } from '../../../../base/i18n'; import AbstractRecordButton, { _mapStateToProps as _abstractMapStateToProps, type Props as AbstractProps -} from './AbstractRecordButton'; +} from '../AbstractRecordButton'; declare var interfaceConfig: Object; diff --git a/react/features/recording/components/Recording/StopRecordingDialog.web.js b/react/features/recording/components/Recording/web/StopRecordingDialog.js similarity index 87% rename from react/features/recording/components/Recording/StopRecordingDialog.web.js rename to react/features/recording/components/Recording/web/StopRecordingDialog.js index f4eb44ac6..3c0a4533d 100644 --- a/react/features/recording/components/Recording/StopRecordingDialog.web.js +++ b/react/features/recording/components/Recording/web/StopRecordingDialog.js @@ -2,12 +2,12 @@ import { connect } from 'react-redux'; -import { translate } from '../../../base/i18n'; +import { translate } from '../../../../base/i18n'; import AbstractStopRecordingDialog, { type Props, _mapStateToProps -} from './AbstractStopRecordingDialog'; +} from '../AbstractStopRecordingDialog'; /** * React Component for getting confirmation to stop a file recording session in diff --git a/react/features/recording/components/Recording/web/index.js b/react/features/recording/components/Recording/web/index.js new file mode 100644 index 000000000..852c69138 --- /dev/null +++ b/react/features/recording/components/Recording/web/index.js @@ -0,0 +1,4 @@ +// @flow + +export { default as RecordButton } from './RecordButton'; +export { default as StopRecordingDialog } from './StopRecordingDialog'; diff --git a/react/features/recording/components/RecordingExpandedLabel.web.js b/react/features/recording/components/RecordingExpandedLabel.web.js deleted file mode 100644 index e69de29bb..000000000 diff --git a/react/features/recording/components/_.native.js b/react/features/recording/components/_.native.js new file mode 100644 index 000000000..a32ec6061 --- /dev/null +++ b/react/features/recording/components/_.native.js @@ -0,0 +1,3 @@ +// @flow + +export * from './native'; diff --git a/react/features/recording/components/_.web.js b/react/features/recording/components/_.web.js new file mode 100644 index 000000000..40d5f4652 --- /dev/null +++ b/react/features/recording/components/_.web.js @@ -0,0 +1,3 @@ +// @flow + +export * from './web'; diff --git a/react/features/recording/components/index.js b/react/features/recording/components/index.js index 3fda26219..8006c1699 100644 --- a/react/features/recording/components/index.js +++ b/react/features/recording/components/index.js @@ -1,12 +1,5 @@ -export { - LiveStreamButton, - StartLiveStreamDialog, - StopLiveStreamDialog -} from './LiveStream'; -export { - RecordButton, - StartRecordingDialog, - StopRecordingDialog -} from './Recording'; -export { default as RecordingLabel } from './RecordingLabel'; -export { default as RecordingExpandedLabel } from './RecordingExpandedLabel'; +// @flow + +export * from './_'; +export * from './LiveStream'; +export * from './Recording'; diff --git a/react/features/recording/components/RecordingExpandedLabel.native.js b/react/features/recording/components/native/RecordingExpandedLabel.js similarity index 92% rename from react/features/recording/components/RecordingExpandedLabel.native.js rename to react/features/recording/components/native/RecordingExpandedLabel.js index 298b44c4f..968d76793 100644 --- a/react/features/recording/components/RecordingExpandedLabel.native.js +++ b/react/features/recording/components/native/RecordingExpandedLabel.js @@ -2,14 +2,14 @@ import { connect } from 'react-redux'; -import { translate } from '../../base/i18n'; -import { JitsiRecordingConstants } from '../../base/lib-jitsi-meet'; +import { translate } from '../../../base/i18n'; +import { JitsiRecordingConstants } from '../../../base/lib-jitsi-meet'; import { ExpandedLabel, type Props as AbstractProps -} from '../../base/label'; +} from '../../../base/label'; -import { getSessionStatusToShow } from '../functions'; +import { getSessionStatusToShow } from '../../functions'; import { LIVE_LABEL_COLOR, REC_LABEL_COLOR } from './styles'; diff --git a/react/features/recording/components/RecordingLabel.native.js b/react/features/recording/components/native/RecordingLabel.js similarity index 87% rename from react/features/recording/components/RecordingLabel.native.js rename to react/features/recording/components/native/RecordingLabel.js index fdbb7d418..13063dc7d 100644 --- a/react/features/recording/components/RecordingLabel.native.js +++ b/react/features/recording/components/native/RecordingLabel.js @@ -3,13 +3,14 @@ import React from 'react'; import { connect } from 'react-redux'; -import { translate } from '../../base/i18n'; -import { CircularLabel } from '../../base/label'; -import { JitsiRecordingConstants } from '../../base/lib-jitsi-meet'; +import { translate } from '../../../base/i18n'; +import { CircularLabel } from '../../../base/label'; +import { JitsiRecordingConstants } from '../../../base/lib-jitsi-meet'; import AbstractRecordingLabel, { _mapStateToProps -} from './AbstractRecordingLabel'; +} from '../AbstractRecordingLabel'; + import styles from './styles'; /** diff --git a/react/features/recording/components/native/index.js b/react/features/recording/components/native/index.js new file mode 100644 index 000000000..7c3fda466 --- /dev/null +++ b/react/features/recording/components/native/index.js @@ -0,0 +1,4 @@ +// @flow + +export { default as RecordingExpandedLabel } from './RecordingExpandedLabel'; +export { default as RecordingLabel } from './RecordingLabel'; diff --git a/react/features/recording/components/styles.js b/react/features/recording/components/native/styles.js similarity index 87% rename from react/features/recording/components/styles.js rename to react/features/recording/components/native/styles.js index e82e9c52c..c8f494053 100644 --- a/react/features/recording/components/styles.js +++ b/react/features/recording/components/native/styles.js @@ -1,6 +1,6 @@ // @flow -import { ColorPalette, createStyleSheet } from '../../base/styles'; +import { ColorPalette, createStyleSheet } from '../../../base/styles'; export const LIVE_LABEL_COLOR = ColorPalette.blue; export const REC_LABEL_COLOR = ColorPalette.red; diff --git a/react/features/recording/components/RecordingLabel.web.js b/react/features/recording/components/web/RecordingLabel.js similarity index 82% rename from react/features/recording/components/RecordingLabel.web.js rename to react/features/recording/components/web/RecordingLabel.js index d66096536..1c66fcf13 100644 --- a/react/features/recording/components/RecordingLabel.web.js +++ b/react/features/recording/components/web/RecordingLabel.js @@ -3,13 +3,13 @@ import React from 'react'; import { connect } from 'react-redux'; -import { CircularLabel } from '../../base/label'; -import { JitsiRecordingConstants } from '../../base/lib-jitsi-meet'; -import { translate } from '../../base/i18n'; +import { CircularLabel } from '../../../base/label'; +import { JitsiRecordingConstants } from '../../../base/lib-jitsi-meet'; +import { translate } from '../../../base/i18n'; import AbstractRecordingLabel, { _mapStateToProps -} from './AbstractRecordingLabel'; +} from '../AbstractRecordingLabel'; /** * Implements a React {@link Component} which displays the current state of diff --git a/react/features/recording/components/web/index.js b/react/features/recording/components/web/index.js new file mode 100644 index 000000000..2004cf90b --- /dev/null +++ b/react/features/recording/components/web/index.js @@ -0,0 +1,3 @@ +// @flow + +export { default as RecordingLabel } from './RecordingLabel';