feat(toolbox/conference/audio-mode/chat/native): UI fixes and updates (#12375)
feat(toolbox/conference/audio-mode/chat/native): UI fixes and updates
This commit is contained in:
parent
51bbc3f87f
commit
be93fbd512
|
@ -2,13 +2,11 @@ import { StyleSheet } from 'react-native';
|
||||||
|
|
||||||
import BaseTheme from '../../../../base/ui/components/BaseTheme.native';
|
import BaseTheme from '../../../../base/ui/components/BaseTheme.native';
|
||||||
import { ColorSchemeRegistry, schemeColor } from '../../../color-scheme';
|
import { ColorSchemeRegistry, schemeColor } from '../../../color-scheme';
|
||||||
import { BoxModel, ColorPalette } from '../../../styles';
|
import { BoxModel } from '../../../styles';
|
||||||
import { PREFERRED_DIALOG_SIZE } from '../../constants';
|
import { PREFERRED_DIALOG_SIZE } from '../../constants';
|
||||||
|
|
||||||
const BORDER_RADIUS = 5;
|
const BORDER_RADIUS = 5;
|
||||||
|
|
||||||
export const FIELD_UNDERLINE = ColorPalette.transparent;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* NOTE: These Material guidelines based values are currently only used in
|
* NOTE: These Material guidelines based values are currently only used in
|
||||||
* dialogs (and related) but later on it would be nice to export it into a base
|
* dialogs (and related) but later on it would be nice to export it into a base
|
||||||
|
@ -16,7 +14,7 @@ export const FIELD_UNDERLINE = ColorPalette.transparent;
|
||||||
*/
|
*/
|
||||||
export const MD_FONT_SIZE = 16;
|
export const MD_FONT_SIZE = 16;
|
||||||
export const MD_ITEM_HEIGHT = 48;
|
export const MD_ITEM_HEIGHT = 48;
|
||||||
export const MD_ITEM_MARGIN_PADDING = 16;
|
export const MD_ITEM_MARGIN_PADDING = BaseTheme.spacing[3];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Reusable (colored) style for text in any branded dialogs.
|
* Reusable (colored) style for text in any branded dialogs.
|
||||||
|
@ -28,7 +26,7 @@ const brandedDialogText = {
|
||||||
};
|
};
|
||||||
|
|
||||||
const brandedDialogLabelStyle = {
|
const brandedDialogLabelStyle = {
|
||||||
color: ColorPalette.white,
|
color: BaseTheme.palette.text01,
|
||||||
flexShrink: 1,
|
flexShrink: 1,
|
||||||
fontSize: MD_FONT_SIZE,
|
fontSize: MD_FONT_SIZE,
|
||||||
opacity: 0.90
|
opacity: 0.90
|
||||||
|
@ -41,7 +39,7 @@ const brandedDialogItemContainerStyle = {
|
||||||
};
|
};
|
||||||
|
|
||||||
const brandedDialogIconStyle = {
|
const brandedDialogIconStyle = {
|
||||||
color: ColorPalette.white,
|
color: BaseTheme.palette.icon01,
|
||||||
fontSize: 24
|
fontSize: 24
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -61,7 +59,7 @@ export const inputDialog = {
|
||||||
*/
|
*/
|
||||||
export const bottomSheetStyles = {
|
export const bottomSheetStyles = {
|
||||||
sheetAreaCover: {
|
sheetAreaCover: {
|
||||||
backgroundColor: ColorPalette.transparent,
|
backgroundColor: 'transparent',
|
||||||
flex: 1
|
flex: 1
|
||||||
},
|
},
|
||||||
|
|
||||||
|
@ -115,7 +113,7 @@ export const bottomSheetStyles = {
|
||||||
/**
|
/**
|
||||||
* Additional style that is not directly used as a style object.
|
* Additional style that is not directly used as a style object.
|
||||||
*/
|
*/
|
||||||
underlayColor: ColorPalette.toggled
|
underlayColor: BaseTheme.palette.underlay01
|
||||||
},
|
},
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -16,6 +16,7 @@ import AbstractMessageRecipient, {
|
||||||
type Props as AbstractProps
|
type Props as AbstractProps
|
||||||
} from '../AbstractMessageRecipient';
|
} from '../AbstractMessageRecipient';
|
||||||
|
|
||||||
|
|
||||||
type Props = AbstractProps & {
|
type Props = AbstractProps & {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -132,7 +133,8 @@ class MessageRecipient extends AbstractMessageRecipient<Props> {
|
||||||
}) }
|
}) }
|
||||||
</Text>
|
</Text>
|
||||||
<TouchableHighlight
|
<TouchableHighlight
|
||||||
onPress = { this._onResetPrivateMessageRecipient }>
|
onPress = { this._onResetPrivateMessageRecipient }
|
||||||
|
underlayColor = { 'transparent' }>
|
||||||
<Icon
|
<Icon
|
||||||
src = { IconCancelSelection }
|
src = { IconCancelSelection }
|
||||||
style = { _styles.messageRecipientCancelIcon } />
|
style = { _styles.messageRecipientCancelIcon } />
|
||||||
|
|
|
@ -81,7 +81,7 @@ export default {
|
||||||
padding: 12,
|
padding: 12,
|
||||||
fontSize: TITLE_BAR_BUTTON_SIZE
|
fontSize: TITLE_BAR_BUTTON_SIZE
|
||||||
},
|
},
|
||||||
underlayColor: BaseTheme.spacing.underlay01
|
underlayColor: 'transparent'
|
||||||
},
|
},
|
||||||
|
|
||||||
lonelyButton: {
|
lonelyButton: {
|
||||||
|
@ -116,7 +116,7 @@ export default {
|
||||||
padding: 12,
|
padding: 12,
|
||||||
fontSize: TITLE_BAR_BUTTON_SIZE
|
fontSize: TITLE_BAR_BUTTON_SIZE
|
||||||
},
|
},
|
||||||
underlayColor: BaseTheme.spacing.underlay01
|
underlayColor: 'transparent'
|
||||||
},
|
},
|
||||||
|
|
||||||
titleBarSafeViewColor: {
|
titleBarSafeViewColor: {
|
||||||
|
|
|
@ -14,7 +14,7 @@ import {
|
||||||
IconDeviceSpeaker
|
IconDeviceSpeaker
|
||||||
} from '../../../base/icons';
|
} from '../../../base/icons';
|
||||||
import { connect } from '../../../base/redux';
|
import { connect } from '../../../base/redux';
|
||||||
import { ColorPalette } from '../../../base/styles';
|
import BaseTheme from '../../../base/ui/components/BaseTheme.native';
|
||||||
|
|
||||||
import styles from './styles';
|
import styles from './styles';
|
||||||
|
|
||||||
|
@ -240,12 +240,18 @@ class AudioRoutePickerDialog extends Component<Props, State> {
|
||||||
_renderDevice(device: Device) {
|
_renderDevice(device: Device) {
|
||||||
const { icon, selected, text } = device;
|
const { icon, selected, text } = device;
|
||||||
const selectedStyle = selected ? styles.selectedText : {};
|
const selectedStyle = selected ? styles.selectedText : {};
|
||||||
|
const borderRadiusHighlightStyles = {
|
||||||
|
borderTopLeftRadius: 16,
|
||||||
|
borderTopRightRadius: 16
|
||||||
|
};
|
||||||
|
const speakerDeviceIsNotSelected = device.type !== 'SPEAKER';
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<TouchableHighlight
|
<TouchableHighlight
|
||||||
key = { device.type }
|
key = { device.type }
|
||||||
onPress = { this._onSelectDeviceFn(device) }
|
onPress = { this._onSelectDeviceFn(device) }
|
||||||
underlayColor = { ColorPalette.overflowMenuItemUnderlay } >
|
style = { speakerDeviceIsNotSelected && borderRadiusHighlightStyles }
|
||||||
|
underlayColor = { BaseTheme.palette.underlay01 } >
|
||||||
<View style = { styles.deviceRow } >
|
<View style = { styles.deviceRow } >
|
||||||
<Icon
|
<Icon
|
||||||
src = { icon }
|
src = { icon }
|
||||||
|
|
|
@ -1,7 +1,8 @@
|
||||||
// @flow
|
// @flow
|
||||||
|
|
||||||
import { MD_ITEM_HEIGHT } from '../../../base/dialog';
|
import { MD_ITEM_HEIGHT } from '../../../base/dialog';
|
||||||
import { ColorPalette, createStyleSheet } from '../../../base/styles';
|
import { createStyleSheet } from '../../../base/styles';
|
||||||
|
import BaseTheme from '../../../base/ui/components/BaseTheme.native';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The React {@code Component} styles of {@code AudioRoutePickerDialog}.
|
* The React {@code Component} styles of {@code AudioRoutePickerDialog}.
|
||||||
|
@ -18,30 +19,30 @@ export default createStyleSheet({
|
||||||
alignItems: 'center',
|
alignItems: 'center',
|
||||||
flexDirection: 'row',
|
flexDirection: 'row',
|
||||||
height: MD_ITEM_HEIGHT,
|
height: MD_ITEM_HEIGHT,
|
||||||
marginLeft: 16
|
marginLeft: BaseTheme.spacing[3]
|
||||||
},
|
},
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Style for the {@code Icon} element in a row.
|
* Style for the {@code Icon} element in a row.
|
||||||
*/
|
*/
|
||||||
deviceIcon: {
|
deviceIcon: {
|
||||||
color: ColorPalette.white,
|
color: BaseTheme.palette.icon01,
|
||||||
fontSize: 24
|
fontSize: BaseTheme.spacing[4]
|
||||||
},
|
},
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Style for the {@code Text} element in a row.
|
* Style for the {@code Text} element in a row.
|
||||||
*/
|
*/
|
||||||
deviceText: {
|
deviceText: {
|
||||||
color: ColorPalette.white,
|
color: BaseTheme.palette.text01,
|
||||||
fontSize: 16,
|
fontSize: 16,
|
||||||
marginLeft: 32
|
marginLeft: BaseTheme.spacing[5]
|
||||||
},
|
},
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Style for a row which is marked as selected.
|
* Style for a row which is marked as selected.
|
||||||
*/
|
*/
|
||||||
selectedText: {
|
selectedText: {
|
||||||
color: ColorPalette.blue
|
color: BaseTheme.palette.action01
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
|
@ -126,7 +126,8 @@ ColorSchemeRegistry.register('Toolbox', {
|
||||||
style: {
|
style: {
|
||||||
...toolbarButton,
|
...toolbarButton,
|
||||||
backgroundColor: 'transparent'
|
backgroundColor: 'transparent'
|
||||||
}
|
},
|
||||||
|
underlayColor: 'transparent'
|
||||||
},
|
},
|
||||||
|
|
||||||
backgroundToggle: {
|
backgroundToggle: {
|
||||||
|
@ -199,6 +200,7 @@ ColorSchemeRegistry.register('Toolbox', {
|
||||||
iconStyle: whiteToolbarButtonIcon,
|
iconStyle: whiteToolbarButtonIcon,
|
||||||
style: {
|
style: {
|
||||||
...toolbarButton
|
...toolbarButton
|
||||||
}
|
},
|
||||||
|
underlayColor: 'transparent'
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
Loading…
Reference in New Issue