diff --git a/react/features/base/dialog/components/native/styles.js b/react/features/base/dialog/components/native/styles.js index d3c51e984..44906b5fd 100644 --- a/react/features/base/dialog/components/native/styles.js +++ b/react/features/base/dialog/components/native/styles.js @@ -2,13 +2,11 @@ import { StyleSheet } from 'react-native'; import BaseTheme from '../../../../base/ui/components/BaseTheme.native'; import { ColorSchemeRegistry, schemeColor } from '../../../color-scheme'; -import { BoxModel, ColorPalette } from '../../../styles'; +import { BoxModel } from '../../../styles'; import { PREFERRED_DIALOG_SIZE } from '../../constants'; const BORDER_RADIUS = 5; -export const FIELD_UNDERLINE = ColorPalette.transparent; - /** * 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 @@ -16,7 +14,7 @@ export const FIELD_UNDERLINE = ColorPalette.transparent; */ export const MD_FONT_SIZE = 16; 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. @@ -28,7 +26,7 @@ const brandedDialogText = { }; const brandedDialogLabelStyle = { - color: ColorPalette.white, + color: BaseTheme.palette.text01, flexShrink: 1, fontSize: MD_FONT_SIZE, opacity: 0.90 @@ -41,7 +39,7 @@ const brandedDialogItemContainerStyle = { }; const brandedDialogIconStyle = { - color: ColorPalette.white, + color: BaseTheme.palette.icon01, fontSize: 24 }; @@ -61,7 +59,7 @@ export const inputDialog = { */ export const bottomSheetStyles = { sheetAreaCover: { - backgroundColor: ColorPalette.transparent, + backgroundColor: 'transparent', flex: 1 }, @@ -115,7 +113,7 @@ export const bottomSheetStyles = { /** * Additional style that is not directly used as a style object. */ - underlayColor: ColorPalette.toggled + underlayColor: BaseTheme.palette.underlay01 }, /** diff --git a/react/features/chat/components/native/MessageRecipient.js b/react/features/chat/components/native/MessageRecipient.js index fb1e9fd1e..4c8c1948d 100644 --- a/react/features/chat/components/native/MessageRecipient.js +++ b/react/features/chat/components/native/MessageRecipient.js @@ -16,6 +16,7 @@ import AbstractMessageRecipient, { type Props as AbstractProps } from '../AbstractMessageRecipient'; + type Props = AbstractProps & { /** @@ -132,7 +133,8 @@ class MessageRecipient extends AbstractMessageRecipient { }) } + onPress = { this._onResetPrivateMessageRecipient } + underlayColor = { 'transparent' }> diff --git a/react/features/conference/components/native/styles.js b/react/features/conference/components/native/styles.js index 48c1f9a56..48b206c09 100644 --- a/react/features/conference/components/native/styles.js +++ b/react/features/conference/components/native/styles.js @@ -81,7 +81,7 @@ export default { padding: 12, fontSize: TITLE_BAR_BUTTON_SIZE }, - underlayColor: BaseTheme.spacing.underlay01 + underlayColor: 'transparent' }, lonelyButton: { @@ -116,7 +116,7 @@ export default { padding: 12, fontSize: TITLE_BAR_BUTTON_SIZE }, - underlayColor: BaseTheme.spacing.underlay01 + underlayColor: 'transparent' }, titleBarSafeViewColor: { diff --git a/react/features/mobile/audio-mode/components/AudioRoutePickerDialog.js b/react/features/mobile/audio-mode/components/AudioRoutePickerDialog.js index 625b91743..14aedbe88 100644 --- a/react/features/mobile/audio-mode/components/AudioRoutePickerDialog.js +++ b/react/features/mobile/audio-mode/components/AudioRoutePickerDialog.js @@ -14,7 +14,7 @@ import { IconDeviceSpeaker } from '../../../base/icons'; import { connect } from '../../../base/redux'; -import { ColorPalette } from '../../../base/styles'; +import BaseTheme from '../../../base/ui/components/BaseTheme.native'; import styles from './styles'; @@ -240,12 +240,18 @@ class AudioRoutePickerDialog extends Component { _renderDevice(device: Device) { const { icon, selected, text } = device; const selectedStyle = selected ? styles.selectedText : {}; + const borderRadiusHighlightStyles = { + borderTopLeftRadius: 16, + borderTopRightRadius: 16 + }; + const speakerDeviceIsNotSelected = device.type !== 'SPEAKER'; return ( + style = { speakerDeviceIsNotSelected && borderRadiusHighlightStyles } + underlayColor = { BaseTheme.palette.underlay01 } >