Interface change isDrawIcons

hannesa2 · hannesa2 · commit 23cfac97f8f3 · 2025-12-17T13:17:56.000+01:00
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/data/BaseDataSet.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/data/BaseDataSet.kt
@@ -327,7 +327,7 @@ abstract class BaseDataSet<T : Entry>() : IDataSet<T> {
         mDrawIcons = enabled
     }
 
-    override fun isDrawIconsEnabled(): Boolean {
+    override fun isDrawIcons(): Boolean {
         return mDrawIcons
     }
 
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/datasets/IDataSet.java b/MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/datasets/IDataSet.java
@@ -342,7 +342,7 @@ public interface IDataSet<T extends Entry> {
     /**
      * Returns true if y-icon drawing is enabled, false if not
      */
-    boolean isDrawIconsEnabled();
+    boolean isDrawIcons();
 
     /**
      * Offset of icons drawn on the chart.
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/BarChartRenderer.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/BarChartRenderer.kt
@@ -322,7 +322,7 @@ open class BarChartRenderer(
                             )
                         }
 
-                        if (entry.icon != null && dataSet.isDrawIconsEnabled) {
+                        if (entry.icon != null && dataSet.isDrawIcons) {
                             val icon = entry.icon
 
                             var px = x
@@ -381,7 +381,7 @@ open class BarChartRenderer(
                                 )
                             }
 
-                            if (entry.icon != null && dataSet.isDrawIconsEnabled) {
+                            if (entry.icon != null && dataSet.isDrawIcons) {
                                 val icon = entry.icon
 
                                 var px = x
@@ -467,7 +467,7 @@ open class BarChartRenderer(
                                     )
                                 }
 
-                                if (entry.icon != null && dataSet.isDrawIconsEnabled) {
+                                if (entry.icon != null && dataSet.isDrawIcons) {
                                     val icon = entry.icon
 
                                     icon?.let {
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/BarLineScatterCandleBubbleRenderer.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/BarLineScatterCandleBubbleRenderer.kt
@@ -20,7 +20,7 @@ abstract class BarLineScatterCandleBubbleRenderer(animator: ChartAnimator, viewP
      * Returns true if the DataSet values should be drawn, false if not.
      */
     protected fun shouldDrawValues(set: IDataSet<*>): Boolean {
-        return set.isVisible() && (set.isDrawValues() || set.isDrawIconsEnabled())
+        return set.isVisible() && (set.isDrawValues() || set.isDrawIcons())
     }
 
     /**
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/BubbleChartRenderer.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/BubbleChartRenderer.kt
@@ -153,7 +153,7 @@ open class BubbleChartRenderer(
                             )
                         }
 
-                        if (entry.icon != null && dataSet.isDrawIconsEnabled) {
+                        if (entry.icon != null && dataSet.isDrawIcons) {
                             val icon = entry.icon
 
                             icon?.let {
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/CandleStickChartRenderer.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/CandleStickChartRenderer.kt
@@ -264,7 +264,7 @@ open class CandleStickChartRenderer(
                         )
                     }
 
-                    if (entry.icon != null && dataSet.isDrawIconsEnabled) {
+                    if (entry.icon != null && dataSet.isDrawIcons) {
                         val icon = entry.icon
 
                         icon?.let {
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/HorizontalBarChartRenderer.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/HorizontalBarChartRenderer.kt
@@ -244,7 +244,7 @@ open class HorizontalBarChartRenderer(
                             )
                         }
 
-                        if (entry.icon != null && dataSet.isDrawIconsEnabled) {
+                        if (entry.icon != null && dataSet.isDrawIcons) {
                             val icon = entry.icon
 
                             var px = buffer.buffer[j + 2] + (if (`val` >= 0) posOffset else negOffset)
@@ -319,7 +319,7 @@ open class HorizontalBarChartRenderer(
                                 )
                             }
 
-                            if (entry.icon != null && dataSet.isDrawIconsEnabled) {
+                            if (entry.icon != null && dataSet.isDrawIcons) {
                                 val icon = entry.icon
 
                                 var px = (buffer.buffer[bufferIndex + 2]
@@ -414,7 +414,7 @@ open class HorizontalBarChartRenderer(
                                     drawValue(canvas, formattedValue!!, x, y + halfTextHeight, color)
                                 }
 
-                                if (entry.icon != null && dataSet.isDrawIconsEnabled) {
+                                if (entry.icon != null && dataSet.isDrawIcons) {
                                     val icon = entry.icon
 
                                     icon?.let {
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/LineChartRenderer.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/LineChartRenderer.kt
@@ -539,7 +539,7 @@ open class LineChartRenderer(
                             )
                         }
 
-                        if (entry.icon != null && dataSet.isDrawIconsEnabled) {
+                        if (entry.icon != null && dataSet.isDrawIcons) {
                             val icon = entry.icon
 
                             icon?.let {
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/PieChartRenderer.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/PieChartRenderer.kt
@@ -586,7 +586,7 @@ open class PieChartRenderer(
                         }
                     }
 
-                    if (entry.icon != null && dataSet.isDrawIconsEnabled) {
+                    if (entry.icon != null && dataSet.isDrawIcons) {
                         val icon = entry.icon
 
                         val x = (labelRadius + iconsOffset.y) * sliceXBase + center.x
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/RadarChartRenderer.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/RadarChartRenderer.kt
@@ -169,7 +169,7 @@ open class RadarChartRenderer(
                     )
                 }
 
-                if (entry.icon != null && dataSet.isDrawIconsEnabled) {
+                if (entry.icon != null && dataSet.isDrawIcons) {
                     val icon = entry.icon
 
                     Utils.getPosition(
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/ScatterChartRenderer.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/ScatterChartRenderer.kt
@@ -129,7 +129,7 @@ open class ScatterChartRenderer(@JvmField var dataProvider: ScatterDataProvider,
                         )
                     }
 
-                    if (entry.icon != null && dataSet.isDrawIconsEnabled) {
+                    if (entry.icon != null && dataSet.isDrawIcons) {
                         val icon = entry.icon
 
                         icon?.let {
diff --git a/app/src/main/kotlin/info/appdev/chartexample/BarChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/BarChartActivity.kt
@@ -210,7 +210,7 @@ class BarChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSelect
 
             R.id.actionToggleIcons -> {
                 for (set in chart!!.data!!.dataSets)
-                    set.setDrawIcons(!set.isDrawIconsEnabled())
+                    set.setDrawIcons(!set.isDrawIcons())
 
                 chart!!.invalidate()
             }
diff --git a/app/src/main/kotlin/info/appdev/chartexample/BubbleChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/BubbleChartActivity.kt
@@ -174,7 +174,7 @@ class BubbleChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSel
             }
 
             R.id.actionToggleIcons -> {
-                for (set in chart!!.data!!.dataSets) set.setDrawIcons(!set.isDrawIconsEnabled())
+                for (set in chart!!.data!!.dataSets) set.setDrawIcons(!set.isDrawIcons())
 
                 chart!!.invalidate()
             }
diff --git a/app/src/main/kotlin/info/appdev/chartexample/CandleStickChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/CandleStickChartActivity.kt
@@ -155,7 +155,7 @@ class CandleStickChartActivity : DemoBase(), OnSeekBarChangeListener {
             }
 
             R.id.actionToggleIcons -> {
-                for (set in chart!!.data!!.dataSets) set.setDrawIcons(!set.isDrawIconsEnabled())
+                for (set in chart!!.data!!.dataSets) set.setDrawIcons(!set.isDrawIcons())
 
                 chart!!.invalidate()
             }
diff --git a/app/src/main/kotlin/info/appdev/chartexample/HorizontalBarChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/HorizontalBarChartActivity.kt
@@ -164,7 +164,7 @@ class HorizontalBarChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartV
                     .dataSets
 
                 for (iSet in sets) {
-                    iSet.setDrawIcons(!iSet.isDrawIconsEnabled())
+                    iSet.setDrawIcons(!iSet.isDrawIcons())
                 }
 
                 binding.chart1.invalidate()
diff --git a/app/src/main/kotlin/info/appdev/chartexample/HorizontalBarNegativeChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/HorizontalBarNegativeChartActivity.kt
@@ -169,7 +169,7 @@ class HorizontalBarNegativeChartActivity : DemoBase(), OnSeekBarChangeListener,
 
             R.id.actionToggleIcons -> {
                 chart!!.data!!.dataSets.forEach { iSet ->
-                    iSet.setDrawIcons(!iSet.isDrawIconsEnabled())
+                    iSet.setDrawIcons(!iSet.isDrawIcons())
                 }
 
                 chart!!.invalidate()
diff --git a/app/src/main/kotlin/info/appdev/chartexample/LineChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/LineChartActivity.kt
@@ -162,7 +162,7 @@ class LineChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSelec
 
             R.id.actionToggleIcons -> {
                 binding.chart1.data?.dataSets?.forEach { set ->
-                    set.setDrawIcons(!set.isDrawIconsEnabled)
+                    set.setDrawIcons(!set.isDrawIcons)
                     binding.chart1.invalidate()
                 }
             }
diff --git a/app/src/main/kotlin/info/appdev/chartexample/PieChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/PieChartActivity.kt
@@ -184,7 +184,7 @@ class PieChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSelect
             }
 
             R.id.actionToggleIcons -> {
-                for (set in chart!!.data!!.getDataSets()) set.setDrawIcons(!set.isDrawIconsEnabled())
+                for (set in chart!!.data!!.getDataSets()) set.setDrawIcons(!set.isDrawIcons())
 
                 chart!!.invalidate()
             }
diff --git a/app/src/main/kotlin/info/appdev/chartexample/PieChartRoundedActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/PieChartRoundedActivity.kt
@@ -189,7 +189,7 @@ class PieChartRoundedActivity : DemoBase(), OnSeekBarChangeListener, OnChartValu
             }
 
             R.id.actionToggleIcons -> {
-                for (set in chart!!.data!!.getDataSets()) set.setDrawIcons(!set.isDrawIconsEnabled())
+                for (set in chart!!.data!!.getDataSets()) set.setDrawIcons(!set.isDrawIcons())
 
                 chart!!.invalidate()
             }
diff --git a/app/src/main/kotlin/info/appdev/chartexample/StackedBarActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/StackedBarActivity.kt
@@ -168,7 +168,7 @@ class StackedBarActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSele
 
             R.id.actionToggleIcons -> {
                 chart!!.data!!.dataSets.forEach { set ->
-                    set.setDrawIcons(!set.isDrawIconsEnabled)
+                    set.setDrawIcons(!set.isDrawIcons)
                 }
                 chart!!.invalidate()
             }
diff --git a/app/src/main/kotlin/info/appdev/chartexample/StackedBarActivityNegative.kt b/app/src/main/kotlin/info/appdev/chartexample/StackedBarActivityNegative.kt
@@ -136,7 +136,7 @@ class StackedBarActivityNegative : DemoBase(), OnChartValueSelectedListener {
 
             R.id.actionToggleIcons -> {
                 chart!!.data!!.dataSets.forEach { set ->
-                    set.setDrawIcons(!set.isDrawIconsEnabled)
+                    set.setDrawIcons(!set.isDrawIcons)
                 }
 
                 chart!!.invalidate()
diff --git a/app/src/main/kotlin/info/appdev/chartexample/compose/HorizontalBarComposeActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/compose/HorizontalBarComposeActivity.kt
@@ -388,7 +388,7 @@ class HorizontalBarComposeActivity : DemoBaseCompose() {
         chart?.let {
             val sets = it.data?.dataSets ?: return
             for (iSet in sets) {
-                iSet.setDrawIcons(!iSet.isDrawIconsEnabled)
+                iSet.setDrawIcons(!iSet.isDrawIcons)
             }
             it.invalidate()
         }

Original file line number	Diff line number	Diff line change
`@@ -327,7 +327,7 @@ abstract class BaseDataSet<T : Entry>() : IDataSet<T> {`
`327`	`327`	`mDrawIcons = enabled`
`328`	`328`	`}`
`329`	`329`
`330`		`- override fun isDrawIconsEnabled(): Boolean {`
	`330`	`+ override fun isDrawIcons(): Boolean {`
`331`	`331`	`return mDrawIcons`
`332`	`332`	`}`
`333`	`333`
Original file line number	Diff line number	Diff line change
`@@ -322,7 +322,7 @@ open class BarChartRenderer(`
`322`	`322`	`)`
`323`	`323`	`}`
`324`	`324`
`325`		`- if (entry.icon != null && dataSet.isDrawIconsEnabled) {`
	`325`	`+ if (entry.icon != null && dataSet.isDrawIcons) {`
`326`	`326`	`val icon = entry.icon`
`327`	`327`
`328`	`328`	`var px = x`
`@@ -381,7 +381,7 @@ open class BarChartRenderer(`
`381`	`381`	`)`
`382`	`382`	`}`
`383`	`383`
`384`		`- if (entry.icon != null && dataSet.isDrawIconsEnabled) {`
	`384`	`+ if (entry.icon != null && dataSet.isDrawIcons) {`
`385`	`385`	`val icon = entry.icon`
`386`	`386`
`387`	`387`	`var px = x`
`@@ -467,7 +467,7 @@ open class BarChartRenderer(`
`467`	`467`	`)`
`468`	`468`	`}`
`469`	`469`
`470`		`- if (entry.icon != null && dataSet.isDrawIconsEnabled) {`
	`470`	`+ if (entry.icon != null && dataSet.isDrawIcons) {`
`471`	`471`	`val icon = entry.icon`
`472`	`472`
`473`	`473`	`icon?.let {`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ abstract class BarLineScatterCandleBubbleRenderer(animator: ChartAnimator, viewP`
`20`	`20`	`* Returns true if the DataSet values should be drawn, false if not.`
`21`	`21`	`*/`
`22`	`22`	`protected fun shouldDrawValues(set: IDataSet<*>): Boolean {`
`23`		`- return set.isVisible() && (set.isDrawValues() \|\| set.isDrawIconsEnabled())`
	`23`	`+ return set.isVisible() && (set.isDrawValues() \|\| set.isDrawIcons())`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,7 @@ open class BubbleChartRenderer(`
`153`	`153`	`)`
`154`	`154`	`}`
`155`	`155`
`156`		`- if (entry.icon != null && dataSet.isDrawIconsEnabled) {`
	`156`	`+ if (entry.icon != null && dataSet.isDrawIcons) {`
`157`	`157`	`val icon = entry.icon`
`158`	`158`
`159`	`159`	`icon?.let {`
Original file line number	Diff line number	Diff line change
`@@ -264,7 +264,7 @@ open class CandleStickChartRenderer(`
`264`	`264`	`)`
`265`	`265`	`}`
`266`	`266`
`267`		`- if (entry.icon != null && dataSet.isDrawIconsEnabled) {`
	`267`	`+ if (entry.icon != null && dataSet.isDrawIcons) {`
`268`	`268`	`val icon = entry.icon`
`269`	`269`
`270`	`270`	`icon?.let {`
Original file line number	Diff line number	Diff line change
`@@ -244,7 +244,7 @@ open class HorizontalBarChartRenderer(`
`244`	`244`	`)`
`245`	`245`	`}`
`246`	`246`
`247`		`- if (entry.icon != null && dataSet.isDrawIconsEnabled) {`
	`247`	`+ if (entry.icon != null && dataSet.isDrawIcons) {`
`248`	`248`	`val icon = entry.icon`
`249`	`249`
`250`	`250`	var px = buffer.buffer[j + 2] + (if (`val` >= 0) posOffset else negOffset)
`@@ -319,7 +319,7 @@ open class HorizontalBarChartRenderer(`
`319`	`319`	`)`
`320`	`320`	`}`
`321`	`321`
`322`		`- if (entry.icon != null && dataSet.isDrawIconsEnabled) {`
	`322`	`+ if (entry.icon != null && dataSet.isDrawIcons) {`
`323`	`323`	`val icon = entry.icon`
`324`	`324`
`325`	`325`	`var px = (buffer.buffer[bufferIndex + 2]`
`@@ -414,7 +414,7 @@ open class HorizontalBarChartRenderer(`
`414`	`414`	`drawValue(canvas, formattedValue!!, x, y + halfTextHeight, color)`
`415`	`415`	`}`
`416`	`416`
`417`		`- if (entry.icon != null && dataSet.isDrawIconsEnabled) {`
	`417`	`+ if (entry.icon != null && dataSet.isDrawIcons) {`
`418`	`418`	`val icon = entry.icon`
`419`	`419`
`420`	`420`	`icon?.let {`
Original file line number	Diff line number	Diff line change
`@@ -539,7 +539,7 @@ open class LineChartRenderer(`
`539`	`539`	`)`
`540`	`540`	`}`
`541`	`541`
`542`		`- if (entry.icon != null && dataSet.isDrawIconsEnabled) {`
	`542`	`+ if (entry.icon != null && dataSet.isDrawIcons) {`
`543`	`543`	`val icon = entry.icon`
`544`	`544`
`545`	`545`	`icon?.let {`
Original file line number	Diff line number	Diff line change
`@@ -586,7 +586,7 @@ open class PieChartRenderer(`
`586`	`586`	`}`
`587`	`587`	`}`
`588`	`588`
`589`		`- if (entry.icon != null && dataSet.isDrawIconsEnabled) {`
	`589`	`+ if (entry.icon != null && dataSet.isDrawIcons) {`
`590`	`590`	`val icon = entry.icon`
`591`	`591`
`592`	`592`	`val x = (labelRadius + iconsOffset.y) * sliceXBase + center.x`
Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,7 @@ open class RadarChartRenderer(`
`169`	`169`	`)`
`170`	`170`	`}`
`171`	`171`
`172`		`- if (entry.icon != null && dataSet.isDrawIconsEnabled) {`
	`172`	`+ if (entry.icon != null && dataSet.isDrawIcons) {`
`173`	`173`	`val icon = entry.icon`
`174`	`174`
`175`	`175`	`Utils.getPosition(`