From e164a23cf064820bfca5629b7372610666c3d98a Mon Sep 17 00:00:00 2001 From: Bettenbuk Zoltan Date: Wed, 3 Oct 2018 12:50:11 +0200 Subject: [PATCH] [RN] Fix start recording dialog after dropbox changes --- .../{DialogContent.native.js => DialogContent.js} | 7 ++++--- react/features/base/dialog/components/DialogContent.web.js | 0 .../base/dialog/components/{styles.js => styles.native.js} | 0 react/features/base/dialog/components/styles.web.js | 5 +++++ .../components/Recording/StartRecordingDialogContent.js | 5 +++-- 5 files changed, 12 insertions(+), 5 deletions(-) rename react/features/base/dialog/components/{DialogContent.native.js => DialogContent.js} (84%) delete mode 100644 react/features/base/dialog/components/DialogContent.web.js rename react/features/base/dialog/components/{styles.js => styles.native.js} (100%) create mode 100644 react/features/base/dialog/components/styles.web.js diff --git a/react/features/base/dialog/components/DialogContent.native.js b/react/features/base/dialog/components/DialogContent.js similarity index 84% rename from react/features/base/dialog/components/DialogContent.native.js rename to react/features/base/dialog/components/DialogContent.js index c9da87f76..a7a20d021 100644 --- a/react/features/base/dialog/components/DialogContent.native.js +++ b/react/features/base/dialog/components/DialogContent.js @@ -1,7 +1,8 @@ // @flow import React, { Component } from 'react'; -import { Text, View } from 'react-native'; + +import { Container, Text } from '../../react'; import { dialog as styles } from './styles'; @@ -31,9 +32,9 @@ export default class DialogContent extends Component { : children; return ( - + { childrenComponent } - + ); } } diff --git a/react/features/base/dialog/components/DialogContent.web.js b/react/features/base/dialog/components/DialogContent.web.js deleted file mode 100644 index e69de29bb..000000000 diff --git a/react/features/base/dialog/components/styles.js b/react/features/base/dialog/components/styles.native.js similarity index 100% rename from react/features/base/dialog/components/styles.js rename to react/features/base/dialog/components/styles.native.js diff --git a/react/features/base/dialog/components/styles.web.js b/react/features/base/dialog/components/styles.web.js new file mode 100644 index 000000000..ee4235f58 --- /dev/null +++ b/react/features/base/dialog/components/styles.web.js @@ -0,0 +1,5 @@ +/** + * Placeholder styles for web to be able to use cross platform components + * unmodified such as {@code DialogContent}. + */ +export const dialog = {}; diff --git a/react/features/recording/components/Recording/StartRecordingDialogContent.js b/react/features/recording/components/Recording/StartRecordingDialogContent.js index 992d80f5e..98ed7ffb6 100644 --- a/react/features/recording/components/Recording/StartRecordingDialogContent.js +++ b/react/features/recording/components/Recording/StartRecordingDialogContent.js @@ -7,6 +7,7 @@ import { createRecordingDialogEvent, sendAnalytics } from '../../../analytics'; +import { DialogContent } from '../../../base/dialog'; import { translate } from '../../../base/i18n'; import { Container, @@ -98,9 +99,9 @@ class StartRecordingDialogContent extends Component { */ _renderNoIntegrationsContent() { return ( - + { this.props.t('recording.startRecordingBody') } - + ); }