diff --git a/react/features/base/color-scheme/defaultScheme.js b/react/features/base/color-scheme/defaultScheme.js index 8b8d3d4c5..be5421e21 100644 --- a/react/features/base/color-scheme/defaultScheme.js +++ b/react/features/base/color-scheme/defaultScheme.js @@ -14,6 +14,8 @@ export default { 'Dialog': { background: ColorPalette.blackBlue, border: getRGBAFormat(ColorPalette.white, 0.2), + buttonBackground: ColorPalette.blue, + buttonLabel: ColorPalette.white, icon: ColorPalette.white, text: ColorPalette.white }, diff --git a/react/features/base/dialog/components/native/BaseSubmitDialog.js b/react/features/base/dialog/components/native/BaseSubmitDialog.js index b41bdb3c3..734c8f92b 100644 --- a/react/features/base/dialog/components/native/BaseSubmitDialog.js +++ b/react/features/base/dialog/components/native/BaseSubmitDialog.js @@ -67,12 +67,12 @@ class BaseSubmitDialog extends BaseDialog { disabled = { this.props.okDisabled } onPress = { this._onSubmit } style = { [ - brandedDialog.button, + _dialogStyles.button, additionalButtons ? null : brandedDialog.buttonFarLeft, brandedDialog.buttonFarRight ] }> - + { t(this._getSubmitButtonKey()) } diff --git a/react/features/base/dialog/components/native/ConfirmDialog.js b/react/features/base/dialog/components/native/ConfirmDialog.js index 32cfd8fd3..7ffd6a37b 100644 --- a/react/features/base/dialog/components/native/ConfirmDialog.js +++ b/react/features/base/dialog/components/native/ConfirmDialog.js @@ -63,11 +63,11 @@ class ConfirmDialog extends BaseSubmitDialog { - + { t(cancelKey || 'dialog.confirmNo') } diff --git a/react/features/base/dialog/components/native/InputDialog.js b/react/features/base/dialog/components/native/InputDialog.js index cf240d9be..eecfc0876 100644 --- a/react/features/base/dialog/components/native/InputDialog.js +++ b/react/features/base/dialog/components/native/InputDialog.js @@ -95,11 +95,11 @@ class InputDialog extends BaseDialog { disabled = { okDisabled } onPress = { this._onSubmitValue } style = { [ - brandedDialog.button, + _dialogStyles.button, brandedDialog.buttonFarLeft, brandedDialog.buttonFarRight ] }> - + { t('dialog.Ok') } diff --git a/react/features/base/dialog/components/native/styles.js b/react/features/base/dialog/components/native/styles.js index 84ecfdc24..60c11294d 100644 --- a/react/features/base/dialog/components/native/styles.js +++ b/react/features/base/dialog/components/native/styles.js @@ -66,12 +66,6 @@ export const brandedDialog = createStyleSheet({ fontWeight: 'bold' }, - button: { - backgroundColor: ColorPalette.blue, - flex: 1, - padding: BoxModel.padding * 1.5 - }, - buttonFarLeft: { borderBottomLeftRadius: BORDER_RADIUS }, @@ -185,6 +179,12 @@ ColorSchemeRegistry.register('BottomSheet', { * Color schemed styles for all the component based on the abstract dialog. */ ColorSchemeRegistry.register('Dialog', { + button: { + backgroundColor: schemeColor('buttonBackground'), + flex: 1, + padding: BoxModel.padding * 1.5 + }, + /** * Separator line for the buttons in a dialog. */ @@ -193,6 +193,12 @@ ColorSchemeRegistry.register('Dialog', { borderRightWidth: 1 }, + buttonLabel: { + color: schemeColor('buttonLabel'), + fontSize: MD_FONT_SIZE, + textAlign: 'center' + }, + /** * Style of the close icon on a dialog. */