Rename

Author: hannesa2

MPChartLib/src/main/java/com/github/mikephil/charting/formatter/DefaultFillFormatter.kt

@@ -16,8 +16,13 @@ open class DefaultFillFormatter : IFillFormatter {
         fillMin = if (dataSet!!.yMax > 0 && dataSet.yMin < 0) {
             0f
         } else {
-            val max: Float = if (data.yMax > 0) 0f else chartMaxY
-            val min: Float = if (data.yMin < 0) 0f else chartMinY
+            val max: Float = if (data.yMax > 0) 0f
+            else
+                chartMaxY
+            val min: Float = if (data.yMin < 0)
+                0f
+            else
+                chartMinY
             if (dataSet.yMin >= 0)
                 min
             else

MPChartLib/src/main/java/com/github/mikephil/charting/formatter/IndexAxisValueFormatter.kt

@@ -8,13 +8,16 @@ import kotlin.math.roundToInt
  */
 open class IndexAxisValueFormatter : IAxisValueFormatter {
 
+    var values: Array<String> = arrayOf()
+
     /**
      * Constructor that specifies axis labels.
      *
      * @param values The values string array
      */
     constructor(values: Array<String>?) {
-        if (values != null) this.values = values
+        if (values != null)
+            this.values = values
     }
 
     /**
@@ -23,13 +26,16 @@ open class IndexAxisValueFormatter : IAxisValueFormatter {
      * @param values The values string array
      */
     constructor(values: Collection<String>?) {
-        if (values != null) this.values = values.toTypedArray()
+        if (values != null)
+            this.values = values.toTypedArray()
     }
 
     override fun getFormattedValue(value: Float, axis: AxisBase?): String {
         val index = value.roundToInt()
-        return if (index < 0 || index >= values.size || index != value.toInt()) "" else values[index]
+        return if (index < 0 || index >= values.size || index != value.toInt())
+            ""
+        else
+            values[index]
     }
 
-    var values: Array<String> = arrayOf()
 }

MPChartLib/src/main/java/com/github/mikephil/charting/formatter/LargeValueFormatter.kt

@@ -15,30 +15,30 @@ import java.text.DecimalFormat
  */
 open class LargeValueFormatter() : IValueFormatter, IAxisValueFormatter {
 
-    private var mSuffix = arrayOf(
+    private var suffix = arrayOf(
         "", "k", "m", "b", "t"
     )
-    private var mMaxLength = 5
-    private val mFormat: DecimalFormat = DecimalFormat("###E00")
-    private var mText = ""
+    private var maxLength = 5
+    private val decimalFormat: DecimalFormat = DecimalFormat("###E00")
+    private var text = ""
 
     /**
      * Creates a formatter that appends a specified text to the result string
      *
      * @param appendix a text that will be appended
      */
     constructor(appendix: String) : this() {
-        mText = appendix
+        text = appendix
     }
 
     // IValueFormatter
     override fun getFormattedValue(value: Float, entry: Entry?, dataSetIndex: Int, viewPortHandler: ViewPortHandler?): String {
-        return makePretty(value.toDouble()) + mText
+        return makePretty(value.toDouble()) + text
     }
 
     // IAxisValueFormatter
     override fun getFormattedValue(value: Float, axis: AxisBase?): String {
-        return makePretty(value.toDouble()) + mText
+        return makePretty(value.toDouble()) + text
     }
 
     /**
@@ -47,37 +47,37 @@ open class LargeValueFormatter() : IValueFormatter, IAxisValueFormatter {
      * @param appendix
      */
     fun setAppendix(appendix: String) {
-        mText = appendix
+        text = appendix
     }
 
     /**
      * Set custom suffix to be appended after the values.
      * Default suffix: ["", "k", "m", "b", "t"]
      *
-     * @param suffix new suffix
+     * @param suffixArray new suffix
      */
-    fun setSuffix(suffix: Array<String>) {
-        mSuffix = suffix
+    fun setSuffix(suffixArray: Array<String>) {
+        suffix = suffixArray
     }
 
-    fun setMaxLength(maxLength: Int) {
-        mMaxLength = maxLength
+    fun setMaxLength(max: Int) {
+        maxLength = max
     }
 
     /**
      * Formats each number properly. Special thanks to Roman Gromov
      * (https://github.com/romangromov) for this piece of code.
      */
     private fun makePretty(number: Double): String {
-        var r = mFormat.format(number)
-        val numericValue1 = Character.getNumericValue(r[r.length - 1])
-        val numericValue2 = Character.getNumericValue(r[r.length - 2])
+        var decimalFormat = decimalFormat.format(number)
+        val numericValue1 = Character.getNumericValue(decimalFormat[decimalFormat.length - 1])
+        val numericValue2 = Character.getNumericValue(decimalFormat[decimalFormat.length - 2])
         val combined = Integer.valueOf(numericValue2.toString() + "" + numericValue1)
-        r = r.replace("E[0-9][0-9]".toRegex(), mSuffix[combined / 3])
-        while (r.length > mMaxLength || r.matches("[0-9]+\\.[a-z]".toRegex())) {
-            r = r.substring(0, r.length - 2) + r.substring(r.length - 1)
+        decimalFormat = decimalFormat.replace("E[0-9][0-9]".toRegex(), suffix[combined / 3])
+        while (decimalFormat.length > maxLength || decimalFormat.matches("[0-9]+\\.[a-z]".toRegex())) {
+            decimalFormat = decimalFormat.substring(0, decimalFormat.length - 2) + decimalFormat.substring(decimalFormat.length - 1)
         }
-        return r
+        return decimalFormat
     }
 
 }

MPChartLib/src/main/java/com/github/mikephil/charting/formatter/StackedValueFormatter.kt

@@ -17,7 +17,7 @@ import java.text.DecimalFormat
  * @param decimals       the number of decimal digits to use
  */
 open class StackedValueFormatter(private val drawWholeStack: Boolean, private val appendix: String, decimals: Int) : IValueFormatter {
-    private val mFormat: DecimalFormat
+    private val decimalFormat: DecimalFormat
 
     init {
         val b = StringBuffer()
@@ -26,7 +26,7 @@ open class StackedValueFormatter(private val drawWholeStack: Boolean, private va
             b.append("0")
         }
 
-        this.mFormat = DecimalFormat("###,###,###,##0$b")
+        this.decimalFormat = DecimalFormat("###,###,###,##0$b")
     }
 
     override fun getFormattedValue(value: Float, entry: Entry?, dataSetIndex: Int, viewPortHandler: ViewPortHandler?): String {
@@ -40,14 +40,14 @@ open class StackedValueFormatter(private val drawWholeStack: Boolean, private va
                 return if (vals[vals.size - 1] == value) {
                     // return the "sum" across all stack values
 
-                    mFormat.format(barEntry.y.toDouble()) + appendix
+                    decimalFormat.format(barEntry.y.toDouble()) + appendix
                 } else {
                     "" // return empty
                 }
             }
         }
 
         // return the "proposed" value
-        return mFormat.format(value.toDouble()) + appendix
+        return decimalFormat.format(value.toDouble()) + appendix
     }
 }