Merge pull request #63 from consenlabs/master

Add axisDependency for dataSet thanks
hongyin163 · Dec 9, 2016 · fc45036 · fc45036
2 parents 9036190 + 0dace0e
commit fc45036
Show file tree

Hide file tree

Showing 11 changed files with 27 additions and 19 deletions.
diff --git a/BarChart.android.js → BarChart.js b/BarChart.android.js → BarChart.js
diff --git a/CandleStickChart.android.js → CandleStickChart.js b/CandleStickChart.android.js → CandleStickChart.js
diff --git a/CombinedChart.android.js → CombinedChart.js b/CombinedChart.android.js → CombinedChart.js
diff --git a/HorizontalBarChart.android.js → HorizontalBarChart.js b/HorizontalBarChart.android.js → HorizontalBarChart.js
diff --git a/LineChart.android.js → LineChart.js b/LineChart.android.js → LineChart.js
diff --git a/PieChart.android.js → PieChart.js b/PieChart.android.js → PieChart.js
diff --git a/RadarChart.android.js → RadarChart.js b/RadarChart.android.js → RadarChart.js
diff --git a/android/src/main/java/cn/mandata/react_native_mpchart/MPLineChartManager.java b/android/src/main/java/cn/mandata/react_native_mpchart/MPLineChartManager.java
@@ -21,6 +21,7 @@
 import com.github.mikephil.charting.data.LineData;
 import com.github.mikephil.charting.data.LineDataSet;
 import com.github.mikephil.charting.utils.ColorTemplate;
+import com.github.mikephil.charting.components.YAxis.AxisDependency;
 
 import java.util.ArrayList;
 import java.util.Random;
@@ -83,7 +84,7 @@ public void setData(LineChart chart,ReadableMap rm){
             if(config.hasKey("lineWidth")) dataSet.setLineWidth((float) config.getDouble("lineWidth"));
             if(config.hasKey("drawValues")) dataSet.setDrawValues(config.getBoolean("drawValues"));
             if(config.hasKey("valueTextColor")) dataSet.setValueTextColor(Color.parseColor(config.getString("valueTextColor")));
-            
+
             // Text Size for bar value
 
             if(config.hasKey("valueTextSize")) dataSet.setValueTextSize((float)config.getDouble("valueTextSize"));
@@ -122,6 +123,13 @@ public void setData(LineChart chart,ReadableMap rm){
             if (config.hasKey("fillColor")) dataSet.setFillColor(Color.parseColor(config.getString("fillColor")));
             if (config.hasKey("fillAlpha")) dataSet.setFillAlpha((int)(255 * config.getDouble("fillAlpha")));
             if (config.hasKey("bezier")) dataSet.setDrawCubic(config.getBoolean("bezier"));
+            if (config.hasKey("axisDependency")) {
+                AxisDependency axisDependency = AxisDependency.LEFT;
+                if (config.getString("axisDependency").equalsIgnoreCase("RIGHT")) {
+                    axisDependency = AxisDependency.RIGHT;
+                }
+                dataSet.setAxisDependency(axisDependency);
+            }
 
             chartData.addDataSet(dataSet);
         }

diff --git a/index.android.js b/index.android.js
diff --git a/index.js b/index.js
@@ -0,0 +1,17 @@
+import BarChart from './BarChart';
+import HorizontalBarChart from './HorizontalBarChart';
+import LineChart from './LineChart';
+import CandleStickChart from './CandleStickChart';
+import CombinedChart from './CombinedChart';
+import PieChart from './PieChart';
+import RadarChart from './RadarChart';
+
+export {
+  BarChart,
+  HorizontalBarChart,
+  LineChart,
+  CandleStickChart,
+  CombinedChart,
+  PieChart,
+  RadarChart
+}
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "react-native-chart-android",
   "version": "1.0.6",
   "description": "react-native-mpchart provide modules to add chart to android,all charts are come from mpandroidchart library.",
-  "main": "index.android.js",
+  "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },