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

Commit

Permalink
feat: switch to react-native-safe-area-context
Browse files Browse the repository at this point in the history
  • Loading branch information
brentvatne authored and satya164 committed Oct 6, 2019
1 parent ee33639 commit d1dec73
Show file tree
Hide file tree
Showing 20 changed files with 406 additions and 1,540 deletions.
1 change: 1 addition & 0 deletions example/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@ android {
}

dependencies {
implementation project(':react-native-safe-area-context')
implementation project(':react-native-webview')
implementation project(':react-native-reanimated')
implementation project(':react-native-gesture-handler')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import android.app.Application;

import com.facebook.react.ReactApplication;
import com.th3rdwave.safeareacontext.SafeAreaContextPackage;
import com.reactnativecommunity.webview.RNCWebViewPackage;
import com.swmansion.reanimated.ReanimatedPackage;
import com.facebook.react.ReactNativeHost;
Expand Down Expand Up @@ -40,6 +41,7 @@ public boolean getUseDeveloperSupport() {
protected List<ReactPackage> getPackages() {
return Arrays.<ReactPackage>asList(
new MainReactPackage(),
new SafeAreaContextPackage(),
new RNCWebViewPackage(),
new ReanimatedPackage(),
new RNGestureHandlerPackage(),
Expand Down
2 changes: 2 additions & 0 deletions example/android/settings.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
apply from: '../node_modules/react-native-unimodules/gradle.groovy'
include ':react-native-safe-area-context'
project(':react-native-safe-area-context').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-safe-area-context/android')
include ':react-native-webview'
project(':react-native-webview').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-webview/android')
include ':react-native-reanimated'
Expand Down
4 changes: 2 additions & 2 deletions example/app.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"name": "React Navigation Stack Example",
"description": "Demonstrates the various capabilities of react-navigation-stack",
"slug": "react-navigation-stack-demo",
"sdkVersion": "34.0.0",
"sdkVersion": "35.0.0",
"version": "1.0.0",
"primaryColor": "#2196f3",
"packagerOpts": {
Expand All @@ -14,4 +14,4 @@
},
"displayName": "React Navigation Stack Example",
"name": "StackExample"
}
}
2 changes: 2 additions & 0 deletions example/ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,6 @@ target 'StackExample' do
pod 'RNScreens', :podspec => '../node_modules/react-native-screens/RNScreens.podspec'
pod 'react-native-webview', :path => '../node_modules/react-native-webview'
pod 'react-native-maps', :path => '../node_modules/react-native-maps'
pod 'react-native-safe-area-context', :path => '../node_modules/react-native-safe-area-context'

end
8 changes: 7 additions & 1 deletion example/ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ PODS:
- React/Core (= 0.59.10)
- react-native-maps (0.24.2):
- React
- react-native-safe-area-context (0.3.3):
- React
- react-native-webview (5.12.1):
- React
- React/Core (0.59.10):
Expand Down Expand Up @@ -133,6 +135,7 @@ DEPENDENCIES:
- Folly (from `../node_modules/react-native/third-party-podspecs/Folly.podspec`)
- glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`)
- react-native-maps (from `../node_modules/react-native-maps`)
- react-native-safe-area-context (from `../node_modules/react-native-safe-area-context`)
- react-native-webview (from `../node_modules/react-native-webview`)
- React/Core (from `../node_modules/react-native`)
- React/CxxBridge (from `../node_modules/react-native`)
Expand Down Expand Up @@ -213,6 +216,8 @@ EXTERNAL SOURCES:
:path: "../node_modules/react-native"
react-native-maps:
:path: "../node_modules/react-native-maps"
react-native-safe-area-context:
:path: "../node_modules/react-native-safe-area-context"
react-native-webview:
:path: "../node_modules/react-native-webview"
RNGestureHandler:
Expand Down Expand Up @@ -278,6 +283,7 @@ SPEC CHECKSUMS:
glog: aefd1eb5dda2ab95ba0938556f34b98e2da3a60d
React: 36d0768f9e93be2473b37e7fa64f92c1d5341eef
react-native-maps: 0316ed017dbb64b33b227751fa810e2454fcfa39
react-native-safe-area-context: 05fce11cf3a094304cb4cb8761a8f66f1bbaf0a0
react-native-webview: 5036ed4a973ad1deeeff118262d2df7b60b3419d
RNGestureHandler: 5329a942fce3d41c68b84c2c2276ce06a696d8b0
RNReanimated: 7a52c90473b5e81c13408d40d797b98387eaddde
Expand All @@ -296,6 +302,6 @@ SPEC CHECKSUMS:
UMTaskManagerInterface: 8664abd37a00715727e60df9ecd65e42ba47b548
yoga: 684513b14b03201579ba3cee20218c9d1298b0cc

PODFILE CHECKSUM: ba5af81bcabf9feca0e74ef3f931f99ebe73e278
PODFILE CHECKSUM: 8eac0f6d450c8440d0530650ff7a9cfe8f185063

COCOAPODS: 1.7.5
1 change: 1 addition & 0 deletions example/metro.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ module.exports = {

providesModuleNodeModules: [
'@expo/vector-icons',
'react-native-safe-area-context',
'@babel/runtime',
'react-navigation',
...projectDependencies,
Expand Down
23 changes: 12 additions & 11 deletions example/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,21 +10,22 @@
},
"dependencies": {
"@react-native-community/masked-view": "^0.1.1",
"expo": "^34.0.0",
"expo-asset": "^6.0.0",
"expo-barcode-scanner": "~6.0.0",
"expo-constants": "~6.0.0",
"expo": "^35.0.0",
"expo-asset": "~7.0.0",
"expo-barcode-scanner": "~7.0.0",
"expo-constants": "~7.0.0",
"hoist-non-react-statics": "^3.3.0",
"react": "16.8.3",
"react-dom": "^16.8.6",
"react-native": "0.59.10",
"react": "~16.8.3",
"react-dom": "~16.8.3",
"react-native": "~0.59.10",
"react-native-gesture-handler": "~1.3.0",
"react-native-maps": "~0.24.0",
"react-native-maps": "~0.25.0",
"react-native-paper": "^2.15.2",
"react-native-reanimated": "~1.1.0",
"react-native-unimodules": "~0.5.2",
"react-native-reanimated": "~1.2.0",
"react-native-safe-area-context": "^0.3.6",
"react-native-unimodules": "^0.7.0-rc.1",
"react-native-web": "^0.11.4",
"react-native-webview": "~5.12.0",
"react-native-webview": "7.0.5",
"react-navigation": "^4.0.7",
"react-navigation-drawer": "^2.2.2",
"react-navigation-tabs": "^2.5.5"
Expand Down
Loading

0 comments on commit d1dec73

Please sign in to comment.