Skip to content
This repository was archived by the owner on Feb 25, 2020. It is now read-only.

Commit d1dec73

Browse files
brentvatnesatya164
authored andcommitted
feat: switch to react-native-safe-area-context
1 parent ee33639 commit d1dec73

File tree

20 files changed

+406
-1540
lines changed

20 files changed

+406
-1540
lines changed

example/android/app/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,7 @@ android {
139139
}
140140

141141
dependencies {
142+
implementation project(':react-native-safe-area-context')
142143
implementation project(':react-native-webview')
143144
implementation project(':react-native-reanimated')
144145
implementation project(':react-native-gesture-handler')

example/android/app/src/main/java/com/stackexample/MainApplication.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import android.app.Application;
44

55
import com.facebook.react.ReactApplication;
6+
import com.th3rdwave.safeareacontext.SafeAreaContextPackage;
67
import com.reactnativecommunity.webview.RNCWebViewPackage;
78
import com.swmansion.reanimated.ReanimatedPackage;
89
import com.facebook.react.ReactNativeHost;
@@ -40,6 +41,7 @@ public boolean getUseDeveloperSupport() {
4041
protected List<ReactPackage> getPackages() {
4142
return Arrays.<ReactPackage>asList(
4243
new MainReactPackage(),
44+
new SafeAreaContextPackage(),
4345
new RNCWebViewPackage(),
4446
new ReanimatedPackage(),
4547
new RNGestureHandlerPackage(),

example/android/settings.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
apply from: '../node_modules/react-native-unimodules/gradle.groovy'
2+
include ':react-native-safe-area-context'
3+
project(':react-native-safe-area-context').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-safe-area-context/android')
24
include ':react-native-webview'
35
project(':react-native-webview').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-webview/android')
46
include ':react-native-reanimated'

example/app.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"name": "React Navigation Stack Example",
44
"description": "Demonstrates the various capabilities of react-navigation-stack",
55
"slug": "react-navigation-stack-demo",
6-
"sdkVersion": "34.0.0",
6+
"sdkVersion": "35.0.0",
77
"version": "1.0.0",
88
"primaryColor": "#2196f3",
99
"packagerOpts": {
@@ -14,4 +14,4 @@
1414
},
1515
"displayName": "React Navigation Stack Example",
1616
"name": "StackExample"
17-
}
17+
}

example/ios/Podfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,6 @@ target 'StackExample' do
3434
pod 'RNScreens', :podspec => '../node_modules/react-native-screens/RNScreens.podspec'
3535
pod 'react-native-webview', :path => '../node_modules/react-native-webview'
3636
pod 'react-native-maps', :path => '../node_modules/react-native-maps'
37+
pod 'react-native-safe-area-context', :path => '../node_modules/react-native-safe-area-context'
38+
3739
end

example/ios/Podfile.lock

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ PODS:
3939
- React/Core (= 0.59.10)
4040
- react-native-maps (0.24.2):
4141
- React
42+
- react-native-safe-area-context (0.3.3):
43+
- React
4244
- react-native-webview (5.12.1):
4345
- React
4446
- React/Core (0.59.10):
@@ -133,6 +135,7 @@ DEPENDENCIES:
133135
- Folly (from `../node_modules/react-native/third-party-podspecs/Folly.podspec`)
134136
- glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`)
135137
- react-native-maps (from `../node_modules/react-native-maps`)
138+
- react-native-safe-area-context (from `../node_modules/react-native-safe-area-context`)
136139
- react-native-webview (from `../node_modules/react-native-webview`)
137140
- React/Core (from `../node_modules/react-native`)
138141
- React/CxxBridge (from `../node_modules/react-native`)
@@ -213,6 +216,8 @@ EXTERNAL SOURCES:
213216
:path: "../node_modules/react-native"
214217
react-native-maps:
215218
:path: "../node_modules/react-native-maps"
219+
react-native-safe-area-context:
220+
:path: "../node_modules/react-native-safe-area-context"
216221
react-native-webview:
217222
:path: "../node_modules/react-native-webview"
218223
RNGestureHandler:
@@ -278,6 +283,7 @@ SPEC CHECKSUMS:
278283
glog: aefd1eb5dda2ab95ba0938556f34b98e2da3a60d
279284
React: 36d0768f9e93be2473b37e7fa64f92c1d5341eef
280285
react-native-maps: 0316ed017dbb64b33b227751fa810e2454fcfa39
286+
react-native-safe-area-context: 05fce11cf3a094304cb4cb8761a8f66f1bbaf0a0
281287
react-native-webview: 5036ed4a973ad1deeeff118262d2df7b60b3419d
282288
RNGestureHandler: 5329a942fce3d41c68b84c2c2276ce06a696d8b0
283289
RNReanimated: 7a52c90473b5e81c13408d40d797b98387eaddde
@@ -296,6 +302,6 @@ SPEC CHECKSUMS:
296302
UMTaskManagerInterface: 8664abd37a00715727e60df9ecd65e42ba47b548
297303
yoga: 684513b14b03201579ba3cee20218c9d1298b0cc
298304

299-
PODFILE CHECKSUM: ba5af81bcabf9feca0e74ef3f931f99ebe73e278
305+
PODFILE CHECKSUM: 8eac0f6d450c8440d0530650ff7a9cfe8f185063
300306

301307
COCOAPODS: 1.7.5

example/metro.config.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ module.exports = {
2828

2929
providesModuleNodeModules: [
3030
'@expo/vector-icons',
31+
'react-native-safe-area-context',
3132
'@babel/runtime',
3233
'react-navigation',
3334
...projectDependencies,

example/package.json

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,22 @@
1010
},
1111
"dependencies": {
1212
"@react-native-community/masked-view": "^0.1.1",
13-
"expo": "^34.0.0",
14-
"expo-asset": "^6.0.0",
15-
"expo-barcode-scanner": "~6.0.0",
16-
"expo-constants": "~6.0.0",
13+
"expo": "^35.0.0",
14+
"expo-asset": "~7.0.0",
15+
"expo-barcode-scanner": "~7.0.0",
16+
"expo-constants": "~7.0.0",
1717
"hoist-non-react-statics": "^3.3.0",
18-
"react": "16.8.3",
19-
"react-dom": "^16.8.6",
20-
"react-native": "0.59.10",
18+
"react": "~16.8.3",
19+
"react-dom": "~16.8.3",
20+
"react-native": "~0.59.10",
2121
"react-native-gesture-handler": "~1.3.0",
22-
"react-native-maps": "~0.24.0",
22+
"react-native-maps": "~0.25.0",
2323
"react-native-paper": "^2.15.2",
24-
"react-native-reanimated": "~1.1.0",
25-
"react-native-unimodules": "~0.5.2",
24+
"react-native-reanimated": "~1.2.0",
25+
"react-native-safe-area-context": "^0.3.6",
26+
"react-native-unimodules": "^0.7.0-rc.1",
2627
"react-native-web": "^0.11.4",
27-
"react-native-webview": "~5.12.0",
28+
"react-native-webview": "7.0.5",
2829
"react-navigation": "^4.0.7",
2930
"react-navigation-drawer": "^2.2.2",
3031
"react-navigation-tabs": "^2.5.5"

0 commit comments

Comments
 (0)