Skip to content

Commit 93fb5f8

Browse files
hamzamekkyjose
hamzamekk
authored and
yjose
committed
feat: replace statu bar with edge to edge systembar in focuseawarestatubar file
1 parent 93af8d8 commit 93fb5f8

File tree

3 files changed

+32
-34
lines changed

3 files changed

+32
-34
lines changed

‎ios/ObytesApp.xcodeproj/project.pbxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@
380380
);
381381
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG";
382382
PRODUCT_BUNDLE_IDENTIFIER = com.obytes.development;
383-
PRODUCT_NAME = "ObytesApp";
383+
PRODUCT_NAME = ObytesApp;
384384
SWIFT_OBJC_BRIDGING_HEADER = "ObytesApp/ObytesApp-Bridging-Header.h";
385385
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
386386
SWIFT_VERSION = 5.0;
@@ -408,7 +408,7 @@
408408
);
409409
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE";
410410
PRODUCT_BUNDLE_IDENTIFIER = com.obytes.development;
411-
PRODUCT_NAME = "ObytesApp";
411+
PRODUCT_NAME = ObytesApp;
412412
SWIFT_OBJC_BRIDGING_HEADER = "ObytesApp/ObytesApp-Bridging-Header.h";
413413
SWIFT_VERSION = 5.0;
414414
TARGETED_DEVICE_FAMILY = "1,2";

