From 857e090355316393c338eac02132020c6004b825 Mon Sep 17 00:00:00 2001 From: Mo Gorhom Date: Sat, 4 Apr 2020 20:13:36 +0200 Subject: [PATCH 1/2] chore: update react-native --- example/android/app/build.gradle | 8 +- .../android/app/src/main/AndroidManifest.xml | 3 +- example/android/build.gradle | 4 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../xcschemes/AnimatedTabbarExample.xcscheme | 27 +- .../xcshareddata/IDEWorkspaceChecks.plist | 8 - example/ios/Podfile | 4 +- example/ios/Podfile.lock | 344 ++++++++++-------- example/package.json | 19 +- 9 files changed, 210 insertions(+), 209 deletions(-) delete mode 100644 example/ios/AnimatedTabbarExample.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index bd386b1..ae79210 100644 --- a/example/android/app/build.gradle +++ b/example/android/app/build.gradle @@ -76,7 +76,6 @@ import com.android.build.OutputFile */ project.ext.react = [ - entryFile: "index.js", enableHermes: false, // clean and rebuild if changing ] @@ -162,6 +161,12 @@ android { proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro" } } + packagingOptions { + pickFirst "lib/armeabi-v7a/libc++_shared.so" + pickFirst "lib/arm64-v8a/libc++_shared.so" + pickFirst "lib/x86/libc++_shared.so" + pickFirst "lib/x86_64/libc++_shared.so" + } // applicationVariants are e.g. debug, release applicationVariants.all { variant -> variant.outputs.each { output -> @@ -181,6 +186,7 @@ android { dependencies { implementation fileTree(dir: "libs", include: ["*.jar"]) implementation "com.facebook.react:react-native:+" // From node_modules + implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0" if (enableHermes) { def hermesPath = "../../node_modules/hermes-engine/android/"; diff --git a/example/android/app/src/main/AndroidManifest.xml b/example/android/app/src/main/AndroidManifest.xml index 26e3b10..493f5ce 100644 --- a/example/android/app/src/main/AndroidManifest.xml +++ b/example/android/app/src/main/AndroidManifest.xml @@ -13,7 +13,8 @@ diff --git a/example/android/build.gradle b/example/android/build.gradle index 28f7ec6..5d5d188 100644 --- a/example/android/build.gradle +++ b/example/android/build.gradle @@ -12,7 +12,7 @@ buildscript { jcenter() } dependencies { - classpath("com.android.tools.build:gradle:3.4.2") + classpath("com.android.tools.build:gradle:3.5.2") // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -33,6 +33,6 @@ allprojects { google() jcenter() - maven { url 'https://jitpack.io' } + maven { url 'https://www.jitpack.io' } } } diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/example/android/gradle/wrapper/gradle-wrapper.properties index e0c4de3..1ba7206 100644 --- a/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/example/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.5-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/example/ios/AnimatedTabbarExample.xcodeproj/xcshareddata/xcschemes/AnimatedTabbarExample.xcscheme b/example/ios/AnimatedTabbarExample.xcodeproj/xcshareddata/xcschemes/AnimatedTabbarExample.xcscheme index 469d8bf..3c6ea75 100644 --- a/example/ios/AnimatedTabbarExample.xcodeproj/xcshareddata/xcschemes/AnimatedTabbarExample.xcscheme +++ b/example/ios/AnimatedTabbarExample.xcodeproj/xcshareddata/xcschemes/AnimatedTabbarExample.xcscheme @@ -1,25 +1,11 @@ - - - - - - - - - - - - IDEDidComputeMac32BitWarning - - - diff --git a/example/ios/Podfile b/example/ios/Podfile index 4dc5849..c6269f9 100644 --- a/example/ios/Podfile +++ b/example/ios/Podfile @@ -26,9 +26,9 @@ target 'AnimatedTabbarExample' do pod 'React-jsi', :path => '../node_modules/react-native/ReactCommon/jsi' pod 'React-jsiexecutor', :path => '../node_modules/react-native/ReactCommon/jsiexecutor' pod 'React-jsinspector', :path => '../node_modules/react-native/ReactCommon/jsinspector' - pod 'ReactCommon/jscallinvoker', :path => "../node_modules/react-native/ReactCommon" + pod 'ReactCommon/callinvoker', :path => "../node_modules/react-native/ReactCommon" pod 'ReactCommon/turbomodule/core', :path => "../node_modules/react-native/ReactCommon" - pod 'Yoga', :path => '../node_modules/react-native/ReactCommon/yoga' + pod 'Yoga', :path => '../node_modules/react-native/ReactCommon/yoga', :modular_headers => true pod 'DoubleConversion', :podspec => '../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec' pod 'glog', :podspec => '../node_modules/react-native/third-party-podspecs/glog.podspec' diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock index d8be5b2..9ec4856 100644 --- a/example/ios/Podfile.lock +++ b/example/ios/Podfile.lock @@ -1,14 +1,14 @@ PODS: - boost-for-react-native (1.63.0) - DoubleConversion (1.1.6) - - FBLazyVector (0.61.5) - - FBReactNativeSpec (0.61.5): + - FBLazyVector (0.62.1) + - FBReactNativeSpec (0.62.1): - Folly (= 2018.10.22.00) - - RCTRequired (= 0.61.5) - - RCTTypeSafety (= 0.61.5) - - React-Core (= 0.61.5) - - React-jsi (= 0.61.5) - - ReactCommon/turbomodule/core (= 0.61.5) + - RCTRequired (= 0.62.1) + - RCTTypeSafety (= 0.62.1) + - React-Core (= 0.62.1) + - React-jsi (= 0.62.1) + - ReactCommon/turbomodule/core (= 0.62.1) - Folly (2018.10.22.00): - boost-for-react-native - DoubleConversion @@ -19,213 +19,237 @@ PODS: - DoubleConversion - glog - glog (0.3.5) - - RCTRequired (0.61.5) - - RCTTypeSafety (0.61.5): - - FBLazyVector (= 0.61.5) + - RCTRequired (0.62.1) + - RCTTypeSafety (0.62.1): + - FBLazyVector (= 0.62.1) - Folly (= 2018.10.22.00) - - RCTRequired (= 0.61.5) - - React-Core (= 0.61.5) - - React (0.61.5): - - React-Core (= 0.61.5) - - React-Core/DevSupport (= 0.61.5) - - React-Core/RCTWebSocket (= 0.61.5) - - React-RCTActionSheet (= 0.61.5) - - React-RCTAnimation (= 0.61.5) - - React-RCTBlob (= 0.61.5) - - React-RCTImage (= 0.61.5) - - React-RCTLinking (= 0.61.5) - - React-RCTNetwork (= 0.61.5) - - React-RCTSettings (= 0.61.5) - - React-RCTText (= 0.61.5) - - React-RCTVibration (= 0.61.5) - - React-Core (0.61.5): + - RCTRequired (= 0.62.1) + - React-Core (= 0.62.1) + - React (0.62.1): + - React-Core (= 0.62.1) + - React-Core/DevSupport (= 0.62.1) + - React-Core/RCTWebSocket (= 0.62.1) + - React-RCTActionSheet (= 0.62.1) + - React-RCTAnimation (= 0.62.1) + - React-RCTBlob (= 0.62.1) + - React-RCTImage (= 0.62.1) + - React-RCTLinking (= 0.62.1) + - React-RCTNetwork (= 0.62.1) + - React-RCTSettings (= 0.62.1) + - React-RCTText (= 0.62.1) + - React-RCTVibration (= 0.62.1) + - React-Core (0.62.1): - Folly (= 2018.10.22.00) - glog - - React-Core/Default (= 0.61.5) - - React-cxxreact (= 0.61.5) - - React-jsi (= 0.61.5) - - React-jsiexecutor (= 0.61.5) + - React-Core/Default (= 0.62.1) + - React-cxxreact (= 0.62.1) + - React-jsi (= 0.62.1) + - React-jsiexecutor (= 0.62.1) - Yoga - - React-Core/CoreModulesHeaders (0.61.5): + - React-Core/CoreModulesHeaders (0.62.1): - Folly (= 2018.10.22.00) - glog - React-Core/Default - - React-cxxreact (= 0.61.5) - - React-jsi (= 0.61.5) - - React-jsiexecutor (= 0.61.5) + - React-cxxreact (= 0.62.1) + - React-jsi (= 0.62.1) + - React-jsiexecutor (= 0.62.1) - Yoga - - React-Core/Default (0.61.5): + - React-Core/Default (0.62.1): - Folly (= 2018.10.22.00) - glog - - React-cxxreact (= 0.61.5) - - React-jsi (= 0.61.5) - - React-jsiexecutor (= 0.61.5) + - React-cxxreact (= 0.62.1) + - React-jsi (= 0.62.1) + - React-jsiexecutor (= 0.62.1) - Yoga - - React-Core/DevSupport (0.61.5): + - React-Core/DevSupport (0.62.1): - Folly (= 2018.10.22.00) - glog - - React-Core/Default (= 0.61.5) - - React-Core/RCTWebSocket (= 0.61.5) - - React-cxxreact (= 0.61.5) - - React-jsi (= 0.61.5) - - React-jsiexecutor (= 0.61.5) - - React-jsinspector (= 0.61.5) + - React-Core/Default (= 0.62.1) + - React-Core/RCTWebSocket (= 0.62.1) + - React-cxxreact (= 0.62.1) + - React-jsi (= 0.62.1) + - React-jsiexecutor (= 0.62.1) + - React-jsinspector (= 0.62.1) - Yoga - - React-Core/RCTActionSheetHeaders (0.61.5): + - React-Core/RCTActionSheetHeaders (0.62.1): - Folly (= 2018.10.22.00) - glog - React-Core/Default - - React-cxxreact (= 0.61.5) - - React-jsi (= 0.61.5) - - React-jsiexecutor (= 0.61.5) + - React-cxxreact (= 0.62.1) + - React-jsi (= 0.62.1) + - React-jsiexecutor (= 0.62.1) - Yoga - - React-Core/RCTAnimationHeaders (0.61.5): + - React-Core/RCTAnimationHeaders (0.62.1): - Folly (= 2018.10.22.00) - glog - React-Core/Default - - React-cxxreact (= 0.61.5) - - React-jsi (= 0.61.5) - - React-jsiexecutor (= 0.61.5) + - React-cxxreact (= 0.62.1) + - React-jsi (= 0.62.1) + - React-jsiexecutor (= 0.62.1) - Yoga - - React-Core/RCTBlobHeaders (0.61.5): + - React-Core/RCTBlobHeaders (0.62.1): - Folly (= 2018.10.22.00) - glog - React-Core/Default - - React-cxxreact (= 0.61.5) - - React-jsi (= 0.61.5) - - React-jsiexecutor (= 0.61.5) + - React-cxxreact (= 0.62.1) + - React-jsi (= 0.62.1) + - React-jsiexecutor (= 0.62.1) - Yoga - - React-Core/RCTImageHeaders (0.61.5): + - React-Core/RCTImageHeaders (0.62.1): - Folly (= 2018.10.22.00) - glog - React-Core/Default - - React-cxxreact (= 0.61.5) - - React-jsi (= 0.61.5) - - React-jsiexecutor (= 0.61.5) + - React-cxxreact (= 0.62.1) + - React-jsi (= 0.62.1) + - React-jsiexecutor (= 0.62.1) - Yoga - - React-Core/RCTLinkingHeaders (0.61.5): + - React-Core/RCTLinkingHeaders (0.62.1): - Folly (= 2018.10.22.00) - glog - React-Core/Default - - React-cxxreact (= 0.61.5) - - React-jsi (= 0.61.5) - - React-jsiexecutor (= 0.61.5) + - React-cxxreact (= 0.62.1) + - React-jsi (= 0.62.1) + - React-jsiexecutor (= 0.62.1) - Yoga - - React-Core/RCTNetworkHeaders (0.61.5): + - React-Core/RCTNetworkHeaders (0.62.1): - Folly (= 2018.10.22.00) - glog - React-Core/Default - - React-cxxreact (= 0.61.5) - - React-jsi (= 0.61.5) - - React-jsiexecutor (= 0.61.5) + - React-cxxreact (= 0.62.1) + - React-jsi (= 0.62.1) + - React-jsiexecutor (= 0.62.1) - Yoga - - React-Core/RCTSettingsHeaders (0.61.5): + - React-Core/RCTSettingsHeaders (0.62.1): - Folly (= 2018.10.22.00) - glog - React-Core/Default - - React-cxxreact (= 0.61.5) - - React-jsi (= 0.61.5) - - React-jsiexecutor (= 0.61.5) + - React-cxxreact (= 0.62.1) + - React-jsi (= 0.62.1) + - React-jsiexecutor (= 0.62.1) - Yoga - - React-Core/RCTTextHeaders (0.61.5): + - React-Core/RCTTextHeaders (0.62.1): - Folly (= 2018.10.22.00) - glog - React-Core/Default - - React-cxxreact (= 0.61.5) - - React-jsi (= 0.61.5) - - React-jsiexecutor (= 0.61.5) + - React-cxxreact (= 0.62.1) + - React-jsi (= 0.62.1) + - React-jsiexecutor (= 0.62.1) - Yoga - - React-Core/RCTVibrationHeaders (0.61.5): + - React-Core/RCTVibrationHeaders (0.62.1): - Folly (= 2018.10.22.00) - glog - React-Core/Default - - React-cxxreact (= 0.61.5) - - React-jsi (= 0.61.5) - - React-jsiexecutor (= 0.61.5) + - React-cxxreact (= 0.62.1) + - React-jsi (= 0.62.1) + - React-jsiexecutor (= 0.62.1) - Yoga - - React-Core/RCTWebSocket (0.61.5): + - React-Core/RCTWebSocket (0.62.1): - Folly (= 2018.10.22.00) - glog - - React-Core/Default (= 0.61.5) - - React-cxxreact (= 0.61.5) - - React-jsi (= 0.61.5) - - React-jsiexecutor (= 0.61.5) + - React-Core/Default (= 0.62.1) + - React-cxxreact (= 0.62.1) + - React-jsi (= 0.62.1) + - React-jsiexecutor (= 0.62.1) - Yoga - - React-CoreModules (0.61.5): - - FBReactNativeSpec (= 0.61.5) + - React-CoreModules (0.62.1): + - FBReactNativeSpec (= 0.62.1) - Folly (= 2018.10.22.00) - - RCTTypeSafety (= 0.61.5) - - React-Core/CoreModulesHeaders (= 0.61.5) - - React-RCTImage (= 0.61.5) - - ReactCommon/turbomodule/core (= 0.61.5) - - React-cxxreact (0.61.5): + - RCTTypeSafety (= 0.62.1) + - React-Core/CoreModulesHeaders (= 0.62.1) + - React-RCTImage (= 0.62.1) + - ReactCommon/turbomodule/core (= 0.62.1) + - React-cxxreact (0.62.1): - boost-for-react-native (= 1.63.0) - DoubleConversion - Folly (= 2018.10.22.00) - glog - - React-jsinspector (= 0.61.5) - - React-jsi (0.61.5): + - React-jsinspector (= 0.62.1) + - React-jsi (0.62.1): - boost-for-react-native (= 1.63.0) - DoubleConversion - Folly (= 2018.10.22.00) - glog - - React-jsi/Default (= 0.61.5) - - React-jsi/Default (0.61.5): + - React-jsi/Default (= 0.62.1) + - React-jsi/Default (0.62.1): - boost-for-react-native (= 1.63.0) - DoubleConversion - Folly (= 2018.10.22.00) - glog - - React-jsiexecutor (0.61.5): + - React-jsiexecutor (0.62.1): - DoubleConversion - Folly (= 2018.10.22.00) - glog - - React-cxxreact (= 0.61.5) - - React-jsi (= 0.61.5) - - React-jsinspector (0.61.5) + - React-cxxreact (= 0.62.1) + - React-jsi (= 0.62.1) + - React-jsinspector (0.62.1) - react-native-safe-area-context (0.7.3): - React - - React-RCTActionSheet (0.61.5): - - React-Core/RCTActionSheetHeaders (= 0.61.5) - - React-RCTAnimation (0.61.5): - - React-Core/RCTAnimationHeaders (= 0.61.5) - - React-RCTBlob (0.61.5): - - React-Core/RCTBlobHeaders (= 0.61.5) - - React-Core/RCTWebSocket (= 0.61.5) - - React-jsi (= 0.61.5) - - React-RCTNetwork (= 0.61.5) - - React-RCTImage (0.61.5): - - React-Core/RCTImageHeaders (= 0.61.5) - - React-RCTNetwork (= 0.61.5) - - React-RCTLinking (0.61.5): - - React-Core/RCTLinkingHeaders (= 0.61.5) - - React-RCTNetwork (0.61.5): - - React-Core/RCTNetworkHeaders (= 0.61.5) - - React-RCTSettings (0.61.5): - - React-Core/RCTSettingsHeaders (= 0.61.5) - - React-RCTText (0.61.5): - - React-Core/RCTTextHeaders (= 0.61.5) - - React-RCTVibration (0.61.5): - - React-Core/RCTVibrationHeaders (= 0.61.5) - - ReactCommon/jscallinvoker (0.61.5): + - React-RCTActionSheet (0.62.1): + - React-Core/RCTActionSheetHeaders (= 0.62.1) + - React-RCTAnimation (0.62.1): + - FBReactNativeSpec (= 0.62.1) + - Folly (= 2018.10.22.00) + - RCTTypeSafety (= 0.62.1) + - React-Core/RCTAnimationHeaders (= 0.62.1) + - ReactCommon/turbomodule/core (= 0.62.1) + - React-RCTBlob (0.62.1): + - FBReactNativeSpec (= 0.62.1) + - Folly (= 2018.10.22.00) + - React-Core/RCTBlobHeaders (= 0.62.1) + - React-Core/RCTWebSocket (= 0.62.1) + - React-jsi (= 0.62.1) + - React-RCTNetwork (= 0.62.1) + - ReactCommon/turbomodule/core (= 0.62.1) + - React-RCTImage (0.62.1): + - FBReactNativeSpec (= 0.62.1) + - Folly (= 2018.10.22.00) + - RCTTypeSafety (= 0.62.1) + - React-Core/RCTImageHeaders (= 0.62.1) + - React-RCTNetwork (= 0.62.1) + - ReactCommon/turbomodule/core (= 0.62.1) + - React-RCTLinking (0.62.1): + - FBReactNativeSpec (= 0.62.1) + - React-Core/RCTLinkingHeaders (= 0.62.1) + - ReactCommon/turbomodule/core (= 0.62.1) + - React-RCTNetwork (0.62.1): + - FBReactNativeSpec (= 0.62.1) + - Folly (= 2018.10.22.00) + - RCTTypeSafety (= 0.62.1) + - React-Core/RCTNetworkHeaders (= 0.62.1) + - ReactCommon/turbomodule/core (= 0.62.1) + - React-RCTSettings (0.62.1): + - FBReactNativeSpec (= 0.62.1) + - Folly (= 2018.10.22.00) + - RCTTypeSafety (= 0.62.1) + - React-Core/RCTSettingsHeaders (= 0.62.1) + - ReactCommon/turbomodule/core (= 0.62.1) + - React-RCTText (0.62.1): + - React-Core/RCTTextHeaders (= 0.62.1) + - React-RCTVibration (0.62.1): + - FBReactNativeSpec (= 0.62.1) + - Folly (= 2018.10.22.00) + - React-Core/RCTVibrationHeaders (= 0.62.1) + - ReactCommon/turbomodule/core (= 0.62.1) + - ReactCommon/callinvoker (0.62.1): - DoubleConversion - Folly (= 2018.10.22.00) - glog - - React-cxxreact (= 0.61.5) - - ReactCommon/turbomodule/core (0.61.5): + - React-cxxreact (= 0.62.1) + - ReactCommon/turbomodule/core (0.62.1): - DoubleConversion - Folly (= 2018.10.22.00) - glog - - React-Core (= 0.61.5) - - React-cxxreact (= 0.61.5) - - React-jsi (= 0.61.5) - - ReactCommon/jscallinvoker (= 0.61.5) + - React-Core (= 0.62.1) + - React-cxxreact (= 0.62.1) + - React-jsi (= 0.62.1) + - ReactCommon/callinvoker (= 0.62.1) - RNCMaskedView (0.1.7): - React - - RNGestureHandler (1.6.0): + - RNGestureHandler (1.6.1): - React - - RNReanimated (1.7.0): + - RNReanimated (1.7.1): - React - - RNScreens (2.3.0): + - RNScreens (2.4.0): - React - RNSVG (12.0.3): - React @@ -258,7 +282,7 @@ DEPENDENCIES: - React-RCTSettings (from `../node_modules/react-native/Libraries/Settings`) - React-RCTText (from `../node_modules/react-native/Libraries/Text`) - React-RCTVibration (from `../node_modules/react-native/Libraries/Vibration`) - - ReactCommon/jscallinvoker (from `../node_modules/react-native/ReactCommon`) + - ReactCommon/callinvoker (from `../node_modules/react-native/ReactCommon`) - ReactCommon/turbomodule/core (from `../node_modules/react-native/ReactCommon`) - "RNCMaskedView (from `../node_modules/@react-native-community/masked-view`)" - RNGestureHandler (from `../node_modules/react-native-gesture-handler`) @@ -338,37 +362,37 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c DoubleConversion: 5805e889d232975c086db112ece9ed034df7a0b2 - FBLazyVector: aaeaf388755e4f29cd74acbc9e3b8da6d807c37f - FBReactNativeSpec: 118d0d177724c2d67f08a59136eb29ef5943ec75 + FBLazyVector: 95ee3e58937a6052f86b0e32f142388c22fa22c5 + FBReactNativeSpec: 26dd6459299e48cd64eb397c45635e466dba9f45 Folly: 30e7936e1c45c08d884aa59369ed951a8e68cf51 glog: 1f3da668190260b06b429bb211bfbee5cd790c28 - RCTRequired: b153add4da6e7dbc44aebf93f3cf4fcae392ddf1 - RCTTypeSafety: 9aa1b91d7f9310fc6eadc3cf95126ffe818af320 - React: b6a59ef847b2b40bb6e0180a97d0ca716969ac78 - React-Core: 688b451f7d616cc1134ac95295b593d1b5158a04 - React-CoreModules: d04f8494c1a328b69ec11db9d1137d667f916dcb - React-cxxreact: d0f7bcafa196ae410e5300736b424455e7fb7ba7 - React-jsi: cb2cd74d7ccf4cffb071a46833613edc79cdf8f7 - React-jsiexecutor: d5525f9ed5f782fdbacb64b9b01a43a9323d2386 - React-jsinspector: fa0ecc501688c3c4c34f28834a76302233e29dc0 + RCTRequired: e291538a455f5ad1afc2139a4288990be0cadd46 + RCTTypeSafety: 8b6237185765dd9a03a3647807e08864105b1f95 + React: 7b33e15fab929c47ac9c3c94c409258b13cfe452 + React-Core: 9a164d53492e2d8a84e7acf87988253dff09cf93 + React-CoreModules: 9aba468d44532cbc301e1323a62b3d796c69c26d + React-cxxreact: 1eed6bc2a4f8e25910994b5dfca1acf1878b25c7 + React-jsi: 600d8e42510c3254fd2abd702f4b9d3f598d8f52 + React-jsiexecutor: e9698dee4fd43ceb44832baf15d5745f455b0157 + React-jsinspector: f74a62727e5604119abd4a1eda52c0a12144bcd5 react-native-safe-area-context: e200d4433aba6b7e60b52da5f37af11f7a0b0392 - React-RCTActionSheet: 600b4d10e3aea0913b5a92256d2719c0cdd26d76 - React-RCTAnimation: 791a87558389c80908ed06cc5dfc5e7920dfa360 - React-RCTBlob: d89293cc0236d9cb0933d85e430b0bbe81ad1d72 - React-RCTImage: 6b8e8df449eb7c814c99a92d6b52de6fe39dea4e - React-RCTLinking: 121bb231c7503cf9094f4d8461b96a130fabf4a5 - React-RCTNetwork: fb353640aafcee84ca8b78957297bd395f065c9a - React-RCTSettings: 8db258ea2a5efee381fcf7a6d5044e2f8b68b640 - React-RCTText: 9ccc88273e9a3aacff5094d2175a605efa854dbe - React-RCTVibration: a49a1f42bf8f5acf1c3e297097517c6b3af377ad - ReactCommon: 198c7c8d3591f975e5431bec1b0b3b581aa1c5dd + React-RCTActionSheet: af8f28dd82fec89b8fe29637b8c779829e016a88 + React-RCTAnimation: 0d21fff7c20fb8ee41de5f2ebb63221127febd96 + React-RCTBlob: 9496bd93130b22069bfbc5d35e98653dae7c35c6 + React-RCTImage: a220d154ab3b92bc8a3d040651a21a047c5876b7 + React-RCTLinking: 07b694640ae4a43e25c0e3e54713345f9ef1a706 + React-RCTNetwork: 043479410782020c2081498b5766db136aea6fe9 + React-RCTSettings: 826bed85c8887cec143f561a27bb3044f28fbde4 + React-RCTText: 239e040f401505001327a109f9188a4e6dad1bd2 + React-RCTVibration: 072c3b427dd29e730c2ee5bfc509cf5054741a50 + ReactCommon: 3585806280c51d5c2c0d3aa5a99014c3badb629d RNCMaskedView: 76c40a1d41c3e2535df09246a2b5487f04de0814 - RNGestureHandler: dde546180bf24af0b5f737c8ad04b6f3fa51609a - RNReanimated: 031fe8d9ea93c2bd689a40f05320ef9d96f74d7f - RNScreens: 03bf608b92ac0acf323f47d8f5b63a8f829340c8 + RNGestureHandler: 8f09cd560f8d533eb36da5a6c5a843af9f056b38 + RNReanimated: 4e102df74a9674fa943e05f97f3362b6e44d0b48 + RNScreens: b5c0e1b2b04512919e78bd3898e144a157ce2363 RNSVG: 7e16ddfc6e00d5aa69c9eb83e699bcce5dcb85d4 - Yoga: f2a7cd4280bfe2cca5a7aed98ba0eb3d1310f18b + Yoga: 50fb6eb13d2152e7363293ff603385db380815b1 -PODFILE CHECKSUM: f644ecdb4b98c05b6bb6980e91b73758f8103316 +PODFILE CHECKSUM: 10910e3f289a2d6ebe0aa47261189049c0c51778 COCOAPODS: 1.8.4 diff --git a/example/package.json b/example/package.json index 614e38b..7079988 100644 --- a/example/package.json +++ b/example/package.json @@ -9,17 +9,18 @@ "start": "react-native start" }, "dependencies": { + "@gorhom/showcase-template": "^0.2.2", "@react-native-community/masked-view": "^0.1.7", "@react-navigation/bottom-tabs": "^5.2.5", - "@react-navigation/native": "^5.0.9", - "@react-navigation/stack": "^5.1.1", - "react": "16.9.0", - "react-native": "0.61.5", - "react-native-gesture-handler": "^1.6.0", - "react-native-reanimated": "^1.7.0", - "react-native-redash": "^10.0.1", + "@react-navigation/native": "^5.1.4", + "@react-navigation/stack": "^5.2.9", + "react": "16.11.0", + "react-native": "0.62.1", + "react-native-gesture-handler": "^1.6.1", + "react-native-reanimated": "^1.7.1", + "react-native-redash": "^10.1.1", "react-native-safe-area-context": "^0.7.3", - "react-native-screens": "^2.3.0", + "react-native-screens": "^2.4.0", "react-native-svg": "^12.0.3" }, "devDependencies": { @@ -27,7 +28,7 @@ "@babel/runtime": "^7.8.7", "@types/react": "^16.9.23", "@types/react-native": "^0.61.17", - "metro-react-native-babel-preset": "^0.58.0", + "metro-react-native-babel-preset": "^0.59.0", "rn-snoopy": "^2.0.2", "typescript": "^3.8.3" } From 7dd66660e285ab00a0546813e3a48a1e7a77f374 Mon Sep 17 00:00:00 2001 From: Mo Gorhom Date: Sat, 4 Apr 2020 20:17:41 +0200 Subject: [PATCH 2/2] chore: add @gorhom/showcase-template for example --- example/src/App.tsx | 109 ++---------------- example/src/screens/Bubble.tsx | 108 +++++++++++++++++ .../screens/{DummyScreen.tsx => Dummy.tsx} | 0 example/src/screens/Root.tsx | 39 +++++++ 4 files changed, 155 insertions(+), 101 deletions(-) create mode 100644 example/src/screens/Bubble.tsx rename example/src/screens/{DummyScreen.tsx => Dummy.tsx} (100%) create mode 100644 example/src/screens/Root.tsx diff --git a/example/src/App.tsx b/example/src/App.tsx index 5ae615d..c80a00f 100644 --- a/example/src/App.tsx +++ b/example/src/App.tsx @@ -1,111 +1,18 @@ import React from 'react'; import { NavigationContainer } from '@react-navigation/native'; -import { createBottomTabNavigator } from '@react-navigation/bottom-tabs'; -import AnimatedTabBar, { TabsConfigsType } from '@gorhom/animated-tabbar'; -import DummyScreen from './screens/DummyScreen'; -import HomeSVG from './svg/HomeSVG'; -import LikeSVG from './svg/LikeSVG'; -import SearchSVG from './svg/SearchSVG'; -import ProfileSVG from './svg/ProfileSVG'; +import { createStackNavigator } from '@react-navigation/stack'; +import RootScreen from './screens/Root'; +import BubbleScreen from './screens/Bubble'; -const tabs: TabsConfigsType = { - Home: { - labelStyle: { - color: '#5B37B7', - }, - icon: { - component: HomeSVG, - activeColor: 'rgba(91,55,183,1)', - inactiveColor: 'rgba(0,0,0,1)', - }, - background: { - activeColor: 'rgba(223,215,243,1)', - inactiveColor: 'rgba(223,215,243,0)', - }, - }, - Likes: { - labelStyle: { - color: '#C9379D', - }, - icon: { - component: LikeSVG, - activeColor: 'rgba(201,55,157,1)', - inactiveColor: 'rgba(0,0,0,1)', - }, - background: { - activeColor: 'rgba(247,215,243,1)', - inactiveColor: 'rgba(247,215,243,0)', - }, - }, - Search: { - labelStyle: { - color: '#E6A919', - }, - icon: { - component: SearchSVG, - activeColor: 'rgba(230,169,25,1)', - inactiveColor: 'rgba(0,0,0,1)', - }, - background: { - activeColor: 'rgba(251,239,211,1)', - inactiveColor: 'rgba(251,239,211,0)', - }, - }, - Profile: { - labelStyle: { - color: '#1194AA', - }, - icon: { - component: ProfileSVG, - activeColor: 'rgba(17,148,170,1)', - inactiveColor: 'rgba(0,0,0,1)', - }, - background: { - activeColor: 'rgba(207,235,239,1)', - inactiveColor: 'rgba(207,235,239,0)', - }, - }, -}; - -const Tab = createBottomTabNavigator(); +const Stack = createStackNavigator(); export default function App() { return ( - ( - - )} - > - - - - - + + + + ); } diff --git a/example/src/screens/Bubble.tsx b/example/src/screens/Bubble.tsx new file mode 100644 index 0000000..e0c3512 --- /dev/null +++ b/example/src/screens/Bubble.tsx @@ -0,0 +1,108 @@ +import React from 'react'; +import { createBottomTabNavigator } from '@react-navigation/bottom-tabs'; +import AnimatedTabBar, { TabsConfigsType } from '@gorhom/animated-tabbar'; +import DummyScreen from './Dummy'; +import HomeSVG from '../svg/HomeSVG'; +import LikeSVG from '../svg/LikeSVG'; +import SearchSVG from '../svg/SearchSVG'; +import ProfileSVG from '../svg/ProfileSVG'; + +const Tab = createBottomTabNavigator(); + +const tabs: TabsConfigsType = { + Home: { + labelStyle: { + color: '#5B37B7', + }, + icon: { + component: HomeSVG, + activeColor: 'rgba(91,55,183,1)', + inactiveColor: 'rgba(0,0,0,1)', + }, + background: { + activeColor: 'rgba(223,215,243,1)', + inactiveColor: 'rgba(223,215,243,0)', + }, + }, + Likes: { + labelStyle: { + color: '#C9379D', + }, + icon: { + component: LikeSVG, + activeColor: 'rgba(201,55,157,1)', + inactiveColor: 'rgba(0,0,0,1)', + }, + background: { + activeColor: 'rgba(247,215,243,1)', + inactiveColor: 'rgba(247,215,243,0)', + }, + }, + Search: { + labelStyle: { + color: '#E6A919', + }, + icon: { + component: SearchSVG, + activeColor: 'rgba(230,169,25,1)', + inactiveColor: 'rgba(0,0,0,1)', + }, + background: { + activeColor: 'rgba(251,239,211,1)', + inactiveColor: 'rgba(251,239,211,0)', + }, + }, + Profile: { + labelStyle: { + color: '#1194AA', + }, + icon: { + component: ProfileSVG, + activeColor: 'rgba(17,148,170,1)', + inactiveColor: 'rgba(0,0,0,1)', + }, + background: { + activeColor: 'rgba(207,235,239,1)', + inactiveColor: 'rgba(207,235,239,0)', + }, + }, +}; + +const BubbleScreen = () => { + return ( + } + > + + + + + + ); +}; + +export default BubbleScreen; diff --git a/example/src/screens/DummyScreen.tsx b/example/src/screens/Dummy.tsx similarity index 100% rename from example/src/screens/DummyScreen.tsx rename to example/src/screens/Dummy.tsx diff --git a/example/src/screens/Root.tsx b/example/src/screens/Root.tsx new file mode 100644 index 0000000..15d6a07 --- /dev/null +++ b/example/src/screens/Root.tsx @@ -0,0 +1,39 @@ +import React from 'react'; +import { useNavigation } from '@react-navigation/native'; +import Showcase from '@gorhom/showcase-template'; +import { version, description } from '../../../package.json'; + +const examples = [ + { + name: 'Bubble', + slug: 'Bubble', + }, +]; + +const RootScreen = () => { + // hooks + const { navigate } = useNavigation(); + + // callbacks + const handleOnExamplePress = (slug: string) => { + navigate(slug); + }; + + // renders + return ( + + ); +}; + +export default RootScreen;