Return not in same line

hannesa2 · hannesa2 · commit a954c50fad6b · 2025-12-26T11:44:04.000+01:00
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/charts/BarChart.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/charts/BarChart.kt
@@ -110,7 +110,8 @@ open class BarChart : BarLineChartBase<BarData>, BarDataProvider {
         } else {
             highlighter?.let {
                 val h = it.getHighlight(x, y)
-                if (h == null || !isHighlightFullBarEnabled) return h
+                if (h == null || !isHighlightFullBarEnabled)
+                    return h
 
                 // For isHighlightFullBarEnabled, remove stackIndex
                 return Highlight(
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/charts/PieChart.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/charts/PieChart.kt
@@ -150,7 +150,8 @@ class PieChart : PieRadarChartBase<PieData> {
     override fun onDraw(canvas: Canvas) {
         super.onDraw(canvas)
 
-        if (mData == null) return
+        if (mData == null)
+            return
 
         mRenderer?.drawData(canvas)
 
@@ -316,7 +317,8 @@ class PieChart : PieRadarChartBase<PieData> {
      * Checks if the given index is set to be highlighted.
      */
     fun needsHighlight(index: Int): Boolean {
-        if (!valuesToHighlight()) return false
+        if (!valuesToHighlight())
+            return false
 
         // check if the xvalue for the given dataset needs highlight
         highlighted?.let {
@@ -347,7 +349,8 @@ class PieChart : PieRadarChartBase<PieData> {
         val a = Utils.getNormalizedAngle(angle - rotationAngle)
 
         for (i in absoluteAngles.indices) {
-            if (this.absoluteAngles[i] > a) return i
+            if (this.absoluteAngles[i] > a)
+                return i
         }
 
         return -1 // return -1 if no index found
@@ -360,7 +363,8 @@ class PieChart : PieRadarChartBase<PieData> {
         val dataSets = mData?.dataSets
 
         for (i in dataSets!!.indices) {
-            if (dataSets[i].getEntryForXValue(xIndex.toFloat(), Float.NaN) != null) return i
+            if (dataSets[i].getEntryForXValue(xIndex.toFloat(), Float.NaN) != null)
+                return i
         }
 
         return -1
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/charts/PieRadarChartBase.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/charts/PieRadarChartBase.kt
@@ -104,7 +104,8 @@ abstract class PieRadarChartBase<T : ChartData<out IDataSet<out Entry>>>
     }
 
     override fun notifyDataSetChanged() {
-        if (mData == null) return
+        if (mData == null)
+            return
 
         calcMinMax()
 
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/charts/RadarChart.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/charts/RadarChart.kt
@@ -133,7 +133,8 @@ class RadarChart : PieRadarChartBase<RadarData> {
     override fun onDraw(canvas: Canvas) {
         super.onDraw(canvas)
 
-        if (mData == null) return
+        if (mData == null)
+            return
 
         //        if (mYAxis.isEnabled())
 //            mYAxisRenderer.computeAxis(mYAxis.mAxisMinimum, mYAxis.mAxisMaximum, mYAxis.isInverted());
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/components/AxisBase.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/components/AxisBase.kt
@@ -506,8 +506,10 @@ abstract class AxisBase : ComponentBase() {
     }
 
     fun getFormattedLabel(index: Int): String? {
-        if (index < 0 || index >= mEntries.size) return ""
-        else return this.valueFormatter!!.getFormattedValue(mEntries[index], this)
+        return if (index < 0 || index >= mEntries.size)
+            ""
+        else
+            this.valueFormatter!!.getFormattedValue(mEntries[index], this)
     }
 
     var valueFormatter: IAxisValueFormatter?
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/components/YAxis.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/components/YAxis.kt
@@ -267,8 +267,10 @@ class YAxis : AxisBase {
      * Returns true if this axis needs horizontal offset, false if no offset is needed.
      */
     fun needsOffset(): Boolean {
-        if (isEnabled && isDrawLabelsEnabled && this.labelPosition == YAxisLabelPosition.OUTSIDE_CHART) return true
-        else return false
+        return if (isEnabled && isDrawLabelsEnabled && this.labelPosition == YAxisLabelPosition.OUTSIDE_CHART)
+            true
+        else
+            false
     }
 
 
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/data/BarEntry.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/data/BarEntry.kt
@@ -159,7 +159,8 @@ open class BarEntry : Entry {
     }
 
     fun getSumBelow(stackIndex: Int): Float {
-        if (this.yVals == null) return 0f
+        if (this.yVals == null)
+            return 0f
 
         var remainder = 0f
         var index = yVals!!.size - 1
@@ -194,7 +195,8 @@ open class BarEntry : Entry {
     protected fun calcRanges() {
         val values = this.yVals
 
-        if (values == null || values.isEmpty()) return
+        if (values == null || values.isEmpty())
+            return
 
         this.ranges = arrayOf()
 
@@ -219,7 +221,8 @@ open class BarEntry : Entry {
          * Calculates the sum across all values of the given stack.
          */
         private fun calcSum(vals: FloatArray?): Float {
-            if (vals == null) return 0f
+            if (vals == null)
+                return 0f
 
             var sum = 0f
 
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
@@ -313,7 +313,8 @@ abstract class BaseDataSet<T : Entry>() : IDataSet<T> {
 
     override fun getIndexInEntries(xIndex: Int): Int {
         for (i in 0..<entryCount) {
-            if (xIndex.toFloat() == getEntryForIndex(i)!!.x) return i
+            if (xIndex.toFloat() == getEntryForIndex(i)!!.x)
+                return i
         }
 
         return -1
@@ -345,9 +346,9 @@ abstract class BaseDataSet<T : Entry>() : IDataSet<T> {
 
     override fun contains(entry: T): Boolean {
         for (i in 0..<entryCount) {
-            if (getEntryForIndex(i) == entry) return true
+            if (getEntryForIndex(i) == entry)
+                return true
         }
-
         return false
     }
 
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/data/CombinedData.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/data/CombinedData.kt
@@ -138,11 +138,13 @@ class CombinedData : BarLineScatterCandleBubbleData<IBarLineScatterCandleBubbleD
      * @return the entry that is highlighted
      */
     override fun getEntryForHighlight(highlight: Highlight): Entry? {
-        if (highlight.dataIndex >= this.allData.size) return null
+        if (highlight.dataIndex >= this.allData.size)
+            return null
 
         val data: ChartData<*> = getDataByIndex(highlight.dataIndex)
 
-        if (highlight.dataSetIndex >= data.dataSetCount) return null
+        if (highlight.dataSetIndex >= data.dataSetCount)
+            return null
 
         // The value of the highlighted entry could be NaN -
         //   if we are not interested in highlighting a specific value.
@@ -162,11 +164,13 @@ class CombinedData : BarLineScatterCandleBubbleData<IBarLineScatterCandleBubbleD
      * @return dataset related to highlight
      */
     fun getDataSetByHighlight(highlight: Highlight): IBarLineScatterCandleBubbleDataSet<out Entry>? {
-        if (highlight.dataIndex >= this.allData.size) return null
+        if (highlight.dataIndex >= this.allData.size)
+            return null
 
         val data = getDataByIndex(highlight.dataIndex)
 
-        if (highlight.dataSetIndex >= data.dataSetCount) return null
+        if (highlight.dataSetIndex >= data.dataSetCount)
+            return null
 
         return data.dataSets!![highlight.dataSetIndex] as IBarLineScatterCandleBubbleDataSet<out Entry>?
     }
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/data/DataSet.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/data/DataSet.kt
@@ -213,7 +213,8 @@ abstract class DataSet<T : Entry>(
     }
 
     override fun removeEntry(entry: T): Boolean {
-        if (mEntries == null) return false
+        if (mEntries == null)
+            return false
 
         // remove the entry
         val removed = mEntries!!.remove(entry)
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/data/Entry.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/data/Entry.kt
@@ -81,13 +81,17 @@ open class Entry : BaseEntry, Parcelable, Serializable {
      * it's done by the "equals" method.
      */
     fun equalTo(e: Entry?): Boolean {
-        if (e == null) return false
+        if (e == null)
+            return false
 
-        if (e.data !== this.data) return false
+        if (e.data !== this.data)
+            return false
 
-        if (abs((e.x - this.x).toDouble()) > Utils.FLOAT_EPSILON) return false
+        if (abs((e.x - this.x).toDouble()) > Utils.FLOAT_EPSILON)
+            return false
 
-        if (abs((e.y - this.y).toDouble()) > Utils.FLOAT_EPSILON) return false
+        if (abs((e.y - this.y).toDouble()) > Utils.FLOAT_EPSILON)
+            return false
 
         return true
     }
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/data/filter/ApproximatorN.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/data/filter/ApproximatorN.kt
@@ -12,7 +12,8 @@ class ApproximatorN {
         val pointCount = points.size / 2
 
         // if a shape has 2 or less points it cannot be reduced
-        if (resultCount <= 2 || resultCount >= pointCount) return points
+        if (resultCount <= 2 || resultCount >= pointCount)
+            return points
 
         val keep = BooleanArray(pointCount)
 
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/highlight/BarHighlighter.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/highlight/BarHighlighter.kt
@@ -77,8 +77,10 @@ open class BarHighlighter(barDataProvider: BarDataProvider) : ChartHighlighter<B
         var stackIndex = 0
 
         for (range in ranges) {
-            if (range.contains(value)) return stackIndex
-            else stackIndex++
+            if (range.contains(value))
+                return stackIndex
+            else
+                stackIndex++
         }
 
         val length = max(ranges.size - 1, 0)
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/listener/BarLineChartTouchListener.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/listener/BarLineChartTouchListener.kt
@@ -114,7 +114,8 @@ class BarLineChartTouchListener(
             gestureDetector?.onTouchEvent(event)
         }
 
-        if (!chart.isDragEnabled && (!chart.isScaleXEnabled && !chart.isScaleYEnabled)) return true
+        if (!chart.isDragEnabled && (!chart.isScaleXEnabled && !chart.isScaleYEnabled))
+            return true
 
         // Handle touch events here...
         when (event.action and MotionEvent.ACTION_MASK) {
@@ -553,7 +554,8 @@ class BarLineChartTouchListener(
     }
 
     fun computeScroll() {
-        if (decelerationVelocity.x == 0f && decelerationVelocity.y == 0f) return  // There's no deceleration in progress
+        if (decelerationVelocity.x == 0f && decelerationVelocity.y == 0f)
+            return  // There's no deceleration in progress
 
 
         val currentTime = AnimationUtils.currentAnimationTimeMillis()
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
@@ -45,7 +45,8 @@ open class BubbleChartRenderer(
     }
 
     protected fun drawDataSet(canvas: Canvas, dataSet: IBubbleDataSet) {
-        if (dataSet.entryCount < 1) return
+        if (dataSet.entryCount < 1)
+            return
 
         val trans = dataProvider.getTransformer(dataSet.axisDependency)
 
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/LegendRenderer.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/LegendRenderer.kt
@@ -198,7 +198,8 @@ open class LegendRenderer(
     protected var legendFontMetrics: Paint.FontMetrics = Paint.FontMetrics()
 
     fun renderLegend(canvas: Canvas) {
-        if (!legend.isEnabled) return
+        if (!legend.isEnabled)
+            return
 
         val tf = legend.typeface
 
@@ -437,7 +438,8 @@ open class LegendRenderer(
         entry: LegendEntry,
         legend: Legend
     ) {
-        if (entry.formColor == ColorTemplate.COLOR_SKIP || entry.formColor == ColorTemplate.COLOR_NONE || entry.formColor == 0) return
+        if (entry.formColor == ColorTemplate.COLOR_SKIP || entry.formColor == ColorTemplate.COLOR_NONE || entry.formColor == 0)
+            return
 
         canvas.withSave {
 
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
@@ -180,7 +180,8 @@ open class LineChartRenderer(
             var next = cur
             var nextIndex = -1
 
-            if (cur == null) return
+            if (cur == null)
+                return
 
             // let the spline start
             cubicPath.moveTo(cur.x, cur.y * phaseY)
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
@@ -156,7 +156,8 @@ open class PieChartRenderer(
      * Calculates the sliceSpace to use based on visible values and their size compared to the set sliceSpace.
      */
     protected fun getSliceSpace(dataSet: IPieDataSet): Float {
-        if (!dataSet.isAutomaticallyDisableSliceSpacingEnabled) return dataSet.sliceSpace
+        if (!dataSet.isAutomaticallyDisableSliceSpacingEnabled)
+            return dataSet.sliceSpace
 
         val spaceSizeRatio = dataSet.sliceSpace / viewPortHandler.smallestContentExtension
         val minValueRatio = dataSet.yMin / chart.getData()!!.yValueSum * 2
@@ -739,7 +740,8 @@ open class PieChartRenderer(
                 */
 
         val drawInnerArc = chart.isDrawHoleEnabled && !chart.isDrawSlicesUnderHoleEnabled
-        if (drawInnerArc && chart.isDrawRoundedSlicesEnabled) return
+        if (drawInnerArc && chart.isDrawRoundedSlicesEnabled)
+            return
 
         val phaseX = animator.phaseX
         val phaseY = animator.phaseY
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/XAxisRenderer.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/XAxisRenderer.kt
@@ -228,7 +228,8 @@ open class XAxisRenderer(
     protected open var mRenderGridLinesPath: Path = Path()
     protected open var mRenderGridLinesBuffer: FloatArray = FloatArray(2)
     override fun renderGridLines(canvas: Canvas) {
-        if (!xAxis.isDrawGridLinesEnabled || !xAxis.isEnabled) return
+        if (!xAxis.isDrawGridLinesEnabled || !xAxis.isEnabled)
+            return
 
         canvas.withClip(gridClippingRect!!) {
             if (axis.isShowSpecificPositions) {
@@ -341,7 +342,8 @@ open class XAxisRenderer(
     override fun renderLimitLines(canvas: Canvas) {
         val limitLines = xAxis.limitLines
 
-        if (limitLines.isEmpty()) return
+        if (limitLines.isEmpty())
+            return
 
         val position = mRenderLimitLinesBuffer
         position[0] = 0f
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/XAxisRendererHorizontalBarChart.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/XAxisRendererHorizontalBarChart.kt
@@ -75,7 +75,8 @@ open class XAxisRendererHorizontalBarChart(
     }
 
     override fun renderAxisLabels(canvas: Canvas) {
-        if (!xAxis.isEnabled || !xAxis.isDrawLabelsEnabled) return
+        if (!xAxis.isEnabled || !xAxis.isDrawLabelsEnabled)
+            return
 
         val xOffset = xAxis.xOffset
 
@@ -174,7 +175,8 @@ open class XAxisRendererHorizontalBarChart(
     }
 
     override fun renderAxisLine(canvas: Canvas) {
-        if (!xAxis.isDrawAxisLineEnabled || !xAxis.isEnabled) return
+        if (!xAxis.isDrawAxisLineEnabled || !xAxis.isEnabled)
+            return
 
         paintAxisLine.color = xAxis.axisLineColor
         paintAxisLine.strokeWidth = xAxis.axisLineWidth
@@ -205,7 +207,8 @@ open class XAxisRendererHorizontalBarChart(
     override fun renderLimitLines(canvas: Canvas) {
         val limitLines = xAxis.limitLines
 
-        if (limitLines.isEmpty()) return
+        if (limitLines.isEmpty())
+            return
 
         val pts = mRenderLimitLinesBuffer
         pts[0] = 0f
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/YAxisRenderer.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/YAxisRenderer.kt
@@ -136,7 +136,8 @@ open class YAxisRenderer(viewPortHandler: ViewPortHandler, @JvmField protected v
 
     protected var renderGridLinesPath: Path = Path()
     override fun renderGridLines(canvas: Canvas) {
-        if (!yAxis.isEnabled) return
+        if (!yAxis.isEnabled)
+            return
 
         if (yAxis.isDrawGridLinesEnabled) {
             canvas.withClip(gridClippingRect!!) {
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/YAxisRendererHorizontalBarChart.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/YAxisRendererHorizontalBarChart.kt
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/YAxisRendererRadarChart.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/YAxisRendererRadarChart.kt
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/utils/ObjectPool.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/utils/ObjectPool.kt

Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,8 @@ abstract class PieRadarChartBase<T : ChartData<out IDataSet<out Entry>>>`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`override fun notifyDataSetChanged() {`
`107`		`- if (mData == null) return`
	`107`	`+ if (mData == null)`
	`108`	`+ return`
`108`	`109`
`109`	`110`	`calcMinMax()`
`110`	`111`
Original file line number	Diff line number	Diff line change
`@@ -506,8 +506,10 @@ abstract class AxisBase : ComponentBase() {`
`506`	`506`	`}`
`507`	`507`
`508`	`508`	`fun getFormattedLabel(index: Int): String? {`
`509`		`- if (index < 0 \|\| index >= mEntries.size) return ""`
`510`		`- else return this.valueFormatter!!.getFormattedValue(mEntries[index], this)`
	`509`	`+ return if (index < 0 \|\| index >= mEntries.size)`
	`510`	`+ ""`
	`511`	`+ else`
	`512`	`+ this.valueFormatter!!.getFormattedValue(mEntries[index], this)`
`511`	`513`	`}`
`512`	`514`
`513`	`515`	`var valueFormatter: IAxisValueFormatter?`
Original file line number	Diff line number	Diff line change
`@@ -313,7 +313,8 @@ abstract class BaseDataSet<T : Entry>() : IDataSet<T> {`
`313`	`313`
`314`	`314`	`override fun getIndexInEntries(xIndex: Int): Int {`
`315`	`315`	`for (i in 0..<entryCount) {`
`316`		`- if (xIndex.toFloat() == getEntryForIndex(i)!!.x) return i`
	`316`	`+ if (xIndex.toFloat() == getEntryForIndex(i)!!.x)`
	`317`	`+ return i`
`317`	`318`	`}`
`318`	`319`
`319`	`320`	`return -1`
`@@ -345,9 +346,9 @@ abstract class BaseDataSet<T : Entry>() : IDataSet<T> {`
`345`	`346`
`346`	`347`	`override fun contains(entry: T): Boolean {`
`347`	`348`	`for (i in 0..<entryCount) {`
`348`		`- if (getEntryForIndex(i) == entry) return true`
	`349`	`+ if (getEntryForIndex(i) == entry)`
	`350`	`+ return true`
`349`	`351`	`}`
`350`		`-`
`351`	`352`	`return false`
`352`	`353`	`}`
`353`	`354`
Original file line number	Diff line number	Diff line change
`@@ -213,7 +213,8 @@ abstract class DataSet<T : Entry>(`
`213`	`213`	`}`
`214`	`214`
`215`	`215`	`override fun removeEntry(entry: T): Boolean {`
`216`		`- if (mEntries == null) return false`
	`216`	`+ if (mEntries == null)`
	`217`	`+ return false`
`217`	`218`
`218`	`219`	`// remove the entry`
`219`	`220`	`val removed = mEntries!!.remove(entry)`