Kotlin all entries

MPChartLib/src/main/java/com/github/mikephil/charting/charts/PieChart.java

@@ -782,7 +782,7 @@ public String getAccessibilityDescription() {
             PieEntry entry = pieData.getDataSet().getEntryForIndex(i);
             float percentage = (entry.getValue() / pieData.getYValueSum()) * 100;
             builder.append(String.format(Locale.getDefault(), "%s has %.2f percent pie taken",
-                    (TextUtils.isEmpty(entry.getLabel()) ? "No Label" : entry.getLabel()),
+                    (TextUtils.isEmpty(entry.label) ? "No Label" : entry.label),
                     percentage));
         }
 

MPChartLib/src/main/java/com/github/mikephil/charting/data/BarEntry.kt

@@ -141,22 +141,19 @@ open class BarEntry : Entry {
         calcRanges()
     }
 
+    /**
+     * Returns the value of this BarEntry. If the entry is stacked, it returns the positive sum of all values.
+     */
     override var y: Float = 0.0f
-        /**
-         * Returns the value of this BarEntry. If the entry is stacked, it returns the positive sum of all values.
-         */
         get() = super.y
 
+    /**
+     * Returns true if this BarEntry is stacked (has a values array), false if not.
+     */
     val isStacked: Boolean
-        /**
-         * Returns true if this BarEntry is stacked (has a values array), false if not.
-         */
         get() = this.yVals != null
 
-    /**
-     * Use `getSumBelow(stackIndex)` instead.
-     */
-    @Deprecated("")
+    @Deprecated("getSumBelow(stackIndex)` instead.")
     fun getBelowSum(stackIndex: Int): Float {
         return getSumBelow(stackIndex)
     }
@@ -232,5 +229,3 @@ open class BarEntry : Entry {
         }
     }
 }
-
-

MPChartLib/src/main/java/com/github/mikephil/charting/data/BubbleEntry.java → MPChartLib/src/main/java/com/github/mikephil/charting/data/BubbleEntry.kt

@@ -1,21 +1,19 @@
+package com.github.mikephil.charting.data
 
-package com.github.mikephil.charting.data;
-
-import android.annotation.SuppressLint;
-import android.graphics.drawable.Drawable;
+import android.annotation.SuppressLint
+import android.graphics.drawable.Drawable
 
 /**
  * Subclass of Entry that holds a value for one entry in a BubbleChart. Bubble
- * chart implementation: Copyright 2015 Pierre-Marc Airoldi Licensed under
- * Apache License 2.0
- *
- * @author Philipp Jahoda
+ * chart implementation: Copyright 2015 Pierre-Marc Airoldi Licensed under Apache License 2.0
  */
 @SuppressLint("ParcelCreator")
-public class BubbleEntry extends Entry {
-
-    /** size value */
-    private float mSize;
+class BubbleEntry : Entry {
+    /**
+     * Returns the size of this entry (the size of the bubble).
+     */
+    /** size value  */
+    var size: Float
 
     /**
      * Constructor.
@@ -24,9 +22,8 @@ public class BubbleEntry extends Entry {
      * @param y The value on the y-axis.
      * @param size The size of the bubble.
      */
-    public BubbleEntry(float x, float y, float size) {
-        super(x, y);
-        this.mSize = size;
+    constructor(x: Float, y: Float, size: Float) : super(x, y) {
+        this.size = size
     }
 
     /**
@@ -37,9 +34,8 @@ public BubbleEntry(float x, float y, float size) {
      * @param size The size of the bubble.
      * @param data Spot for additional data this Entry represents.
      */
-    public BubbleEntry(float x, float y, float size, Object data) {
-        super(x, y, data);
-        this.mSize = size;
+    constructor(x: Float, y: Float, size: Float, data: Any?) : super(x, y, data) {
+        this.size = size
     }
 
     /**
@@ -50,9 +46,8 @@ public BubbleEntry(float x, float y, float size, Object data) {
      * @param size The size of the bubble.
      * @param icon Icon image
      */
-    public BubbleEntry(float x, float y, float size, Drawable icon) {
-        super(x, y, icon);
-        this.mSize = size;
+    constructor(x: Float, y: Float, size: Float, icon: Drawable?) : super(x, y, icon) {
+        this.size = size
     }
 
     /**
@@ -64,25 +59,11 @@ public BubbleEntry(float x, float y, float size, Drawable icon) {
      * @param icon Icon image
      * @param data Spot for additional data this Entry represents.
      */
-    public BubbleEntry(float x, float y, float size, Drawable icon, Object data) {
-        super(x, y, icon, data);
-        this.mSize = size;
-    }
-
-    public BubbleEntry copy() {
-
-		return new BubbleEntry(getX(), getY(), mSize, getData());
-    }
-
-    /**
-     * Returns the size of this entry (the size of the bubble).
-     */
-    public float getSize() {
-        return mSize;
+    constructor(x: Float, y: Float, size: Float, icon: Drawable?, data: Any?) : super(x, y, icon, data) {
+        this.size = size
     }
 
-    public void setSize(float size) {
-        this.mSize = size;
+    override fun copy(): BubbleEntry {
+        return BubbleEntry(x, y, this.size, data)
     }
-
 }