Skip to content

Commit a48dd10

Browse files
diegolmellodiegolmello
authored
chore: Use StatusBar only on root (#6526)
1 parent 184dd16 commit a48dd10

File tree

58 files changed

+7
-127
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+7
-127
lines changed

‎app/containers/FormContainer.tsx‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import sharedStyles from '../views/Styles';
55
import scrollPersistTaps from '../lib/methods/helpers/scrollPersistTaps';
66
import KeyboardView from './KeyboardView';
77
import { useTheme } from '../theme';
8-
import StatusBar from './StatusBar';
98
import AppVersion from './AppVersion';
109
import { isTablet } from '../lib/methods/helpers';
1110
import SafeAreaView from './SafeAreaView';
@@ -39,7 +38,6 @@ const FormContainer = ({ children, testID, showAppVersion = true, ...props }: IF
3938

4039
return (
4140
<KeyboardView>
42-
<StatusBar />
4341
<ScrollView
4442
style={sharedStyles.container}
4543
contentContainerStyle={[sharedStyles.containerScrollView, styles.scrollView]}

‎app/ee/omnichannel/views/QueueListView.tsx‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import RoomItem from '../../../containers/RoomItem';
99
import { getUserSelector } from '../../../selectors/login';
1010
import { useTheme } from '../../../theme';
1111
import SafeAreaView from '../../../containers/SafeAreaView';
12-
import StatusBar from '../../../containers/StatusBar';
1312
import { goRoom } from '../../../lib/methods/helpers/goRoom';
1413
import * as HeaderButton from '../../../containers/Header/components/HeaderButton';
1514
import { events, logEvent } from '../../../lib/methods/helpers/log';
@@ -110,7 +109,6 @@ const QueueListView = React.memo(() => {
110109

111110
return (
112111
<SafeAreaView testID='queue-list-view' style={{ backgroundColor: colors.surfaceRoom }}>
113-
<StatusBar />
114112
<FlatList
115113
ref={getScrollRef}
116114
data={queued}

‎app/index.tsx‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ import { initStore } from './lib/store/auxStore';
3737
import { TSupportedThemes, ThemeContext } from './theme';
3838
import ChangePasscodeView from './views/ChangePasscodeView';
3939
import ScreenLockedView from './views/ScreenLockedView';
40+
import StatusBar from './containers/StatusBar';
4041

4142
enableScreens();
4243
initStore(store);
@@ -227,6 +228,7 @@ export default class Root extends React.Component<{}, IState> {
227228
<GestureHandlerRootView>
228229
<KeyboardProvider>
229230
<ActionSheetProvider>
231+
<StatusBar />
230232
<AppContainer />
231233
<TwoFactor />
232234
<ScreenLockedView />

‎app/lib/methods/helpers/theme.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ export const setNativeTheme = (themePreferences: IThemePreference) => {
5757
// Do nothing
5858
}
5959
}
60-
SystemUI.setBackgroundColorAsync(themes[theme].surfaceLight);
60+
SystemUI.setBackgroundColorAsync(themes[theme].surfaceNeutral);
6161
};
6262

6363
export const unsubscribeTheme = () => {

‎app/views/AccessibilityAndAppearanceView/index.tsx‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import Switch from '../../containers/Switch';
66
import * as HeaderButton from '../../containers/Header/components/HeaderButton';
77
import * as List from '../../containers/List';
88
import SafeAreaView from '../../containers/SafeAreaView';
9-
import StatusBar from '../../containers/StatusBar';
109
import I18n from '../../i18n';
1110
import { AccessibilityStackParamList } from '../../stacks/types';
1211
import { useAppSelector } from '../../lib/hooks';
@@ -49,7 +48,6 @@ const AccessibilityAndAppearanceView = () => {
4948
}, []);
5049
return (
5150
<SafeAreaView>
52-
<StatusBar />
5351
<List.Container testID='accessibility-view-list'>
5452
<List.Section>
5553
<List.Separator />

‎app/views/AddChannelTeamView.tsx‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import { useSelector } from 'react-redux';
55
import { CompositeNavigationProp } from '@react-navigation/core';
66

77
import * as List from '../containers/List';
8-
import StatusBar from '../containers/StatusBar';
98
import SafeAreaView from '../containers/SafeAreaView';
109
import I18n from '../i18n';
1110
import { ChatsStackParamList, DrawerParamList, NewMessageStackParamList } from '../stacks/types';
@@ -61,7 +60,6 @@ const AddChannelTeamView = () => {
6160

6261
return (
6362
<SafeAreaView testID='add-channel-team-view'>
64-
<StatusBar />
6563
<List.Container>
6664
<List.Separator />
6765
{canCreateNew ? (

‎app/views/AddExistingChannelView/index.tsx‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import I18n from '../../i18n';
1111
import log, { events, logEvent } from '../../lib/methods/helpers/log';
1212
import SearchBox from '../../containers/SearchBox';
1313
import * as HeaderButton from '../../containers/Header/components/HeaderButton';
14-
import StatusBar from '../../containers/StatusBar';
1514
import { useTheme } from '../../theme';
1615
import SafeAreaView from '../../containers/SafeAreaView';
1716
import { sendLoadingEvent } from '../../containers/Loading';
@@ -153,7 +152,6 @@ const AddExistingChannelView = () => {
153152

154153
return (
155154
<SafeAreaView testID='add-existing-channel-view'>
156-
<StatusBar />
157155
<FlatList
158156
data={channels}
159157
extraData={channels}

‎app/views/AdminPanelView/index.tsx‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import { useSelector } from 'react-redux';
55
import { NativeStackNavigationProp } from '@react-navigation/native-stack';
66

77
import I18n from '../../i18n';
8-
import StatusBar from '../../containers/StatusBar';
98
import * as HeaderButton from '../../containers/Header/components/HeaderButton';
109
import { getUserSelector } from '../../selectors/login';
1110
import SafeAreaView from '../../containers/SafeAreaView';
@@ -33,7 +32,6 @@ const AdminPanelView = () => {
3332

3433
return (
3534
<SafeAreaView>
36-
<StatusBar />
3735
<WebView
3836
// https://github.com/react-native-community/react-native-webview/issues/1311
3937
onMessage={() => {}}

‎app/views/AttachmentView.tsx‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import { isImageBase64 } from '../lib/methods';
1111
import RCActivityIndicator from '../containers/ActivityIndicator';
1212
import * as HeaderButton from '../containers/Header/components/HeaderButton';
1313
import { ImageViewer } from '../containers/ImageViewer';
14-
import StatusBar from '../containers/StatusBar';
1514
import { LISTENER } from '../containers/Toast';
1615
import { IAttachment } from '../definitions';
1716
import I18n from '../i18n';
@@ -198,7 +197,6 @@ const AttachmentView = (): React.ReactElement => {
198197

199198
return (
200199
<View style={{ backgroundColor: colors.surfaceRoom, flex: 1 }}>
201-
<StatusBar />
202200
<RenderContent attachment={attachment} setLoading={setLoading} />
203201
{loading ? <RCActivityIndicator absolute size='large' /> : null}
204202
</View>

‎app/views/AuthLoadingView.tsx‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import React from 'react';
22
import { ActivityIndicator, StyleSheet, Text, View } from 'react-native';
33

44
import I18n from '../i18n';
5-
import StatusBar from '../containers/StatusBar';
65
import { useTheme } from '../theme';
76
import sharedStyles from './Styles';
87
import { useAppSelector } from '../lib/hooks';
@@ -26,7 +25,6 @@ const AuthLoadingView = React.memo((): React.ReactElement => {
2625
const { colors } = useTheme();
2726
return (
2827
<View style={[styles.container, { backgroundColor: colors.surfaceRoom }]}>
29-
<StatusBar />
3028
{text ? (
3129
<>
3230
<ActivityIndicator color={colors.fontSecondaryInfo} size='large' />

0 commit comments

Comments
 (0)