Skip to content

Less Entry nullable #628

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
Dec 30, 2025
Merged

Less Entry nullable #628

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
11 changes: 6 additions & 5 deletions app/src/main/kotlin/info/appdev/chartexample/DynamicalAddingActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,12 +87,13 @@ class DynamicalAddingActivity : DemoBase(), OnChartValueSelectedListener {
val set = data.getDataSetByIndex(0)

if (set != null) {
val e = set.getEntryForXValue((set.entryCount - 1).toFloat(), Float.NaN)
set.getEntryForXValue((set.entryCount - 1).toFloat(), Float.NaN)?.let { entry ->
data.removeEntry(entry, 0)
// or remove by index
// mData.removeEntryByXValue(xIndex, dataSetIndex);
data.notifyDataChanged()
}

data.removeEntry(e, 0)
// or remove by index
// mData.removeEntryByXValue(xIndex, dataSetIndex);
data.notifyDataChanged()
binding.chart1.notifyDataSetChanged()
binding.chart1.invalidate()
}
Expand Down
11 changes: 3 additions & 8 deletions chartLib/src/main/kotlin/info/appdev/charting/data/ChartData.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,10 +423,9 @@ abstract class ChartData<T : IDataSet<out Entry>> : Serializable {
* Removes the given Entry object from the DataSet at the specified index.
*/
@Suppress("UNCHECKED_CAST")
open fun removeEntry(entry: Entry?, dataSetIndex: Int): Boolean {
open fun removeEntry(entry: Entry, dataSetIndex: Int): Boolean {
// entry null, out of bounds

if (entry == null || dataSetIndex >= dataSets!!.size) {
if (dataSetIndex >= dataSets!!.size) {
return false
}

Expand Down Expand Up @@ -464,11 +463,7 @@ abstract class ChartData<T : IDataSet<out Entry>> : Serializable {
* Returns the DataSet that contains the provided Entry, or null, if no
* DataSet contains this Entry.
*/
fun getDataSetForEntry(e: Entry?): T? {
if (e == null) {
return null
}

fun getDataSetForEntry(e: Entry): T? {
for (i in dataSets!!.indices) {
val set = dataSets!![i]

Expand Down
2 changes: 1 addition & 1 deletion chartLib/src/main/kotlin/info/appdev/charting/data/CombinedData.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ class CombinedData : BarLineScatterCandleBubbleData<IBarLineScatterCandleBubbleD
}

@Deprecated("removeEntry(...) not supported for CombinedData")
override fun removeEntry(entry: Entry?, dataSetIndex: Int): Boolean {
override fun removeEntry(entry: Entry, dataSetIndex: Int): Boolean {
Timber.e("removeEntry(...) not supported for CombinedData")
return false
}
Expand Down
Loading