Merge pull request #356 from AppDevNext/CodeSuggestion

Apply code suggestion with an extension

Author: hannesa2

MPChartLib/build.gradle

@@ -48,6 +48,7 @@ android {
 dependencies {
     implementation 'androidx.annotation:annotation:1.9.1'
     implementation 'androidx.core:core:1.16.0'
+    implementation "androidx.activity:activity-ktx:1.10.1"
     testImplementation 'junit:junit:4.13.2'
 }
 
@@ -90,7 +91,7 @@ mavenPublishing {
     // Github packages
     repositories {
         maven {
-            version = version+"-SNAPSHOT"
+            version = version + "-SNAPSHOT"
             name = "GitHubPackages"
             url = "https://maven.pkg.github.com/AppDevNext/AndroidChart"
             credentials {

MPChartLib/src/main/java/com/github/mikephil/charting/renderer/LegendRenderer.kt

@@ -20,6 +20,7 @@ import com.github.mikephil.charting.utils.Utils
 import com.github.mikephil.charting.utils.ViewPortHandler
 import java.util.Collections
 import kotlin.math.min
+import androidx.core.graphics.withSave
 
 @Suppress("MemberVisibilityCanBePrivate")
 open class LegendRenderer(
@@ -430,57 +431,57 @@ open class LegendRenderer(
     ) {
         if (entry.formColor == ColorTemplate.COLOR_SKIP || entry.formColor == ColorTemplate.COLOR_NONE || entry.formColor == 0) return
 
-        val restoreCount = c.save()
+        c.withSave {
 
-        var form = entry.form
-        if (form == LegendForm.DEFAULT) form = legend.form
+            var form = entry.form
+            if (form == LegendForm.DEFAULT) form = legend.form
 
-        formPaint.color = entry.formColor
+            formPaint.color = entry.formColor
 
-        val formSize = Utils.convertDpToPixel(
-            if (java.lang.Float.isNaN(entry.formSize))
-                legend.formSize
-            else
-                entry.formSize
-        )
-        val half = formSize / 2f
-
-        when (form) {
-            LegendForm.NONE -> {}
-            LegendForm.EMPTY -> {}
-            LegendForm.DEFAULT, LegendForm.CIRCLE -> {
-                formPaint.style = Paint.Style.FILL
-                c.drawCircle(x + half, y, half, formPaint)
-            }
+            val formSize = Utils.convertDpToPixel(
+                if (java.lang.Float.isNaN(entry.formSize))
+                    legend.formSize
+                else
+                    entry.formSize
+            )
+            val half = formSize / 2f
+
+            when (form) {
+                LegendForm.NONE -> {}
+                LegendForm.EMPTY -> {}
+                LegendForm.DEFAULT, LegendForm.CIRCLE -> {
+                    formPaint.style = Paint.Style.FILL
+                    c.drawCircle(x + half, y, half, formPaint)
+                }
 
-            LegendForm.SQUARE -> {
-                formPaint.style = Paint.Style.FILL
-                c.drawRect(x, y - half, x + formSize, y + half, formPaint)
-            }
+                LegendForm.SQUARE -> {
+                    formPaint.style = Paint.Style.FILL
+                    c.drawRect(x, y - half, x + formSize, y + half, formPaint)
+                }
 
-            LegendForm.LINE -> {
-                val formLineWidth = Utils.convertDpToPixel(
-                    if (java.lang.Float.isNaN(entry.formLineWidth))
-                        legend.formLineWidth
+                LegendForm.LINE -> {
+                    val formLineWidth = Utils.convertDpToPixel(
+                        if (java.lang.Float.isNaN(entry.formLineWidth))
+                            legend.formLineWidth
+                        else
+                            entry.formLineWidth
+                    )
+                    val formLineDashEffect = if (entry.formLineDashEffect == null)
+                        legend.formLineDashEffect
                     else
-                        entry.formLineWidth
-                )
-                val formLineDashEffect = if (entry.formLineDashEffect == null)
-                    legend.formLineDashEffect
-                else
-                    entry.formLineDashEffect
-                formPaint.style = Paint.Style.STROKE
-                formPaint.strokeWidth = formLineWidth
-                formPaint.setPathEffect(formLineDashEffect)
-
-                mLineFormPath.reset()
-                mLineFormPath.moveTo(x, y)
-                mLineFormPath.lineTo(x + formSize, y)
-                c.drawPath(mLineFormPath, formPaint)
+                        entry.formLineDashEffect
+                    formPaint.style = Paint.Style.STROKE
+                    formPaint.strokeWidth = formLineWidth
+                    formPaint.setPathEffect(formLineDashEffect)
+
+                    mLineFormPath.reset()
+                    mLineFormPath.moveTo(x, y)
+                    mLineFormPath.lineTo(x + formSize, y)
+                    c.drawPath(mLineFormPath, formPaint)
+                }
             }
-        }
 
-        c.restoreToCount(restoreCount)
+        }
     }
 
     /**

MPChartLib/src/main/java/com/github/mikephil/charting/renderer/LineRadarRenderer.kt

@@ -7,6 +7,7 @@ import android.graphics.drawable.Drawable
 import com.github.mikephil.charting.animation.ChartAnimator
 import com.github.mikephil.charting.utils.Utils
 import com.github.mikephil.charting.utils.ViewPortHandler
+import androidx.core.graphics.withClip
 
 abstract class LineRadarRenderer(animator: ChartAnimator?, viewPortHandler: ViewPortHandler?) :
     LineScatterCandleRadarRenderer(animator, viewPortHandler) {
@@ -19,18 +20,15 @@ abstract class LineRadarRenderer(animator: ChartAnimator?, viewPortHandler: View
      */
     protected fun drawFilledPath(c: Canvas, filledPath: Path, drawable: Drawable) {
         if (clipPathSupported()) {
-            val save = c.save()
-            c.clipPath(filledPath)
-
-            drawable.setBounds(
-                viewPortHandler.contentLeft().toInt(),
-                viewPortHandler.contentTop().toInt(),
-                viewPortHandler.contentRight().toInt(),
-                viewPortHandler.contentBottom().toInt()
-            )
-            drawable.draw(c)
-
-            c.restoreToCount(save)
+            c.withClip(filledPath) {
+                drawable.setBounds(
+                    viewPortHandler.contentLeft().toInt(),
+                    viewPortHandler.contentTop().toInt(),
+                    viewPortHandler.contentRight().toInt(),
+                    viewPortHandler.contentBottom().toInt()
+                )
+                drawable.draw(c)
+            }
         } else {
             throw RuntimeException(
                 "Fill-drawables not (yet) supported below API level 18, " +
@@ -52,12 +50,9 @@ abstract class LineRadarRenderer(animator: ChartAnimator?, viewPortHandler: View
         val color = (fillAlpha shl 24) or (fillColor and 0xffffff)
 
         if (clipPathSupported()) {
-            val save = c.save()
-
-            c.clipPath(filledPath)
-
-            c.drawColor(color)
-            c.restoreToCount(save)
+            c.withClip(filledPath) {
+                c.drawColor(color)
+            }
         } else {
             // save