Merge pull request #435 from AppDevNext/KotlinItems

Kotlin items

Author: hannesa2

app/src/main/java/info/appdev/chartexample/BarChartActivity.kt

@@ -31,8 +31,8 @@ import com.github.mikephil.charting.listener.OnChartValueSelectedListener
 import com.github.mikephil.charting.utils.Fill
 import com.github.mikephil.charting.utils.MPPointF
 import info.appdev.chartexample.DataTools.Companion.getValues
-import info.appdev.chartexample.custom.DayAxisValueFormatter
-import info.appdev.chartexample.custom.MyAxisValueFormatter
+import info.appdev.chartexample.formatter.DayAxisValueFormatter
+import info.appdev.chartexample.formatter.MyAxisValueFormatter
 import info.appdev.chartexample.custom.XYMarkerView
 import info.appdev.chartexample.notimportant.DemoBase
 

app/src/main/java/info/appdev/chartexample/ListViewBarChartActivity.kt

@@ -27,8 +27,6 @@ import androidx.core.net.toUri
 /**
  * Demonstrates the use of charts inside a ListView. IMPORTANT: provide a
  * specific height attribute for the chart inside your ListView item
- *
- * @author Philipp Jahoda
  */
 class ListViewBarChartActivity : DemoBase() {
     override fun onCreate(savedInstanceState: Bundle?) {

app/src/main/java/info/appdev/chartexample/ListViewMultiChartActivity.kt

@@ -65,15 +65,15 @@ class ListViewMultiChartActivity : DemoBase() {
     }
 
     /** adapter that supports 3 different item types  */
-    private class ChartDataAdapter(context: Context, objects: MutableList<ChartItem?>) : ArrayAdapter<ChartItem?>(context, 0, objects) {
+    private class ChartDataAdapter(context: Context, objects: MutableList<ChartItem?>) : ArrayAdapter<ChartItem>(context, 0, objects) {
         override fun getView(position: Int, convertView: View?, parent: ViewGroup): View {
-            return getItem(position)!!.getView(position, convertView, context)
+            return getItem(position)!!.getView(position, convertView, context)!!
         }
 
         override fun getItemViewType(position: Int): Int {
             // return the views type
             val ci = getItem(position)
-            return if (ci != null) ci.getItemType() else 0
+            return if (ci != null) ci.itemType else 0
         }
 
         override fun getViewTypeCount(): Int {

app/src/main/java/info/appdev/chartexample/StackedBarActivity.kt

@@ -26,8 +26,8 @@ import com.github.mikephil.charting.interfaces.datasets.IBarDataSet
 import com.github.mikephil.charting.listener.OnChartValueSelectedListener
 import com.github.mikephil.charting.utils.ColorTemplate
 import info.appdev.chartexample.DataTools.Companion.getValues
-import info.appdev.chartexample.custom.MyAxisValueFormatter
-import info.appdev.chartexample.custom.MyValueFormatter
+import info.appdev.chartexample.formatter.MyAxisValueFormatter
+import info.appdev.chartexample.formatter.MyValueFormatter
 import info.appdev.chartexample.notimportant.DemoBase
 
 class StackedBarActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSelectedListener {

app/src/main/java/info/appdev/chartexample/custom/CustomScatterShapeRenderer.java

@@ -0,0 +1,28 @@
+package info.appdev.chartexample.custom
+
+import android.graphics.Canvas
+import android.graphics.Paint
+import com.github.mikephil.charting.interfaces.datasets.IScatterDataSet
+import com.github.mikephil.charting.renderer.scatter.IShapeRenderer
+import com.github.mikephil.charting.utils.Utils
+import com.github.mikephil.charting.utils.ViewPortHandler
+
+/**
+ * Custom shape renderer that draws a single line.
+ */
+class CustomScatterShapeRenderer : IShapeRenderer {
+    override fun renderShape(
+        canvas: Canvas, dataSet: IScatterDataSet, viewPortHandler: ViewPortHandler?,
+        posX: Float, posY: Float, renderPaint: Paint
+    ) {
+        val shapeHalf = Utils.convertDpToPixel(dataSet.getScatterShapeSize()) / 2f
+
+        canvas.drawLine(
+            posX - shapeHalf,
+            posY - shapeHalf,
+            posX + shapeHalf,
+            posY + shapeHalf,
+            renderPaint
+        )
+    }
+}

app/src/main/java/info/appdev/chartexample/custom/CustomScatterShapeRenderer.kt

@@ -1,4 +1,4 @@
-package info.appdev.chartexample.custom
+package info.appdev.chartexample.formatter
 
 import com.github.mikephil.charting.charts.BarLineChartBase
 import com.github.mikephil.charting.components.AxisBase

…texample/custom/DayAxisValueFormatter.kt …ample/formatter/DayAxisValueFormatter.ktapp/src/main/java/info/appdev/chartexample/custom/DayAxisValueFormatter.kt renamed to app/src/main/java/info/appdev/chartexample/formatter/DayAxisValueFormatter.kt app/src/main/java/info/appdev/chartexample/custom/DayAxisValueFormatter.kt renamed to app/src/main/java/info/appdev/chartexample/formatter/DayAxisValueFormatter.kt

@@ -1,4 +1,4 @@
-package info.appdev.chartexample.custom
+package info.appdev.chartexample.formatter
 
 import com.github.mikephil.charting.components.AxisBase
 import com.github.mikephil.charting.formatter.IAxisValueFormatter

…rtexample/custom/MyAxisValueFormatter.kt …xample/formatter/MyAxisValueFormatter.ktapp/src/main/java/info/appdev/chartexample/custom/MyAxisValueFormatter.kt renamed to app/src/main/java/info/appdev/chartexample/formatter/MyAxisValueFormatter.kt app/src/main/java/info/appdev/chartexample/custom/MyAxisValueFormatter.kt renamed to app/src/main/java/info/appdev/chartexample/formatter/MyAxisValueFormatter.kt

@@ -1,4 +1,4 @@
-package info.appdev.chartexample.custom
+package info.appdev.chartexample.formatter
 
 import com.github.mikephil.charting.formatter.IFillFormatter
 import com.github.mikephil.charting.interfaces.dataprovider.LineDataProvider
@@ -10,4 +10,4 @@ class MyFillFormatter(private val fillPos: Float) : IFillFormatter {
         // your logic could be here
         return fillPos
     }
-}
+}

…v/chartexample/custom/MyFillFormatter.kt …hartexample/formatter/MyFillFormatter.ktapp/src/main/java/info/appdev/chartexample/custom/MyFillFormatter.kt renamed to app/src/main/java/info/appdev/chartexample/formatter/MyFillFormatter.kt app/src/main/java/info/appdev/chartexample/custom/MyFillFormatter.kt renamed to app/src/main/java/info/appdev/chartexample/formatter/MyFillFormatter.kt

@@ -1,4 +1,4 @@
-package info.appdev.chartexample.custom
+package info.appdev.chartexample.formatter
 
 import com.github.mikephil.charting.data.Entry
 import com.github.mikephil.charting.formatter.IValueFormatter