Merge pull request #62 from lammertw/value-text-colors

Add mapping for valueTextColors
hongyin163 · Jan 9, 2017 · 8c7d516 · 8c7d516
2 parents 415f317 + c550db6
commit 8c7d516
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 0 deletions.
diff --git a/android/src/main/java/cn/mandata/react_native_mpchart/MPBarChartManager.java b/android/src/main/java/cn/mandata/react_native_mpchart/MPBarChartManager.java
@@ -67,6 +67,15 @@ public void setData(BarChart chart,ReadableMap rm){
             entries.add(be);*/
             BarDataSet dataSet=new BarDataSet(entries,label);
             ReadableMap config= map.getMap("config");
+
+            if(config.hasKey("valueTextColors")){
+                ReadableArray colorsArray = config.getArray("valueTextColors");
+                ArrayList<Integer> colors = new ArrayList<>();
+                for(int c = 0; c < colorsArray.size(); c++){
+                    colors.add(Color.parseColor(colorsArray.getString(c)));
+                }
+                dataSet.setValueTextColors(colors);
+            }else
             if(config.hasKey("valueTextColor")) dataSet.setValueTextColor(Color.parseColor(config.getString("valueTextColor")));
 
             // Text Size for bar value

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
@@ -82,6 +82,14 @@ public void setData(LineChart chart,ReadableMap rm){
             if(config.hasKey("drawCircles")) dataSet.setDrawCircles(config.getBoolean("drawCircles"));
             if(config.hasKey("circleSize")) dataSet.setCircleSize((float) config.getDouble("circleSize"));
             if(config.hasKey("lineWidth")) dataSet.setLineWidth((float) config.getDouble("lineWidth"));
+            if(config.hasKey("valueTextColors")){
+                ReadableArray colorsArray = config.getArray("valueTextColors");
+                ArrayList<Integer> colors = new ArrayList<>();
+                for(int c = 0; c < colorsArray.size(); c++){
+                    colors.add(Color.parseColor(colorsArray.getString(c)));
+                }
+                dataSet.setValueTextColors(colors);
+            }else
             if(config.hasKey("drawValues")) dataSet.setDrawValues(config.getBoolean("drawValues"));
             if(config.hasKey("valueTextColor")) dataSet.setValueTextColor(Color.parseColor(config.getString("valueTextColor")));
 

diff --git a/android/src/main/java/cn/mandata/react_native_mpchart/MPPieChartManager.java b/android/src/main/java/cn/mandata/react_native_mpchart/MPPieChartManager.java
@@ -126,6 +126,14 @@ public void setData(PieChart chart,ReadableMap rm){
                 dataSet.setColors(colors);
             }
             if(config.hasKey("drawValues")) dataSet.setDrawValues(config.getBoolean("drawValues"));
+            if(config.hasKey("valueTextColors")){
+                ReadableArray colorsArray = config.getArray("valueTextColors");
+                ArrayList<Integer> colors = new ArrayList<>();
+                for(int c = 0; c < colorsArray.size(); c++){
+                    colors.add(Color.parseColor(colorsArray.getString(c)));
+                }
+                dataSet.setValueTextColors(colors);
+            }else
             if(config.hasKey("valueTextColor")) dataSet.setValueTextColor(Color.parseColor(config.getString("valueTextColor")));
             dataSet.setSliceSpace(3f);
             pieData.addDataSet(dataSet);