diff --git a/react/features/base/dialog/components/native/styles.js b/react/features/base/dialog/components/native/styles.js index 320f1a091..44fdf3c26 100644 --- a/react/features/base/dialog/components/native/styles.js +++ b/react/features/base/dialog/components/native/styles.js @@ -263,11 +263,12 @@ ColorSchemeRegistry.register('Dialog', { }, text: { - ...brandedDialogText + ...brandedDialogText, + color: BaseTheme.palette.text01 }, topBorderContainer: { - borderTopColor: schemeColor('border'), + borderTopColor: BaseTheme.palette.dividerColor, borderTopWidth: 1 } }); diff --git a/react/features/base/ui/Tokens.js b/react/features/base/ui/Tokens.js index ad8b8726c..c66faaf27 100644 --- a/react/features/base/ui/Tokens.js +++ b/react/features/base/ui/Tokens.js @@ -36,6 +36,7 @@ export const colors = { surface12: '#AAAAAA', surface13: '#495258', surface14: '#555555', + surface15: '#474747', success04: '#189B55', success05: '#1EC26A', @@ -69,6 +70,8 @@ export const colorMap = { ui05: 'surface06', ui12: 'surface11', ui13: 'surface14', + ui14: 'surface15', + ui15: 'surface12', // Primary buttons action01: 'primary05', @@ -201,6 +204,9 @@ export const colorMap = { // Color for the section divider dividerColor: 'surface12', + // Color for indicator + indicatorColor: 'surface12', + // Background for high-contrast input fields on hover field02Hover: 'primary09', @@ -260,6 +266,9 @@ export const colorMap = { // Color for disabled tab tab01Disabled: 'disabled01', + // Color for enabled lobby mode switch + lobbySwitch01Active: 'success04', + // Color for disabled video switch video01Disabled: 'disabled01', diff --git a/react/features/chat/components/native/ChatInputBar.js b/react/features/chat/components/native/ChatInputBar.js index c20baf996..370c21787 100644 --- a/react/features/chat/components/native/ChatInputBar.js +++ b/react/features/chat/components/native/ChatInputBar.js @@ -5,6 +5,7 @@ import { Platform, TextInput, TouchableOpacity, View } from 'react-native'; import { translate } from '../../../base/i18n'; import { Icon, IconChatSend } from '../../../base/icons'; +import BaseTheme from '../../../base/ui/components/BaseTheme.native'; import styles from './styles'; @@ -82,7 +83,9 @@ class ChatInputBar extends Component { onFocus = { this._onFocused(true) } onSubmitEditing = { this._onSubmit } placeholder = { this.props.t('chat.fieldPlaceHolder') } + placeholderTextColor = { BaseTheme.palette.text03 } returnKeyType = 'send' + selectionColor = { BaseTheme.palette.text03 } style = { styles.inputField } value = { this.state.message } /> { diff --git a/react/features/chat/components/native/styles.js b/react/features/chat/components/native/styles.js index 80e46d6d0..587f821cc 100644 --- a/react/features/chat/components/native/styles.js +++ b/react/features/chat/components/native/styles.js @@ -60,7 +60,7 @@ export default { }, inputField: { - color: 'rgb(28, 32, 37)', + color: BaseTheme.palette.text01, flex: 1, height: 48 }, @@ -95,7 +95,7 @@ export default { }, sendButtonIcon: { - color: ColorPalette.darkGrey, + color: BaseTheme.palette.icon01, fontSize: 22 }, @@ -124,6 +124,7 @@ export default { }, chatContainer: { + backgroundColor: BaseTheme.palette.ui01, flex: 1 }, @@ -165,7 +166,7 @@ ColorSchemeRegistry.register('Chat', { }, emptyComponentText: { - color: BaseTheme.palette.ui05, + color: BaseTheme.palette.text03, textAlign: 'center' }, diff --git a/react/features/invite/components/add-people-dialog/native/styles.js b/react/features/invite/components/add-people-dialog/native/styles.js index 52da72c1f..1279bed00 100644 --- a/react/features/invite/components/add-people-dialog/native/styles.js +++ b/react/features/invite/components/add-people-dialog/native/styles.js @@ -11,6 +11,7 @@ export const ICON_SIZE = 15; export default { addPeopleContainer: { + backgroundColor: BaseTheme.palette.ui01, flex: 1 }, @@ -75,7 +76,7 @@ export default { }, itemText: { - color: DARK_GREY, + color: BaseTheme.palette.text01, fontSize: 14, fontWeight: 'normal' }, @@ -104,14 +105,14 @@ export default { }, selectedIcon: { - color: DARK_GREY, + color: BaseTheme.palette.icon01, fontSize: 20, marginRight: BoxModel.margin, padding: 2 }, separator: { - borderBottomColor: LIGHT_GREY, + borderBottomColor: BaseTheme.palette.dividerColor, borderBottomWidth: 1, marginLeft: 85 }, @@ -146,7 +147,7 @@ export default { }, unselectIcon: { - color: LIGHT_GREY, + color: BaseTheme.palette.ui01, fontSize: 16, left: AVATAR_SIZE / -3, position: 'relative', diff --git a/react/features/invite/components/dial-in-summary/native/styles.js b/react/features/invite/components/dial-in-summary/native/styles.js index 8fcd6aec6..9e30f66cd 100644 --- a/react/features/invite/components/dial-in-summary/native/styles.js +++ b/react/features/invite/components/dial-in-summary/native/styles.js @@ -1,10 +1,10 @@ // @flow -import { ColorPalette } from '../../../../base/styles'; +import BaseTheme from '../../../../base/ui/components/BaseTheme.native'; -export const INDICATOR_COLOR = ColorPalette.lightGrey; +export const INDICATOR_COLOR = BaseTheme.palette.indicatorColor; -const WV_BACKGROUND = 'rgb(71, 71, 71)'; +const WV_BACKGROUND = BaseTheme.palette.ui14; export default { @@ -15,7 +15,7 @@ export default { indicatorWrapper: { alignItems: 'center', - backgroundColor: ColorPalette.white, + backgroundColor: BaseTheme.palette.ui12, height: '100%', justifyContent: 'center' }, diff --git a/react/features/lobby/components/native/LobbyModeSwitch.js b/react/features/lobby/components/native/LobbyModeSwitch.js index b59517564..86efd355c 100644 --- a/react/features/lobby/components/native/LobbyModeSwitch.js +++ b/react/features/lobby/components/native/LobbyModeSwitch.js @@ -6,11 +6,7 @@ import { Switch, View } from 'react-native'; import { translate } from '../../../base/i18n'; import { connect } from '../../../base/redux'; -import styles, { - ENABLED_THUMB_COLOR, - ENABLED_TRACK_COLOR, - DISABLED_THUMB_COLOR -} from './styles'; +import styles, { ENABLED_TRACK_COLOR, THUMB_COLOR } from './styles'; /** * The type of the React {@code Component} props of {@link LobbyModeSwitch}. @@ -44,11 +40,7 @@ function LobbyModeSwitch( diff --git a/react/features/lobby/components/native/styles.js b/react/features/lobby/components/native/styles.js index 2a41bc55d..f7b4e8423 100644 --- a/react/features/lobby/components/native/styles.js +++ b/react/features/lobby/components/native/styles.js @@ -4,16 +4,15 @@ import BaseTheme from '../../../base/ui/components/BaseTheme'; const SECONDARY_COLOR = BaseTheme.palette.border04; -export const ENABLED_THUMB_COLOR = BaseTheme.palette.action04; -export const ENABLED_TRACK_COLOR = BaseTheme.palette.screen01Header; -export const DISABLED_THUMB_COLOR = BaseTheme.palette.icon04; +export const ENABLED_TRACK_COLOR = BaseTheme.palette.lobbySwitch01Active; +export const THUMB_COLOR = BaseTheme.palette.field02; export default { button: { alignItems: 'center', borderRadius: 4, - marginVertical: 4, - paddingVertical: 8 + marginVertical: BaseTheme.spacing[1], + paddingVertical: BaseTheme.spacing[2] }, contentWrapper: { @@ -33,7 +32,7 @@ export default { fontSize: 18, fontWeight: 'bold', margin: 'auto', - marginVertical: 24, + marginVertical: BaseTheme.spacing[3], textAlign: 'center' }, diff --git a/react/features/mobile/navigation/components/chat/components/ChatAndPollsNavigationContainer.js b/react/features/mobile/navigation/components/chat/components/ChatAndPollsNavigationContainer.js index f8817fa43..7690c5131 100644 --- a/react/features/mobile/navigation/components/chat/components/ChatAndPollsNavigationContainer.js +++ b/react/features/mobile/navigation/components/chat/components/ChatAndPollsNavigationContainer.js @@ -8,6 +8,7 @@ import { getClientHeight, getClientWidth } from '../../../../../base/modal/components/functions.native'; +import BaseTheme from '../../../../../base/ui/components/BaseTheme.native'; import { Chat } from '../../../../../chat'; import { PollsPane } from '../../../../../polls/components'; import { screen } from '../../../routes'; @@ -28,7 +29,10 @@ const ChatAndPollsNavigationContainer = () => { width: clientWidth }} screenOptions = {{ - ...chatTabBarOptions + ...chatTabBarOptions, + tabBarStyle: { + backgroundColor: BaseTheme.palette.ui01 + } }}> { /* eslint-disable react/jsx-no-bind */ onValueChange = { state => setCheckbox(index, state) } value = { checkBoxStates[index] } /> - {answer.name} + {answer.name} ))}