Page MenuHomePhorge
Files F32160894

D15124.1765041701.diff
No OneTemporary
Actions

Size
4 KB
Referenced Files
None
Subscribers
None

D15124.1765041701.diff
View Options

diff --git a/native/account/logged-out-modal.react.js b/native/account/logged-out-modal.react.js
--- a/native/account/logged-out-modal.react.js
+++ b/native/account/logged-out-modal.react.js
@@ -589,7 +589,7 @@
return React.useMemo(
() => (
<>
- <ConnectedStatusBar barStyle="light-content" />
+ <ConnectedStatusBar barStyle="light" />
<Image source={backgroundSource} style={backgroundStyle} />
<SafeAreaView style={styles.container} edges={safeAreaEdges}>
<KeyboardAvoidingView behavior="padding" style={styles.container}>
diff --git a/native/android/app/src/main/res/values/styles.xml b/native/android/app/src/main/res/values/styles.xml
--- a/native/android/app/src/main/res/values/styles.xml
+++ b/native/android/app/src/main/res/values/styles.xml
@@ -1,5 +1,5 @@
<resources>
- <style name="AppTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
+ <style name="AppTheme" parent="Theme.EdgeToEdge">
<item name="android:editTextBackground">@drawable/rn_edit_text_material</item>
</style>
<style name="Theme.App.SplashScreen" parent="AppTheme">
diff --git a/native/components/full-screen-view-modal.react.js b/native/components/full-screen-view-modal.react.js
--- a/native/components/full-screen-view-modal.react.js
+++ b/native/components/full-screen-view-modal.react.js
@@ -718,12 +718,7 @@
const { children, saveContentCallback, copyContentCallback } = props;
- // a temporary solution for https://linear.app/comm/issue/ENG-10294 is to not
- // hide status bar on Android
- // after RN upgrade remove platform check so we can also hide the status bar
- // on Android
- const statusBar =
- isActive && Platform.OS === 'ios' ? <ConnectedStatusBar hidden /> : null;
+ const statusBar = isActive && <ConnectedStatusBar hidden />;
let saveButton;
if (saveContentCallback) {
diff --git a/native/connected-status-bar.react.js b/native/connected-status-bar.react.js
--- a/native/connected-status-bar.react.js
+++ b/native/connected-status-bar.react.js
@@ -1,14 +1,14 @@
// @flow
import * as React from 'react';
-import { StatusBar, Platform } from 'react-native';
+import { SystemBars } from 'react-native-edge-to-edge';
import { globalLoadingStatusSelector } from 'lib/selectors/loading-selectors.js';
import { useSelector } from './redux/redux-utils.js';
type Props = {
- +barStyle?: 'default' | 'light-content' | 'dark-content',
+ +barStyle?: 'default' | 'light' | 'dark',
+animated?: boolean,
+hidden?: boolean,
};
@@ -19,18 +19,18 @@
let barStyle = inBarStyle;
if (!barStyle) {
- if (Platform.OS !== 'android' && activeTheme === 'light') {
- barStyle = 'dark-content';
+ if (activeTheme === 'light') {
+ barStyle = 'dark';
} else {
- barStyle = 'light-content';
+ barStyle = 'light';
}
}
const fetchingSomething = globalLoadingStatus === 'loading';
return (
- <StatusBar
+ <SystemBars
{...statusBarProps}
- barStyle={barStyle}
+ style={barStyle}
networkActivityIndicatorVisible={fetchingSomething}
/>
);
diff --git a/native/crash.react.js b/native/crash.react.js
--- a/native/crash.react.js
+++ b/native/crash.react.js
@@ -122,7 +122,7 @@
return (
<View style={styles.container}>
- <ConnectedStatusBar barStyle="dark-content" />
+ <ConnectedStatusBar barStyle="dark" />
<Icon name="bug" size={32} color="red" />
<Text style={styles.header}>{this.errorTitle}</Text>
<Text style={styles.text}>I&rsquo;m sorry, but the app crashed.</Text>
diff --git a/native/media/camera-modal.react.js b/native/media/camera-modal.react.js
--- a/native/media/camera-modal.react.js
+++ b/native/media/camera-modal.react.js
@@ -875,8 +875,13 @@
);
};
- const statusBar = isActive ? <ConnectedStatusBar hidden /> : null;
+ const statusBar = isActive ? (
+ <ConnectedStatusBar hidden />
+ ) : (
+ <ConnectedStatusBar hidden={false} />
+ );
const device = useCameraDevice(useFrontCamera ? 'front' : 'back');
+
if (!device) {
return (
<View style={styles.authorizationDeniedContainer}>
diff --git a/native/package.json b/native/package.json
--- a/native/package.json
+++ b/native/package.json
@@ -100,6 +100,7 @@
"react": "19.1.0",
"react-native": "0.80.1",
"react-native-device-info": "^10.3.0",
+ "react-native-edge-to-edge": "1.6.0",
"react-native-figma-squircle": "^0.1.2",
"react-native-floating-action": "^1.22.0",
"react-native-fs": "^2.20.0",

File Metadata

Mime Type
text/plain
Expires
Sat, Dec 6, 5:21 PM (22 h, 10 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5839763
Default Alt Text
D15124.1765041701.diff (4 KB)

Event Timeline