Skip to content

Commit b370511

Browse files
committed
update Charts to 3.2.2, update example.
1 parent 51ea552 commit b370511

File tree

15 files changed

+2088
-2197
lines changed

15 files changed

+2088
-2197
lines changed

Example/android/app/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@ android {
126126
}
127127

128128
dependencies {
129+
implementation project(':react-native-gesture-handler')
129130
implementation project(':react-native-charts-wrapper')
130131
implementation fileTree(dir: "libs", include: ["*.jar"])
131132
implementation "com.android.support:appcompat-v7:26.+"

Example/android/app/src/main/java/com/example/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.swmansion.gesturehandler.react.RNGestureHandlerPackage;
67
import com.facebook.react.bridge.ReadableNativeArray;
78
import com.facebook.react.bridge.ReadableNativeMap;
89
import com.github.wuxudong.rncharts.MPAndroidChartPackage;
@@ -27,6 +28,7 @@ public boolean getUseDeveloperSupport() {
2728
protected List<ReactPackage> getPackages() {
2829
return Arrays.<ReactPackage>asList(
2930
new MainReactPackage(),
31+
new RNGestureHandlerPackage(),
3032
new MPAndroidChartPackage()
3133
);
3234
}

Example/android/settings.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
rootProject.name = 'Example'
2+
include ':react-native-gesture-handler'
3+
project(':react-native-gesture-handler').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-gesture-handler/android')
24
include ':react-native-charts-wrapper'
35
project(':react-native-charts-wrapper').projectDir = new File(rootProject.projectDir, '../../android')
46

Example/app/ChartsListScreen.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {
88
Text,
99
} from 'react-native';
1010

11-
import {StackNavigator, SafeAreaView} from 'react-navigation';
11+
import {createStackNavigator, createAppContainer, SafeAreaView} from 'react-navigation';
1212

1313
import AxisLineChartScreen from './AxisLineChartScreen';
1414
import MultipleChartScreen from './MultipleChartScreen';
@@ -200,7 +200,7 @@ MainScreen.navigationOptions = {
200200
title: 'Home',
201201
};
202202

203-
const ChartsExplorer = StackNavigator(
203+
const ChartsExplorer = createStackNavigator(
204204
{
205205
Index: {
206206
screen: MainScreen,
@@ -221,4 +221,4 @@ const ChartsExplorer = StackNavigator(
221221
},
222222
);
223223

224-
export default ChartsExplorer;
224+
export default createAppContainer(ChartsExplorer);

Example/ios/Example.xcodeproj/project.pbxproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -230,6 +230,7 @@
230230
"${BUILT_PRODUCTS_DIR}/Charts/Charts.framework",
231231
"${BUILT_PRODUCTS_DIR}/DoubleConversion/DoubleConversion.framework",
232232
"${BUILT_PRODUCTS_DIR}/Folly/folly.framework",
233+
"${BUILT_PRODUCTS_DIR}/RNGestureHandler/RNGestureHandler.framework",
233234
"${BUILT_PRODUCTS_DIR}/React/React.framework",
234235
"${BUILT_PRODUCTS_DIR}/SwiftyJSON/SwiftyJSON.framework",
235236
"${BUILT_PRODUCTS_DIR}/glog/glog.framework",
@@ -240,6 +241,7 @@
240241
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Charts.framework",
241242
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/DoubleConversion.framework",
242243
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/folly.framework",
244+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RNGestureHandler.framework",
243245
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/React.framework",
244246
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftyJSON.framework",
245247
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/glog.framework",

Example/ios/Podfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ target 'Example' do
2525
pod 'Folly', :podspec => '../node_modules/react-native/third-party-podspecs/Folly.podspec'
2626

2727
pod 'RNCharts', :path => '../../'
28+
pod 'RNGestureHandler', :path => '../node_modules/react-native-gesture-handler'
29+
2830
end
2931

3032
swift4 = ['Charts']
@@ -33,8 +35,8 @@ post_install do |installer|
3335
installer.pods_project.targets.each do |target|
3436
target.build_configurations.each do |config|
3537
if swift4.include?(target.name)
36-
config.build_settings['SWIFT_VERSION'] = '4.1'
38+
config.build_settings['SWIFT_VERSION'] = '4.2'
3739
end
3840
end
3941
end
40-
end
42+
end

Example/package.json

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,14 @@
1010
"postinstall": "sed -i '' 's/#import <RCTAnimation\\/RCTValueAnimatedNode.h>/#import \"RCTValueAnimatedNode.h\"/' ./node_modules/react-native/Libraries/NativeAnimation/RCTNativeAnimatedNodesManager.h"
1111
},
1212
"dependencies": {
13-
"immutability-helper": "2.4.0",
14-
"lodash": "4.17.5",
13+
"immutability-helper": "2.8.1",
14+
"lodash": "4.17.11",
1515
"moment": "^2.22.2",
16-
"react": "^16.4.1",
17-
"react-native": "^0.56.0",
16+
"react": "^16.8.3",
17+
"react-native": "^0.58.6",
1818
"react-native-charts-wrapper": "file:../",
19-
"react-navigation": "^1.0.0-beta.19"
19+
"react-native-gesture-handler": "^1.0.17",
20+
"react-navigation": "3.3.2"
2021
},
2122
"devDependencies": {
2223
"babel-jest": "21.0.2",

0 commit comments

Comments
 (0)