Simplify MultiChart

Author: hannesa2

app/src/androidTest/kotlin/info/appdev/chartexample/StartTest.kt

@@ -213,7 +213,7 @@ class StartTest {
                     composeTestRule.waitForIdle()
                     Thread.sleep(200) // Small delay for back navigation
                 } catch (e: Exception) {
-                    Timber.e("Error at #$index: '$optionMenu' - ${e.message}", e)
+                    Timber.e("#$index/'${it.simpleName}': '$optionMenu' ${e.message}", e)
                     onView(ViewMatchers.isRoot())
                         .perform(captureToBitmap { bitmap: Bitmap ->
                             bitmap.writeToTestStorage(

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

@@ -49,7 +49,7 @@ class ListViewMultiChartActivity : DemoBase() {
                 list.add(LineChartItem(generateDataLine(i + 1), applicationContext))
             } else if (i % 3 == 1) {
                 list.add(BarChartItem(generateDataBar(i + 1), applicationContext))
-            } else if (i % 3 == 2) {
+            } else {
                 list.add(PieChartItem(generateDataPie(), applicationContext))
             }
         }
@@ -67,7 +67,7 @@ class ListViewMultiChartActivity : DemoBase() {
         override fun getItemViewType(position: Int): Int {
             // return the views type
             val ci = getItem(position)
-            return if (ci != null) ci.itemType else 0
+            return ci?.itemType ?: 0
         }
 
         override fun getViewTypeCount(): Int {
@@ -98,7 +98,7 @@ class ListViewMultiChartActivity : DemoBase() {
         val values2 = ArrayList<Entry>()
 
         for (i in 0..<count) {
-            values2.add(Entry(i.toFloat(), values1.get(i).y - 30))
+            values2.add(Entry(i.toFloat(), values1[i].y - 30))
         }
 
         val d2 = LineDataSet(values2, "New DataSet $cnt, (2)")
@@ -130,7 +130,7 @@ class ListViewMultiChartActivity : DemoBase() {
             entries.add(BarEntry(i.toFloat(), ((sampleValues[i]!!.toFloat() * 70).toInt() + 30).toFloat()))
         }
 
-        val d = BarDataSet(entries, "New DataSet " + cnt)
+        val d = BarDataSet(entries, "New DataSet $cnt")
         d.setColors(*ColorTemplate.VORDIPLOM_COLORS)
         d.highLightAlpha = 255