Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make the Switch to Dark Mode #12944

Merged
merged 7 commits into from
Nov 28, 2022
Merged

Make the Switch to Dark Mode #12944

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8766ee5
Switch to dark mode, fix dark mode workspace list icon/checkmark colors.
grgia Nov 22, 2022
b6d7e41
Fix unread message indicator
grgia Nov 22, 2022
eca7e24
Update Checkmark to green / remove icon when unchecked.
grgia Nov 22, 2022
bf40317
Adding checkbox color to themes incase we need to revert.
grgia Nov 22, 2022
7a50533
Change status bar color to white for ios and android
grgia Nov 23, 2022
b7096b7
Merge branch 'main' into georgia-darkModeSwap
grgia Nov 23, 2022
8ea2b5f
Fix Android and IOS splash screen colors. Note IOS is inverse of desi…
grgia Nov 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/components/Checkbox.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -112,7 +113,7 @@ class Checkbox extends React.Component {
this.state.isFocused && styles.borderColorFocus,
]}
>
<Icon src={Expensicons.Checkmark} fill="white" height={14} width={14} />
<Icon src={Expensicons.Checkmark} fill={this.props.isChecked ? themeColors.textLight : themeColors.transparent} height={14} width={14} />
grgia marked this conversation as resolved.
Show resolved Hide resolved
</View>
)}
</Pressable>
Expand Down
2 changes: 1 addition & 1 deletion src/pages/home/report/FloatingMessageCounter/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ class FloatingMessageCounter extends PureComponent {
onPress={this.props.onClick}
ContentComponent={() => (
<View style={[styles.flexRow]}>
<Icon small src={Expensicons.DownArrow} fill={themeColors.textReversed} />
<Icon small src={Expensicons.DownArrow} fill={themeColors.textLight} />
<Text
selectable={false}
style={[
Expand Down
2 changes: 1 addition & 1 deletion src/pages/workspace/WorkspacesListPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ class WorkspacesListPage extends Component {
iconType: policy.avatar ? CONST.ICON_TYPE_AVATAR : CONST.ICON_TYPE_ICON,
action: () => 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,
Expand Down
3 changes: 2 additions & 1 deletion src/styles/themes/default.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ const darkTheme = {
uploadPreviewActivityIndicator: colors.greenHighlightBackground,
};

// DEPRECATED THEME, Delete after successful rebranding.
Julesssss marked this conversation as resolved.
Show resolved Hide resolved
const oldTheme = {
shadow: colors.black,
link: colors.blue,
Expand Down Expand Up @@ -111,4 +112,4 @@ const oldTheme = {
textDark: colors.dark,
};

export default oldTheme;
export default darkTheme;