[RN] Add color scheme support to dialog buttons
This commit is contained in:
parent
d04068344a
commit
8400d01d75
|
@ -14,6 +14,8 @@ export default {
|
||||||
'Dialog': {
|
'Dialog': {
|
||||||
background: ColorPalette.blackBlue,
|
background: ColorPalette.blackBlue,
|
||||||
border: getRGBAFormat(ColorPalette.white, 0.2),
|
border: getRGBAFormat(ColorPalette.white, 0.2),
|
||||||
|
buttonBackground: ColorPalette.blue,
|
||||||
|
buttonLabel: ColorPalette.white,
|
||||||
icon: ColorPalette.white,
|
icon: ColorPalette.white,
|
||||||
text: ColorPalette.white
|
text: ColorPalette.white
|
||||||
},
|
},
|
||||||
|
|
|
@ -67,12 +67,12 @@ class BaseSubmitDialog<P: Props, S: *> extends BaseDialog<P, S> {
|
||||||
disabled = { this.props.okDisabled }
|
disabled = { this.props.okDisabled }
|
||||||
onPress = { this._onSubmit }
|
onPress = { this._onSubmit }
|
||||||
style = { [
|
style = { [
|
||||||
brandedDialog.button,
|
_dialogStyles.button,
|
||||||
additionalButtons
|
additionalButtons
|
||||||
? null : brandedDialog.buttonFarLeft,
|
? null : brandedDialog.buttonFarLeft,
|
||||||
brandedDialog.buttonFarRight
|
brandedDialog.buttonFarRight
|
||||||
] }>
|
] }>
|
||||||
<Text style = { _dialogStyles.text }>
|
<Text style = { _dialogStyles.buttonLabel }>
|
||||||
{ t(this._getSubmitButtonKey()) }
|
{ t(this._getSubmitButtonKey()) }
|
||||||
</Text>
|
</Text>
|
||||||
</TouchableOpacity>
|
</TouchableOpacity>
|
||||||
|
|
|
@ -63,11 +63,11 @@ class ConfirmDialog extends BaseSubmitDialog<Props, *> {
|
||||||
<TouchableOpacity
|
<TouchableOpacity
|
||||||
onPress = { this._onCancel }
|
onPress = { this._onCancel }
|
||||||
style = { [
|
style = { [
|
||||||
brandedDialog.button,
|
_dialogStyles.button,
|
||||||
brandedDialog.buttonFarLeft,
|
brandedDialog.buttonFarLeft,
|
||||||
_dialogStyles.buttonSeparator
|
_dialogStyles.buttonSeparator
|
||||||
] }>
|
] }>
|
||||||
<Text style = { _dialogStyles.text }>
|
<Text style = { _dialogStyles.buttonLabel }>
|
||||||
{ t(cancelKey || 'dialog.confirmNo') }
|
{ t(cancelKey || 'dialog.confirmNo') }
|
||||||
</Text>
|
</Text>
|
||||||
</TouchableOpacity>
|
</TouchableOpacity>
|
||||||
|
|
|
@ -95,11 +95,11 @@ class InputDialog extends BaseDialog<Props, State> {
|
||||||
disabled = { okDisabled }
|
disabled = { okDisabled }
|
||||||
onPress = { this._onSubmitValue }
|
onPress = { this._onSubmitValue }
|
||||||
style = { [
|
style = { [
|
||||||
brandedDialog.button,
|
_dialogStyles.button,
|
||||||
brandedDialog.buttonFarLeft,
|
brandedDialog.buttonFarLeft,
|
||||||
brandedDialog.buttonFarRight
|
brandedDialog.buttonFarRight
|
||||||
] }>
|
] }>
|
||||||
<Text style = { _dialogStyles.text }>
|
<Text style = { _dialogStyles.buttonLabel }>
|
||||||
{ t('dialog.Ok') }
|
{ t('dialog.Ok') }
|
||||||
</Text>
|
</Text>
|
||||||
</TouchableOpacity>
|
</TouchableOpacity>
|
||||||
|
|
|
@ -66,12 +66,6 @@ export const brandedDialog = createStyleSheet({
|
||||||
fontWeight: 'bold'
|
fontWeight: 'bold'
|
||||||
},
|
},
|
||||||
|
|
||||||
button: {
|
|
||||||
backgroundColor: ColorPalette.blue,
|
|
||||||
flex: 1,
|
|
||||||
padding: BoxModel.padding * 1.5
|
|
||||||
},
|
|
||||||
|
|
||||||
buttonFarLeft: {
|
buttonFarLeft: {
|
||||||
borderBottomLeftRadius: BORDER_RADIUS
|
borderBottomLeftRadius: BORDER_RADIUS
|
||||||
},
|
},
|
||||||
|
@ -185,6 +179,12 @@ ColorSchemeRegistry.register('BottomSheet', {
|
||||||
* Color schemed styles for all the component based on the abstract dialog.
|
* Color schemed styles for all the component based on the abstract dialog.
|
||||||
*/
|
*/
|
||||||
ColorSchemeRegistry.register('Dialog', {
|
ColorSchemeRegistry.register('Dialog', {
|
||||||
|
button: {
|
||||||
|
backgroundColor: schemeColor('buttonBackground'),
|
||||||
|
flex: 1,
|
||||||
|
padding: BoxModel.padding * 1.5
|
||||||
|
},
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Separator line for the buttons in a dialog.
|
* Separator line for the buttons in a dialog.
|
||||||
*/
|
*/
|
||||||
|
@ -193,6 +193,12 @@ ColorSchemeRegistry.register('Dialog', {
|
||||||
borderRightWidth: 1
|
borderRightWidth: 1
|
||||||
},
|
},
|
||||||
|
|
||||||
|
buttonLabel: {
|
||||||
|
color: schemeColor('buttonLabel'),
|
||||||
|
fontSize: MD_FONT_SIZE,
|
||||||
|
textAlign: 'center'
|
||||||
|
},
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Style of the close icon on a dialog.
|
* Style of the close icon on a dialog.
|
||||||
*/
|
*/
|
||||||
|
|
Loading…
Reference in New Issue