Skip to content

Chore: Fix StatusBar theme and style props #3906

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

Merged
dnlsilva merged 6 commits into from
Mar 21, 2022
Merged

Chore: Fix StatusBar theme and style props #3906

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
512c704
chore: clean status bar and remove useless theme
dnlsilva Mar 16, 2022
4167710
mend
dnlsilva Mar 16, 2022
be1fb05
wip
dnlsilva Mar 16, 2022
0d15454
remove unused props
dnlsilva Mar 16, 2022
df80c84
Merge branch 'develop' into chore-clean-status-bar
dnlsilva Mar 21, 2022
8b38f8d
Merge branch 'develop' into chore-clean-status-bar
dnlsilva Mar 21, 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
17 changes: 11 additions & 6 deletions app/containers/StatusBar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,27 @@ import React from 'react';
import { StatusBar as StatusBarRN } from 'react-native';

import { themes } from '../constants/colors';
import { withTheme } from '../theme';
import { useTheme } from '../theme';

const supportedStyles = {
'light-content': 'light-content',
'dark-content': 'dark-content'
};

interface IStatusBar {
theme?: string;
barStyle?: any;
barStyle?: keyof typeof supportedStyles;
backgroundColor?: string;
}

const StatusBar = React.memo(({ theme, barStyle, backgroundColor }: IStatusBar) => {
const StatusBar = React.memo(({ barStyle, backgroundColor }: IStatusBar) => {
const { theme } = useTheme();
if (!barStyle) {
barStyle = 'light-content';
if (theme === 'light') {
barStyle = 'dark-content';
}
}
return <StatusBarRN backgroundColor={backgroundColor ?? themes[theme!].headerBackground} barStyle={barStyle} animated />;
return <StatusBarRN backgroundColor={backgroundColor ?? themes[theme].headerBackground} barStyle={barStyle} animated />;
});

export default withTheme(StatusBar);
export default StatusBar;
2 changes: 1 addition & 1 deletion app/views/E2EEncryptionSecurityView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ class E2EEncryptionSecurityView extends React.Component<IE2EEncryptionSecurityVi
const { theme } = this.props;
return (
<SafeAreaView testID='e2e-encryption-security-view' style={{ backgroundColor: themes[theme].backgroundColor }}>
<StatusBar theme={theme} />
<StatusBar />
<List.Container>
<View style={styles.container}>
{this.renderChangePassword()}
Expand Down