From 9c24883a89d8b8ba60ba0bfb0b6f3a8e94e0ba16 Mon Sep 17 00:00:00 2001 From: Hector Garcia Date: Sat, 24 Jun 2017 12:31:15 +0200 Subject: [PATCH] Support backgroundColor prop, closes #14 --- README.md | 3 +++ example/App.js | 11 ++++++----- src/MaterialDialog.js | 4 ++-- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 180ce04..28e37bd 100644 --- a/README.md +++ b/README.md @@ -82,6 +82,7 @@ cancelLabel | label for the cancel action | 'CANCEL' | string okLabel | label for the ok action | 'OK' | string title | text for the dialog title | undefined | string titleColor | color of the dialog title | 'rgba(0, 0, 0, 0.87)' | string +backgroundColor | color of the dialog background | '#FFFFFF' | string colorAccent | color of the action text | '#51BC78' | string scrolled | whether the form is in scrolled mode | false | bool @@ -118,6 +119,7 @@ cancelLabel | label for the cancel action | 'CANCEL' | string okLabel | label for the ok action | 'OK' | string title | text for the dialog title | undefined | string titleColor | color of the dialog title | 'rgba(0, 0, 0, 0.87)' | string +backgroundColor | color of the dialog background | '#FFFFFF' | string colorAccent | color of the action text | '#51BC78' | string scrolled | whether the form is in scrolled mode | false | bool @@ -157,6 +159,7 @@ cancelLabel | label for the cancel action | 'CANCEL' | string okLabel | label for the ok action | 'OK' | string title | text for the dialog title | undefined | string titleColor | color of the dialog title | 'rgba(0, 0, 0, 0.87)' | string +backgroundColor | color of the dialog background | '#FFFFFF' | string colorAccent | color of the action text | '#51BC78' | string scrolled | whether the form is in scrolled mode | false | bool diff --git a/example/App.js b/example/App.js index caa983d..54dda9e 100644 --- a/example/App.js +++ b/example/App.js @@ -107,7 +107,7 @@ export default class MaterialDialogExample extends Component { MultiPickerMaterialDialog - + this.setState({ multiPickerVisible: true })}> @@ -162,7 +162,7 @@ export default class MaterialDialogExample extends Component { ? 'No item selected.' : 'Selected: ' + this.state.singlePickerSelectedItem.label} - + this.setState({ scrolledSinglePickerVisible: true })}> @@ -237,8 +237,9 @@ export default class MaterialDialogExample extends Component { { this.setState({ basicCustomColorsVisible: false }); @@ -247,7 +248,7 @@ export default class MaterialDialogExample extends Component { onCancel={() => { this.setState({ basicCustomColorsVisible: false }); }}> - + Store the conversation log in Google Drive. diff --git a/src/MaterialDialog.js b/src/MaterialDialog.js index 6fd0b10..0450dbc 100644 --- a/src/MaterialDialog.js +++ b/src/MaterialDialog.js @@ -46,7 +46,7 @@ export default class MaterialDialog extends Component { - + {this.props.title != null @@ -106,7 +106,6 @@ const styles = StyleSheet.create({ paddingTop: 24, minWidth: 280, borderRadius: 2, - backgroundColor: colors.background, elevation: 24, overflow: 'hidden', }, @@ -202,6 +201,7 @@ MaterialDialog.defaultProps = { okLabel: 'OK', cancelLabel: 'CANCEL', titleColor: colors.androidPrimaryTextColor, + backgroundColor: colors.background, colorAccent: colors.androidColorAccent, scrolled: false, };