update Charts to 3.2.2, update example.

wuxudong · Mar 4, 2019 · b370511 · b370511
1 parent 51ea552
commit b370511
Show file tree

Hide file tree

Showing 15 changed files with 2,088 additions and 2,197 deletions.
diff --git a/Example/android/app/build.gradle b/Example/android/app/build.gradle
@@ -126,6 +126,7 @@ android {
 }
 
 dependencies {
+    implementation project(':react-native-gesture-handler')
     implementation project(':react-native-charts-wrapper')
     implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation "com.android.support:appcompat-v7:26.+"

diff --git a/Example/android/app/src/main/java/com/example/MainApplication.java b/Example/android/app/src/main/java/com/example/MainApplication.java
@@ -3,6 +3,7 @@
 import android.app.Application;
 
 import com.facebook.react.ReactApplication;
+import com.swmansion.gesturehandler.react.RNGestureHandlerPackage;
 import com.facebook.react.bridge.ReadableNativeArray;
 import com.facebook.react.bridge.ReadableNativeMap;
 import com.github.wuxudong.rncharts.MPAndroidChartPackage;
@@ -27,6 +28,7 @@ public boolean getUseDeveloperSupport() {
         protected List<ReactPackage> getPackages() {
             return Arrays.<ReactPackage>asList(
                     new MainReactPackage(),
+            new RNGestureHandlerPackage(),
                     new MPAndroidChartPackage()
             );
         }

diff --git a/Example/android/settings.gradle b/Example/android/settings.gradle
@@ -1,4 +1,6 @@
 rootProject.name = 'Example'
+include ':react-native-gesture-handler'
+project(':react-native-gesture-handler').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-gesture-handler/android')
 include ':react-native-charts-wrapper'
 project(':react-native-charts-wrapper').projectDir = new File(rootProject.projectDir, '../../android')
 

diff --git a/Example/app/ChartsListScreen.js b/Example/app/ChartsListScreen.js
@@ -8,7 +8,7 @@ import {
   Text,
 } from 'react-native';
 
-import {StackNavigator, SafeAreaView} from 'react-navigation';
+import {createStackNavigator, createAppContainer, SafeAreaView} from 'react-navigation';
 
 import AxisLineChartScreen from './AxisLineChartScreen';
 import MultipleChartScreen from './MultipleChartScreen';
@@ -200,7 +200,7 @@ MainScreen.navigationOptions = {
   title: 'Home',
 };
 
-const ChartsExplorer = StackNavigator(
+const ChartsExplorer = createStackNavigator(
   {
     Index: {
       screen: MainScreen,
@@ -221,4 +221,4 @@ const ChartsExplorer = StackNavigator(
   },
 );
 
-export default ChartsExplorer;
+export default createAppContainer(ChartsExplorer);
diff --git a/Example/ios/Example.xcodeproj/project.pbxproj b/Example/ios/Example.xcodeproj/project.pbxproj
@@ -230,6 +230,7 @@
 				"${BUILT_PRODUCTS_DIR}/Charts/Charts.framework",
 				"${BUILT_PRODUCTS_DIR}/DoubleConversion/DoubleConversion.framework",
 				"${BUILT_PRODUCTS_DIR}/Folly/folly.framework",
+				"${BUILT_PRODUCTS_DIR}/RNGestureHandler/RNGestureHandler.framework",
 				"${BUILT_PRODUCTS_DIR}/React/React.framework",
 				"${BUILT_PRODUCTS_DIR}/SwiftyJSON/SwiftyJSON.framework",
 				"${BUILT_PRODUCTS_DIR}/glog/glog.framework",
@@ -240,6 +241,7 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Charts.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/DoubleConversion.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/folly.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RNGestureHandler.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/React.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftyJSON.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/glog.framework",

diff --git a/Example/ios/Podfile b/Example/ios/Podfile
@@ -25,6 +25,8 @@ target 'Example' do
     pod 'Folly', :podspec => '../node_modules/react-native/third-party-podspecs/Folly.podspec'
 
     pod 'RNCharts', :path => '../../'
+    pod 'RNGestureHandler', :path => '../node_modules/react-native-gesture-handler'
+
 end
 
 swift4 = ['Charts']
@@ -33,8 +35,8 @@ post_install do |installer|
   installer.pods_project.targets.each do |target|
     target.build_configurations.each do |config|
       if swift4.include?(target.name)
-        config.build_settings['SWIFT_VERSION'] = '4.1'
+        config.build_settings['SWIFT_VERSION'] = '4.2'
       end
     end
   end
-end
+end
diff --git a/Example/package.json b/Example/package.json
@@ -10,13 +10,14 @@
     "postinstall": "sed -i '' 's/#import <RCTAnimation\\/RCTValueAnimatedNode.h>/#import \"RCTValueAnimatedNode.h\"/' ./node_modules/react-native/Libraries/NativeAnimation/RCTNativeAnimatedNodesManager.h"
   },
   "dependencies": {
-    "immutability-helper": "2.4.0",
-    "lodash": "4.17.5",
+    "immutability-helper": "2.8.1",
+    "lodash": "4.17.11",
     "moment": "^2.22.2",
-    "react": "^16.4.1",
-    "react-native": "^0.56.0",
+    "react": "^16.8.3",
+    "react-native": "^0.58.6",
     "react-native-charts-wrapper": "file:../",
-    "react-navigation": "^1.0.0-beta.19"
+    "react-native-gesture-handler": "^1.0.17",
+    "react-navigation": "3.3.2"
   },
   "devDependencies": {
     "babel-jest": "21.0.2",