Merge pull request #655 from AppDevNext/RenamePropertyWithNoEnabled

hannesa2 · web-flow · commit 85ebb6d146bd · 2026-01-06T18:12:06.000+01:00
Rename isDrawCirclesEnabled to isDrawCircles
diff --git a/app/src/main/kotlin/info/appdev/chartexample/CubicLineChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/CubicLineChartActivity.kt
@@ -105,7 +105,7 @@ class CubicLineChartActivity : DemoBase(), OnSeekBarChangeListener {
             set1.lineMode = LineDataSet.Mode.CUBIC_BEZIER
             set1.cubicIntensity = 0.2f
             set1.isDrawFilledEnabled = true
-            set1.isDrawCirclesEnabled = false
+            set1.isDrawCircles = false
             set1.lineWidth = 1.8f
             set1.circleRadius = 4f
             set1.setCircleColor(Color.WHITE)
@@ -169,7 +169,7 @@ class CubicLineChartActivity : DemoBase(), OnSeekBarChangeListener {
             R.id.actionToggleCircles -> {
                 binding.chart1.lineData.dataSets.forEach {
                     val set = it as LineDataSet
-                    set.isDrawCirclesEnabled = !set.isDrawCirclesEnabled
+                    set.isDrawCircles = !set.isDrawCircles
                 }
                 binding.chart1.invalidate()
             }
diff --git a/app/src/main/kotlin/info/appdev/chartexample/FilledLineActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/FilledLineActivity.kt
@@ -100,7 +100,7 @@ class FilledLineActivity : DemoBase() {
 
             set1.axisDependency = YAxis.AxisDependency.LEFT
             set1.color = Color.rgb(255, 241, 46)
-            set1.isDrawCirclesEnabled = false
+            set1.isDrawCircles = false
             set1.lineWidth = 2f
             set1.circleRadius = 3f
             set1.fillAlpha = 255
@@ -120,7 +120,7 @@ class FilledLineActivity : DemoBase() {
             set2 = LineDataSet(valuesArray2, "DataSet 2")
             set2.axisDependency = YAxis.AxisDependency.LEFT
             set2.color = Color.rgb(255, 241, 46)
-            set2.isDrawCirclesEnabled = false
+            set2.isDrawCircles = false
             set2.lineWidth = 2f
             set2.circleRadius = 3f
             set2.fillAlpha = 255
diff --git a/app/src/main/kotlin/info/appdev/chartexample/GradientActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/GradientActivity.kt
@@ -50,7 +50,7 @@ class GradientActivity : DemoBase() {
 
         val dataSet = LineDataSet(entries, "Linear").apply {
             isDrawValues = false
-            isDrawCirclesEnabled = false
+            isDrawCircles = false
             lineWidth = 2f
 
             isDrawFilledEnabled = true
diff --git a/app/src/main/kotlin/info/appdev/chartexample/InvertedLineChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/InvertedLineChartActivity.kt
@@ -154,7 +154,7 @@ class InvertedLineChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartVa
 
             R.id.actionToggleCircles -> {
                 binding.chart1.data?.dataSets?.forEach { set ->
-                    set.isDrawCirclesEnabled = !set.isDrawCirclesEnabled
+                    set.isDrawCircles = !set.isDrawCircles
                 }
                 binding.chart1.invalidate()
             }
diff --git a/app/src/main/kotlin/info/appdev/chartexample/LineChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/LineChartActivity.kt
@@ -182,7 +182,7 @@ class LineChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSelec
 
             R.id.actionToggleCircles -> {
                 binding.chart1.data?.dataSets?.map { it as LineDataSet }?.forEach { set ->
-                    set.isDrawCirclesEnabled = !set.isDrawCirclesEnabled
+                    set.isDrawCircles = !set.isDrawCircles
                 }
                 binding.chart1.invalidate()
             }
diff --git a/app/src/main/kotlin/info/appdev/chartexample/LineChartDualAxisActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/LineChartDualAxisActivity.kt
@@ -233,7 +233,7 @@ class LineChartDualAxisActivity : DemoBase(), OnSeekBarChangeListener, OnChartVa
 
             R.id.actionToggleCircles -> {
                 binding.chart1.data?.dataSets?.forEach { set ->
-                    set.isDrawCirclesEnabled = !set.isDrawCirclesEnabled
+                    set.isDrawCircles = !set.isDrawCircles
                 }
                 binding.chart1.invalidate()
             }
diff --git a/app/src/main/kotlin/info/appdev/chartexample/LineChartTimeActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/LineChartTimeActivity.kt
@@ -128,7 +128,7 @@ class LineChartTimeActivity : DemoBase(), OnSeekBarChangeListener {
         set1.color = holoBlue
         set1.valueTextColor = holoBlue
         set1.lineWidth = 1.5f
-        set1.isDrawCirclesEnabled = false
+        set1.isDrawCircles = false
         set1.isDrawValues = false
         set1.fillAlpha = 65
         set1.fillColor = holoBlue
@@ -181,7 +181,7 @@ class LineChartTimeActivity : DemoBase(), OnSeekBarChangeListener {
 
             R.id.actionToggleCircles -> {
                 binding.chart1.data?.dataSets?.forEach { set ->
-                    set.isDrawCirclesEnabled = !set.isDrawCirclesEnabled
+                    set.isDrawCircles = !set.isDrawCircles
                 }
                 binding.chart1.invalidate()
             }
diff --git a/app/src/main/kotlin/info/appdev/chartexample/MultiLineChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/MultiLineChartActivity.kt
@@ -165,7 +165,7 @@ class MultiLineChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartGestu
             R.id.actionToggleCircles -> {
                 binding.chart1.data?.dataSets?.forEach { set ->
                     if (set is LineDataSet) {
-                        set.isDrawCirclesEnabled = !set.isDrawCirclesEnabled
+                        set.isDrawCircles = !set.isDrawCircles
                     }
                 }
                 binding.chart1.invalidate()
diff --git a/app/src/main/kotlin/info/appdev/chartexample/PerformanceLineChart.kt b/app/src/main/kotlin/info/appdev/chartexample/PerformanceLineChart.kt
@@ -67,7 +67,7 @@ class PerformanceLineChart : DemoBase(), OnSeekBarChangeListener {
         set1.color = Color.BLACK
         set1.lineWidth = 0.5f
         set1.isDrawValues = false
-        set1.isDrawCirclesEnabled = false
+        set1.isDrawCircles = false
         set1.lineMode = LineDataSet.Mode.LINEAR
         set1.isDrawFilledEnabled = false
 
diff --git a/app/src/main/kotlin/info/appdev/chartexample/SpecificPositionsLineChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/SpecificPositionsLineChartActivity.kt
@@ -152,7 +152,7 @@ class SpecificPositionsLineChartActivity : DemoBase(), OnSeekBarChangeListener,
             R.id.actionToggleCircles -> {
                 binding.chart1.data?.dataSets?.forEach {
                     val set = it as LineDataSet
-                    set.isDrawCirclesEnabled = !set.isDrawCirclesEnabled
+                    set.isDrawCircles = !set.isDrawCircles
                 }
                 binding.chart1.invalidate()
             }
diff --git a/app/src/main/kotlin/info/appdev/chartexample/TimeLineActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/TimeLineActivity.kt
@@ -104,7 +104,7 @@ class TimeLineActivity : DemoBase() {
 
             set1.axisDependency = YAxis.AxisDependency.LEFT
             set1.color = Color.rgb(255, 241, 46)
-            set1.isDrawCirclesEnabled = false
+            set1.isDrawCircles = false
             set1.lineWidth = 2f
             set1.circleRadius = 3f
             set1.fillAlpha = 255
diff --git a/app/src/main/kotlin/info/appdev/chartexample/fragments/SimpleFragment.kt b/app/src/main/kotlin/info/appdev/chartexample/fragments/SimpleFragment.kt
@@ -118,8 +118,8 @@ abstract class SimpleFragment : Fragment() {
         ds1.lineWidth = 2f
         ds2.lineWidth = 2f
 
-        ds1.isDrawCirclesEnabled = false
-        ds2.isDrawCirclesEnabled = false
+        ds1.isDrawCircles = false
+        ds2.isDrawCircles = false
 
         ds1.color = ColorTemplate.VORDIPLOM_COLORS[0]
         ds2.color = ColorTemplate.VORDIPLOM_COLORS[1]
diff --git a/chartLib/src/main/kotlin/info/appdev/charting/data/LineDataSet.kt b/chartLib/src/main/kotlin/info/appdev/charting/data/LineDataSet.kt
@@ -179,7 +179,7 @@ open class LineDataSet(yVals: MutableList<Entry> = mutableListOf(), label: Strin
     override val circleColorCount: Int
         get() = circleColors.size
 
-    override var isDrawCirclesEnabled: Boolean
+    override var isDrawCircles: Boolean
         get() = mDrawCircles
         set(value) {
             mDrawCircles = value
diff --git a/chartLib/src/main/kotlin/info/appdev/charting/interfaces/datasets/ILineDataSet.kt b/chartLib/src/main/kotlin/info/appdev/charting/interfaces/datasets/ILineDataSet.kt
@@ -45,7 +45,7 @@ interface ILineDataSet : ILineRadarDataSet<Entry> {
     /**
      * Returns true if drawing circles for this DataSet is enabled, false if not
      */
-    var isDrawCirclesEnabled: Boolean
+    var isDrawCircles: Boolean
 
     /**
      * Returns the color of the inner circle (the circle-hole).
diff --git a/chartLib/src/main/kotlin/info/appdev/charting/renderer/LineChartRenderer.kt b/chartLib/src/main/kotlin/info/appdev/charting/renderer/LineChartRenderer.kt
@@ -494,7 +494,7 @@ open class LineChartRenderer(
                     // make sure the values do not interfere with the circles
                     var valOffset = (dataSet.circleRadius * 1.75f).toInt()
 
-                    if (!dataSet.isDrawCirclesEnabled)
+                    if (!dataSet.isDrawCircles)
                         valOffset /= 2
 
                     xBounds.set(dataProvider, dataSet)
@@ -583,7 +583,7 @@ open class LineChartRenderer(
         dataSets?.let {
             for (i in it.indices) {
                 val dataSet = dataSets[i]
-                if (!dataSet.isVisible || !dataSet.isDrawCirclesEnabled || dataSet.entryCount == 0) continue
+                if (!dataSet.isVisible || !dataSet.isDrawCircles || dataSet.entryCount == 0) continue
 
                 circlePaintInner.color = dataSet.circleHoleColor
 

Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ class InvertedLineChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartVa`
`154`	`154`
`155`	`155`	`R.id.actionToggleCircles -> {`
`156`	`156`	`binding.chart1.data?.dataSets?.forEach { set ->`
`157`		`- set.isDrawCirclesEnabled = !set.isDrawCirclesEnabled`
	`157`	`+ set.isDrawCircles = !set.isDrawCircles`
`158`	`158`	`}`
`159`	`159`	`binding.chart1.invalidate()`
`160`	`160`	`}`
Original file line number	Diff line number	Diff line change
`@@ -182,7 +182,7 @@ class LineChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSelec`
`182`	`182`
`183`	`183`	`R.id.actionToggleCircles -> {`
`184`	`184`	`binding.chart1.data?.dataSets?.map { it as LineDataSet }?.forEach { set ->`
`185`		`- set.isDrawCirclesEnabled = !set.isDrawCirclesEnabled`
	`185`	`+ set.isDrawCircles = !set.isDrawCircles`
`186`	`186`	`}`
`187`	`187`	`binding.chart1.invalidate()`
`188`	`188`	`}`
Original file line number	Diff line number	Diff line change
`@@ -233,7 +233,7 @@ class LineChartDualAxisActivity : DemoBase(), OnSeekBarChangeListener, OnChartVa`
`233`	`233`
`234`	`234`	`R.id.actionToggleCircles -> {`
`235`	`235`	`binding.chart1.data?.dataSets?.forEach { set ->`
`236`		`- set.isDrawCirclesEnabled = !set.isDrawCirclesEnabled`
	`236`	`+ set.isDrawCircles = !set.isDrawCircles`
`237`	`237`	`}`
`238`	`238`	`binding.chart1.invalidate()`
`239`	`239`	`}`
Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,7 @@ class MultiLineChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartGestu`
`165`	`165`	`R.id.actionToggleCircles -> {`
`166`	`166`	`binding.chart1.data?.dataSets?.forEach { set ->`
`167`	`167`	`if (set is LineDataSet) {`
`168`		`- set.isDrawCirclesEnabled = !set.isDrawCirclesEnabled`
	`168`	`+ set.isDrawCircles = !set.isDrawCircles`
`169`	`169`	`}`
`170`	`170`	`}`
`171`	`171`	`binding.chart1.invalidate()`
Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@ class SpecificPositionsLineChartActivity : DemoBase(), OnSeekBarChangeListener,`
`152`	`152`	`R.id.actionToggleCircles -> {`
`153`	`153`	`binding.chart1.data?.dataSets?.forEach {`
`154`	`154`	`val set = it as LineDataSet`
`155`		`- set.isDrawCirclesEnabled = !set.isDrawCirclesEnabled`
	`155`	`+ set.isDrawCircles = !set.isDrawCircles`
`156`	`156`	`}`
`157`	`157`	`binding.chart1.invalidate()`
`158`	`158`	`}`