‎ios/Podfile.lock‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@ PODS:
44
- EXConstants (17.0.3):
55
- ExpoModulesCore
66
- EXJSONUtils (0.14.0)
7-
- EXManifests (0.15.2):
7+
- EXManifests (0.15.4):
88
- ExpoModulesCore
9-
- Expo (52.0.7):
9+
- Expo (52.0.8):
1010
- ExpoModulesCore
11-
- expo-dev-client (5.0.2):
11+
- expo-dev-client (5.0.3):
1212
- EXManifests
1313
- expo-dev-launcher
1414
- expo-dev-menu
1515
- expo-dev-menu-interface
1616
- EXUpdatesInterface
17-
- expo-dev-launcher (5.0.14):
17+
- expo-dev-launcher (5.0.15):
1818
- DoubleConversion
1919
- EXManifests
20-
- expo-dev-launcher/Main (= 5.0.14)
20+
- expo-dev-launcher/Main (= 5.0.15)
2121
- expo-dev-menu
2222
- expo-dev-menu-interface
2323
- ExpoModulesCore
@@ -43,7 +43,7 @@ PODS:
4343
- ReactCommon/turbomodule/bridging
4444
- ReactCommon/turbomodule/core
4545
- Yoga
46-
- expo-dev-launcher/Main (5.0.14):
46+
- expo-dev-launcher/Main (5.0.15):
4747
- DoubleConversion
4848
- EXManifests
4949
- expo-dev-launcher/Unsafe
@@ -72,7 +72,7 @@ PODS:
7272
- ReactCommon/turbomodule/bridging
7373
- ReactCommon/turbomodule/core
7474
- Yoga
75-
- expo-dev-launcher/Unsafe (5.0.14):
75+
- expo-dev-launcher/Unsafe (5.0.15):
7676
- DoubleConversion
7777
- EXManifests
7878
- expo-dev-menu
@@ -217,25 +217,25 @@ PODS:
217217
- Yoga
218218
- ExpoAsset (11.0.1):
219219
- ExpoModulesCore
220-
- ExpoFileSystem (18.0.3):
220+
- ExpoFileSystem (18.0.4):
221221
- ExpoModulesCore
222222
- ExpoFont (13.0.1):
223223
- ExpoModulesCore
224-
- ExpoHead (4.0.6):
224+
- ExpoHead (4.0.7):
225225
- ExpoModulesCore
226-
- ExpoImage (2.0.0):
226+
- ExpoImage (2.0.1):
227227
- ExpoModulesCore
228228
- libavif/libdav1d
229229
- SDWebImage (~> 5.19.1)
230230
- SDWebImageAVIFCoder (~> 0.11.0)
231231
- SDWebImageSVGCoder (~> 1.7.0)
232232
- ExpoKeepAwake (14.0.1):
233233
- ExpoModulesCore
234-
- ExpoLinking (7.0.2):
234+
- ExpoLinking (7.0.3):
235235
- ExpoModulesCore
236236
- ExpoLocalization (16.0.0):
237237
- ExpoModulesCore
238-
- ExpoModulesCore (2.0.3):
238+
- ExpoModulesCore (2.0.4):
239239
- DoubleConversion
240240
- glog
241241
- hermes-engine
@@ -2016,7 +2016,7 @@ PODS:
20162016
- ReactCommon/turbomodule/bridging
20172017
- ReactCommon/turbomodule/core
20182018
- Yoga
2019-
- RNScreens (4.0.0):
2019+
- RNScreens (4.1.0):
20202020
- DoubleConversion
20212021
- glog
20222022
- hermes-engine
@@ -2037,9 +2037,9 @@ PODS:
20372037
- ReactCodegen
20382038
- ReactCommon/turbomodule/bridging
20392039
- ReactCommon/turbomodule/core
2040-
- RNScreens/common (= 4.0.0)
2040+
- RNScreens/common (= 4.1.0)
20412041
- Yoga
2042-
- RNScreens/common (4.0.0):
2042+
- RNScreens/common (4.1.0):
20432043
- DoubleConversion
20442044
- glog
20452045
- hermes-engine
@@ -2412,21 +2412,21 @@ SPEC CHECKSUMS:
24122412
DoubleConversion: f16ae600a246532c4020132d54af21d0ddb2a385
24132413
EXConstants: dd2fe64c6cdb1383b694c309a63028a8e9f2be6d
24142414
EXJSONUtils: 01fc7492b66c234e395dcffdd5f53439c5c29c93
2415-
EXManifests: f293a2f776506540805140fdac283e382b48e75d
2416-
Expo: 46cbe74ce0d0f4a4d7b726e90693eb8dfcec6de0
2417-
expo-dev-client: 7eb2bb228895757364d5650b3744db4694ee0bf7
2418-
expo-dev-launcher: e2241f955673bbd5130d086f304df0aef614740b
2415+
EXManifests: f30a0c5d3d6cad8db9c01bab579e0aa0df5d3cb2
2416+
Expo: c3e32beff4379726ad2e94068563fa03ae7109b0
2417+
expo-dev-client: 84a7f4a302387b57388d053900b56611b28b65ee
2418+
expo-dev-launcher: c454a423307d527de0f0016cca0aed6773a798ff
24192419
expo-dev-menu: 30ffa4e9e93551c093d40725e81635e86b19c511
24202420
expo-dev-menu-interface: 1495ca112a4961f9fbaf586ae952faaafdbd967b
24212421
ExpoAsset: 8138f2a9ec55ae1ad7c3871448379f7d97692d15
2422-
ExpoFileSystem: cc31b7a48031ab565f9eb5c2b61aa08d774a271a
2422+
ExpoFileSystem: dc2679a2b5d4c465ca881129074da95faee943d5
24232423
ExpoFont: 7522d869d84ee2ee8093ee997fef5b86f85d856b
2424-
ExpoHead: e18c3b28f8e22de7e1f26c085c346a91ea7f459b
2425-
ExpoImage: c3ecb28a611556fbdc1022b298ca1c09ffb4e1f3
2424+
ExpoHead: 43187036da62330d381a79a34fc37aeaca9530f8
2425+
ExpoImage: baf7dee5cb59e3b7b9c8dc204c54385fcc39ff71
24262426
ExpoKeepAwake: 783e68647b969b210a786047c3daa7b753dcac1f
2427-
ExpoLinking: 05ab69d3b5b1b0600d6a1a043d8d1ea3bb61a71a
2427+
ExpoLinking: a8332a219379ba80f8e612d5a5de4a3da446886e
24282428
ExpoLocalization: 8e37268a715b82b36fbb5e361efd5fe65a39c208
2429-
ExpoModulesCore: f12deb734bfa4efc1f1783eafc324c933a985a48
2429+
ExpoModulesCore: 28ce5c3193da2ff32648d023a282f65131ade10a
24302430
ExpoSplashScreen: a1c1b3a9648ab738be13fb109c42a85b32e08e5a
24312431
ExpoSystemUI: d8fb1abd91c7283d8ead3df77ed0575b85f1bb42
24322432
EXUpdatesInterface: 1dcebac98ac5dad4289e6ff2bd5616822e894397
@@ -2499,13 +2499,13 @@ SPEC CHECKSUMS:
24992499
RNFlashList: 6f169ad83e52579b7754cbbcec1b004c27d82c93
25002500
RNGestureHandler: fc5ce5bf284640d3af6431c3a5c3bc121e98d045
25012501
RNReanimated: 77242c6d67416988a2fd9f5cf574bb3e60016362
2502-
RNScreens: 2fe13c8d610ef2d9d5ace2e7d85b716ec0f5217c
2502+
RNScreens: 27587018b2e6082f5172b1ecf158c14a0e8842d6
25032503
RNSVG: 536cd3c866c878faf72beaba166c8b02fe2b762b
25042504
SDWebImage: 8a6b7b160b4d710e2a22b6900e25301075c34cb3
25052505
SDWebImageAVIFCoder: 00310d246aab3232ce77f1d8f0076f8c4b021d90
25062506
SDWebImageSVGCoder: 15a300a97ec1c8ac958f009c02220ac0402e936c
25072507
SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748
2508-
Yoga: 96872ee462cfc43866ad013c8160d4ff6b85709b
2508+
Yoga: c5b0e913b5b3b4cde588227c1402e747797061f3
25092509

25102510
PODFILE CHECKSUM: 4e446f593dc2f359aeae4bc90ec7aa86f8d16301
25112511

‎src/components/ui/focus-aware-status-bar.tsx‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
import { useIsFocused } from '@react-navigation/native';
22
import { useColorScheme } from 'nativewind';
33
import * as React from 'react';
4-
import { StatusBar } from 'react-native';
4+
import { SystemBars } from 'react-native-edge-to-edge';
55

6-
type Props = React.ComponentProps<typeof StatusBar>;
7-
export const FocusAwareStatusBar = (props: Props) => {
6+
type Props = { hidden?: boolean };
7+
export const FocusAwareStatusBar = ({ hidden = false }: Props) => {
88
const isFocused = useIsFocused();
99
const { colorScheme } = useColorScheme();
10-
const isDark = colorScheme === 'dark';
11-
const barStyle = isDark ? 'light-content' : 'dark-content';
1210

13-
return isFocused ? <StatusBar barStyle={barStyle} {...props} /> : null;
11+
return isFocused ? <SystemBars style={colorScheme} hidden={hidden} /> : null;
1412
};

0 commit comments

Comments
 (0)