diff --git a/android/app/src/main/res/values/colors.xml b/android/app/src/main/res/values/colors.xml index 21e97a75c38aa..1b925f61ae28d 100644 --- a/android/app/src/main/res/values/colors.xml +++ b/android/app/src/main/res/values/colors.xml @@ -1,5 +1,5 @@ - #FFFFFF + #061B09 #FFFFFF #0185ff #0b1b34 diff --git a/ios/NewExpensify/BootSplash.storyboard b/ios/NewExpensify/BootSplash.storyboard index 8ee04cf74b3b6..00b73194f144c 100644 --- a/ios/NewExpensify/BootSplash.storyboard +++ b/ios/NewExpensify/BootSplash.storyboard @@ -24,7 +24,7 @@ - + diff --git a/src/components/Checkbox.js b/src/components/Checkbox.js index 612220faf2081..d4f6adbf2c6c6 100644 --- a/src/components/Checkbox.js +++ b/src/components/Checkbox.js @@ -2,6 +2,7 @@ import React from 'react'; import {View, Pressable} from 'react-native'; import PropTypes from 'prop-types'; import styles from '../styles/styles'; +import themeColors from '../styles/themes/default'; import stylePropTypes from '../styles/stylePropTypes'; import Icon from './Icon'; import * as Expensicons from './Icon/Expensicons'; @@ -112,7 +113,7 @@ class Checkbox extends React.Component { this.state.isFocused && styles.borderColorFocus, ]} > - + {this.props.isChecked && } )} diff --git a/src/components/CustomStatusBar/index.android.js b/src/components/CustomStatusBar/index.android.js index 464d7437392d9..2d3579dbfeba4 100644 --- a/src/components/CustomStatusBar/index.android.js +++ b/src/components/CustomStatusBar/index.android.js @@ -7,7 +7,7 @@ import {StatusBar} from 'react-native'; export default class CustomStatusBar extends React.Component { componentDidMount() { - StatusBar.setBarStyle('dark-content'); + StatusBar.setBarStyle('light-content'); StatusBar.setBackgroundColor('transparent'); StatusBar.setTranslucent(true); } diff --git a/src/components/CustomStatusBar/index.js b/src/components/CustomStatusBar/index.js index 0c5f999365cbb..e0f344e9e1c08 100644 --- a/src/components/CustomStatusBar/index.js +++ b/src/components/CustomStatusBar/index.js @@ -3,7 +3,7 @@ import {StatusBar} from 'react-native'; export default class CustomStatusBar extends React.Component { componentDidMount() { - StatusBar.setBarStyle('dark-content', true); + StatusBar.setBarStyle('light-content', true); } render() { diff --git a/src/pages/home/report/FloatingMessageCounter/index.js b/src/pages/home/report/FloatingMessageCounter/index.js index 97287442ce298..2d0067217c1bb 100644 --- a/src/pages/home/report/FloatingMessageCounter/index.js +++ b/src/pages/home/report/FloatingMessageCounter/index.js @@ -79,7 +79,7 @@ class FloatingMessageCounter extends PureComponent { onPress={this.props.onClick} ContentComponent={() => ( - + Navigation.navigate(ROUTES.getWorkspaceInitialRoute(policy.id)), iconStyles: policy.avatar ? [] : [styles.popoverMenuIconEmphasized], - iconFill: themeColors.iconReversed, + iconFill: themeColors.textLight, fallbackIcon: Expensicons.FallbackWorkspaceAvatar, brickRoadIndicator: PolicyUtils.getPolicyBrickRoadIndicatorStatus(policy, this.props.policyMembers), pendingAction: policy.pendingAction, diff --git a/src/styles/styles.js b/src/styles/styles.js index 6fdb2b01c8635..c1959f23f3342 100644 --- a/src/styles/styles.js +++ b/src/styles/styles.js @@ -2149,7 +2149,7 @@ const styles = { }, checkedContainer: { - backgroundColor: themeColors.link, + backgroundColor: themeColors.checkBox, }, iouAmountText: { diff --git a/src/styles/themes/default.js b/src/styles/themes/default.js index 29e9645673f15..6f53dd6a4f70f 100644 --- a/src/styles/themes/default.js +++ b/src/styles/themes/default.js @@ -55,8 +55,10 @@ const darkTheme = { placeholderText: colors.greenIcons, heroCard: colors.blue, uploadPreviewActivityIndicator: colors.greenHighlightBackground, + checkBox: colors.green, }; +// DEPRECATED THEME, Delete after successful rebranding. const oldTheme = { shadow: colors.black, link: colors.blue, @@ -96,6 +98,7 @@ const oldTheme = { uploadPreviewActivityIndicator: colors.gray1, cardBG: colors.gray1, cardBorder: colors.gray1, + checkBox: colors.blue, // Merging new Keys for Dark Mode merge. Delete after new branding is implemented. highlightBG: colors.gray1, @@ -113,4 +116,4 @@ const oldTheme = { textDark: colors.dark, }; -export default oldTheme; +export default darkTheme;