diff options
| author | Daniel Cohen Gindi <Danielgindi@gmail.com> | 2020-02-09 07:34:02 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-09 07:34:02 +0200 |
| commit | 9347dd1af75971cc6027cdf915df6713f7a80d2c (patch) | |
| tree | de0125eaa5eac0dab014e0a16d514e420c7e6064 | |
| parent | eae977306eeddc9f85fd62bdc82b9c4b7fd2da83 (diff) | |
| parent | 90e523042cfae25c8271b60f2cf68a947c46e018 (diff) | |
| download | MPAndroidChart-9347dd1af75971cc6027cdf915df6713f7a80d2c.tar.gz | |
Merge pull request #4802 from oatrice/fix_crash_solid_color_barchart
fix NPE when use solid color with barchart
2 files changed, 2 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..18975557 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,7 @@ public class BarChartRenderer extends BarLineScatterCandleBubbleRenderer { trans.pointValuesToPixel(buffer.buffer); - final boolean isCustomFill = dataSet.getFills().size() > 0; + final boolean isCustomFill = dataSet.getFills() != null && !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..b42ef128 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,7 @@ public class HorizontalBarChartRenderer extends BarChartRenderer { trans.pointValuesToPixel(buffer.buffer); - final boolean isCustomFill = dataSet.getFills().size() > 0; + final boolean isCustomFill = dataSet.getFills() != null && !dataSet.getFills().isEmpty(); final boolean isSingleColor = dataSet.getColors().size() == 1; final boolean isInverted = mChart.isInverted(dataSet.getAxisDependency()); |