Skip to content

Datasets are not nullable #652

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hannesa2 merged 1 commit into from
Jan 6, 2026
Merged

Datasets are not nullable #652

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions app/src/main/kotlin/info/appdev/chartexample/CubicLineChartActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ class CubicLineChartActivity : DemoBase(), OnSeekBarChangeListener {
}

R.id.actionToggleValues -> {
binding.chart1.lineData.dataSets?.forEach {
binding.chart1.lineData.dataSets.forEach {
it.isDrawValues = !it.isDrawValues
}
binding.chart1.invalidate()
Expand All @@ -159,23 +159,23 @@ class CubicLineChartActivity : DemoBase(), OnSeekBarChangeListener {
}

R.id.actionToggleFilled -> {
binding.chart1.lineData.dataSets?.forEach {
binding.chart1.lineData.dataSets.forEach {
val set = it as LineDataSet
set.isDrawFilledEnabled = !set.isDrawFilledEnabled
}
binding.chart1.invalidate()
}

R.id.actionToggleCircles -> {
binding.chart1.lineData.dataSets?.forEach {
binding.chart1.lineData.dataSets.forEach {
val set = it as LineDataSet
set.isDrawCirclesEnabled = !set.isDrawCirclesEnabled
}
binding.chart1.invalidate()
}

R.id.actionToggleCubic -> {
binding.chart1.lineData.dataSets?.forEach {
binding.chart1.lineData.dataSets.forEach {
val set = it as LineDataSet
set.lineMode = if (set.lineMode == LineDataSet.Mode.CUBIC_BEZIER)
LineDataSet.Mode.LINEAR
Expand All @@ -186,7 +186,7 @@ class CubicLineChartActivity : DemoBase(), OnSeekBarChangeListener {
}

R.id.actionToggleStepped -> {
binding.chart1.lineData.dataSets?.forEach {
binding.chart1.lineData.dataSets.forEach {
val set = it as LineDataSet
set.lineMode = if (set.lineMode == LineDataSet.Mode.STEPPED)
LineDataSet.Mode.LINEAR
Expand All @@ -197,7 +197,7 @@ class CubicLineChartActivity : DemoBase(), OnSeekBarChangeListener {
}

R.id.actionToggleHorizontalCubic -> {
binding.chart1.lineData.dataSets?.forEach {
binding.chart1.lineData.dataSets.forEach {
val set = it as LineDataSet
set.lineMode = if (set.lineMode == LineDataSet.Mode.HORIZONTAL_BEZIER)
LineDataSet.Mode.LINEAR
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/kotlin/info/appdev/chartexample/InvertedLineChartActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ class InvertedLineChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartVa
}

R.id.actionToggleValues -> {
binding.chart1.lineData.dataSets?.forEach {
binding.chart1.lineData.dataSets.forEach {
it.isDrawValues = !it.isDrawValues
}
binding.chart1.invalidate()
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/kotlin/info/appdev/chartexample/LineChartActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ class LineChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSelec
}

R.id.actionToggleValues -> {
binding.chart1.lineData.dataSets?.forEach { set ->
binding.chart1.lineData.dataSets.forEach { set ->
set.isDrawValues = !set.isDrawValues
}
binding.chart1.invalidate()
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/kotlin/info/appdev/chartexample/LineChartTimeActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ class LineChartTimeActivity : DemoBase(), OnSeekBarChangeListener {
}

R.id.actionToggleValues -> {
binding.chart1.lineData.dataSets?.forEach {
binding.chart1.lineData.dataSets.forEach {
it.isDrawValues = !it.isDrawValues
}
binding.chart1.invalidate()
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/kotlin/info/appdev/chartexample/MultiLineChartActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ class MultiLineChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartGestu
}

R.id.actionToggleValues -> {
binding.chart1.lineData.dataSets?.forEach { set ->
binding.chart1.lineData.dataSets.forEach { set ->
set.isDrawValues = !set.isDrawValues
}
binding.chart1.invalidate()
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/kotlin/info/appdev/chartexample/TimeLineActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ class TimeLineActivity : DemoBase() {
withContext(Dispatchers.Default) {
while (menuItemMove!!.isChecked) {
withContext(Dispatchers.Main) {
binding.chart1.lineData.dataSets?.get(0)?.let { set ->
binding.chart1.lineData.dataSets.get(0)?.let { set ->
(set as LineDataSet).entries.moveFirstToLast()
set.notifyDataChanged()
binding.chart1.lineData.notifyDataChanged()
Expand Down
2 changes: 1 addition & 1 deletion chartLib/src/main/kotlin/info/appdev/charting/charts/Chart.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1042,7 +1042,7 @@ abstract class Chart<T : ChartData<out IDataSet<out Entry>>> : ViewGroup, IBaseP
// calculate how many digits are needed
setupDefaultFormatter(value.yMin, value.yMax)

for (set in mData!!.dataSets!!) {
for (set in mData!!.dataSets) {
if (set.needsFormatter() || set.valueFormatter === mDefaultValueFormatter) {
set.valueFormatter = mDefaultValueFormatter
}
Expand Down
2 changes: 1 addition & 1 deletion chartLib/src/main/kotlin/info/appdev/charting/charts/PieChart.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ open class PieChart : PieRadarChartBase<PieData> {
var diff = 0f

for (i in 0..<data.dataSetCount) {
val set = dataSets!![i]
val set = dataSets[i]

for (j in 0..<set.entryCount) {
val drawAngle = calcAngle(abs(set.getEntryForIndex(j)!!.y), yValueSum)
Expand Down
29 changes: 12 additions & 17 deletions chartLib/src/main/kotlin/info/appdev/charting/data/BarData.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class BarData : BarLineScatterCandleBubbleData<IBarDataSet> {
*/
fun groupBars(fromX: Float, groupSpace: Float, barSpace: Float) {
var fromX = fromX
val setCount = dataSets?.size ?: 0
val setCount = dataSets.size
if (setCount <= 1) {
throw RuntimeException("BarData needs to hold at least 2 BarDataSets to allow grouping.")
}
Expand All @@ -50,22 +50,20 @@ class BarData : BarLineScatterCandleBubbleData<IBarDataSet> {
val start = fromX
fromX += groupSpaceWidthHalf

dataSets?.let {
for (set in dataSets) {
fromX += barSpaceHalf
fromX += barWidthHalf
for (set in dataSets) {
fromX += barSpaceHalf
fromX += barWidthHalf

if (i < set.entryCount) {
val entry = set.getEntryForIndex(i)
if (i < set.entryCount) {
val entry = set.getEntryForIndex(i)

if (entry != null) {
entry.x = fromX
}
if (entry != null) {
entry.x = fromX
}

fromX += barWidthHalf
fromX += barSpaceHalf
}

fromX += barWidthHalf
fromX += barSpaceHalf
}
fromX += groupSpaceWidthHalf
val end = fromX
Expand All @@ -85,9 +83,6 @@ class BarData : BarLineScatterCandleBubbleData<IBarDataSet> {
* In case of grouped bars, this method returns the space an individual group of bar needs on the x-axis.
*/
fun getGroupWidth(groupSpace: Float, barSpace: Float): Float {
return if (dataSets == null)
0f
else
dataSets!!.size * (this.barWidth + barSpace) + groupSpace
return dataSets.size * (this.barWidth + barSpace) + groupSpace
}
}
6 changes: 2 additions & 4 deletions chartLib/src/main/kotlin/info/appdev/charting/data/BubbleData.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,8 @@ class BubbleData : BarLineScatterCandleBubbleData<IBubbleDataSet> {
* for all DataSet objects this data object contains, in dp.
*/
fun setHighlightCircleWidth(width: Float) {
if (dataSets != null) {
for (set in dataSets) {
set.highlightCircleWidth = width
}
for (set in dataSets) {
set.highlightCircleWidth = width
}
}
}
Loading
Loading