diff options
author | Anirut Teerabut <anirut.t@linecorp.com> | 2020-02-07 17:53:40 +0700 |
---|---|---|
committer | Anirut Teerabut <anirut.t@linecorp.com> | 2020-02-07 17:53:40 +0700 |
commit | cef967fd71ff18b0908ffa21c795faefde3ff120 (patch) | |
tree | a3c03c61124701bc725068e27e2b097aaf655039 | |
parent | eae977306eeddc9f85fd62bdc82b9c4b7fd2da83 (diff) | |
download | MPAndroidChart-cef967fd71ff18b0908ffa21c795faefde3ff120.tar.gz |
fix NPE when use solid color with barchart
2 files changed, 9 insertions, 2 deletions
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/BarChartRenderer.java b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/BarChartRenderer.java index d6ce3898..99a12499 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/BarChartRenderer.java +++ b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/BarChartRenderer.java @@ -144,7 +144,11 @@ public class BarChartRenderer extends BarLineScatterCandleBubbleRenderer { trans.pointValuesToPixel(buffer.buffer); - final boolean isCustomFill = dataSet.getFills().size() > 0; + boolean isCustomFill = false; + if(dataSet.getFills() != null) { + isCustomFill = !dataSet.getFills().isEmpty(); + } + final boolean isSingleColor = dataSet.getColors().size() == 1; final boolean isInverted = mChart.isInverted(dataSet.getAxisDependency()); diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/HorizontalBarChartRenderer.java b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/HorizontalBarChartRenderer.java index f9431702..6ca6ff0e 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/HorizontalBarChartRenderer.java +++ b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/HorizontalBarChartRenderer.java @@ -112,7 +112,10 @@ public class HorizontalBarChartRenderer extends BarChartRenderer { trans.pointValuesToPixel(buffer.buffer); - final boolean isCustomFill = dataSet.getFills().size() > 0; + boolean isCustomFill = false; + if(dataSet.getFills() != null) { + isCustomFill = !dataSet.getFills().isEmpty(); + } final boolean isSingleColor = dataSet.getColors().size() == 1; final boolean isInverted = mChart.isInverted(dataSet.getAxisDependency()); |