diff --git a/react/features/base/modal/components/JitsiModal.js b/react/features/base/modal/components/JitsiModal.js index e489fdb35..d61cc86e7 100644 --- a/react/features/base/modal/components/JitsiModal.js +++ b/react/features/base/modal/components/JitsiModal.js @@ -66,6 +66,11 @@ type Props = { */ position?: string, + /** + * True if the header with navigation should be shown, false otherwise. + */ + showHeaderWithNavigation: boolean, + /** * Additional style to be appended to the View containing the content of the modal. */ @@ -98,7 +103,17 @@ class JitsiModal extends PureComponent { * @inheritdoc */ render() { - const { _headerStyles, _show, _styles, children, footerComponent, headerProps, position, style } = this.props; + const { + _headerStyles, + _show, + _styles, + children, + footerComponent, + headerProps, + position, + showHeaderWithNavigation, + style + } = this.props; return ( { _styles.page, style ] }> - + onPressBack = { this._onRequestClose } />} { children } diff --git a/react/features/chat/components/native/Chat.js b/react/features/chat/components/native/Chat.js index b1159a5c9..39e232cc3 100644 --- a/react/features/chat/components/native/Chat.js +++ b/react/features/chat/components/native/Chat.js @@ -44,7 +44,8 @@ class Chat extends AbstractChat { headerLabelKey: 'chat.title' }} modalId = { CHAT_VIEW_MODAL_ID } - onClose = { this._onClose }> + onClose = { this._onClose } + showHeaderWithNavigation = { true }> diff --git a/react/features/etherpad/components/native/SharedDocument.js b/react/features/etherpad/components/native/SharedDocument.js index 11cdf07b9..a191d7bd7 100644 --- a/react/features/etherpad/components/native/SharedDocument.js +++ b/react/features/etherpad/components/native/SharedDocument.js @@ -78,6 +78,7 @@ class SharedDocument extends PureComponent { headerLabelKey: 'documentSharing.title' }} modalId = { SHARE_DOCUMENT_VIEW_ID } + showHeaderWithNavigation = { true } style = { styles.webView }> { headerProps = {{ headerLabelKey: 'helpView.header' }} - modalId = { HELP_VIEW_MODAL_ID }> + modalId = { HELP_VIEW_MODAL_ID } + showHeaderWithNavigation = { true }> ); diff --git a/react/features/invite/components/add-people-dialog/native/AddPeopleDialog.js b/react/features/invite/components/add-people-dialog/native/AddPeopleDialog.js index c03313d07..b53ba4338 100644 --- a/react/features/invite/components/add-people-dialog/native/AddPeopleDialog.js +++ b/react/features/invite/components/add-people-dialog/native/AddPeopleDialog.js @@ -176,7 +176,8 @@ class AddPeopleDialog extends AbstractAddPeopleDialog { headerLabelKey: 'inviteDialog.header', onPressForward: this._onInvite }} - modalId = { ADD_PEOPLE_DIALOG_VIEW_ID }> + modalId = { ADD_PEOPLE_DIALOG_VIEW_ID } + showHeaderWithNavigation = { true }> diff --git a/react/features/invite/components/dial-in-summary/native/DialInSummary.js b/react/features/invite/components/dial-in-summary/native/DialInSummary.js index a847f3d66..0f4825240 100644 --- a/react/features/invite/components/dial-in-summary/native/DialInSummary.js +++ b/react/features/invite/components/dial-in-summary/native/DialInSummary.js @@ -58,7 +58,8 @@ class DialInSummary extends Component { headerLabelKey: 'info.label' }} modalId = { DIAL_IN_SUMMARY_VIEW_ID } - style = { styles.backDrop } > + showHeaderWithNavigation = { true } + style = { styles.backDrop }> dispatch(close()), [ dispatch ]); + const { palette } = theme; + return ( - {/* eslint-disable-next-line react/jsx-no-bind */} - - - OLE - + showHeaderWithNavigation = { false } + style = { styles.participantsPane }> + ); } diff --git a/react/features/participants-pane/components/native/styles.js b/react/features/participants-pane/components/native/styles.js new file mode 100644 index 000000000..9e3f3c752 --- /dev/null +++ b/react/features/participants-pane/components/native/styles.js @@ -0,0 +1,26 @@ +import BaseTheme from '../../../base/ui/components/BaseTheme.native'; + +/** + * The styles of the native components of the feature {@code participants}. + */ +export default { + participantsPane: { + backgroundColor: BaseTheme.palette.ui01, + padding: 16 + }, + + closeButton: { + alignItems: 'center', + display: 'flex', + height: 48, + justifyContent: 'center', + marginLeft: 'auto' + }, + + closeIcon: { + display: 'flex', + flex: 1, + fontSize: 24, + justifyContent: 'center' + } +}; diff --git a/react/features/settings/components/native/SettingsView.js b/react/features/settings/components/native/SettingsView.js index 89901a373..1899e38ca 100644 --- a/react/features/settings/components/native/SettingsView.js +++ b/react/features/settings/components/native/SettingsView.js @@ -158,7 +158,8 @@ class SettingsView extends AbstractSettingsView { headerLabelKey: 'settingsView.header' }} modalId = { SETTINGS_VIEW_ID } - onClose = { this._onClose }> + onClose = { this._onClose } + showHeaderWithNavigation = { true }>