Merge pull request #104 from AkYML/feature/bubbleChart

Feature/bubble chart

Author: dkk009

YChartsLib/src/main/java/co/yml/charts/common/components/accessibility/BubblePointInfo.kt

@@ -0,0 +1,57 @@
+package co.yml.charts.common.components.accessibility
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.semantics.semantics
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+
+/**
+ * Composable to display each Bubble point data for given bubble chart.
+ * @param axisLabelDescription: Axis label description.
+ * @param pointDescription: Details of each point on the line.
+ * @param bubbleColor: Color of each bubble.
+ */
+@Composable
+fun BubblePointInfo(
+    axisLabelDescription: String,
+    pointDescription: String,
+    bubbleColor: Color
+) {
+    // Merge elements below for accessibility purposes
+    Row(modifier = Modifier
+        .padding(start = 10.dp, end = 10.dp)
+        .clickable { }
+        .semantics(mergeDescendants = true) {}, verticalAlignment = Alignment.CenterVertically
+    ) {
+        Text(axisLabelDescription, fontSize = 12.sp)
+        Spacer(modifier = Modifier.width(5.dp))
+        Column(
+            modifier = Modifier
+                .weight(1f)
+                .padding(5.dp)
+        ) {
+            Row(verticalAlignment = Alignment.CenterVertically) {
+                Box(
+                    modifier = Modifier
+                        .padding(5.dp)
+                        .background(bubbleColor)
+                        .size(20.dp)
+                )
+                Text(pointDescription, fontSize = 12.sp)
+            }
+        }
+    }
+}

YChartsLib/src/main/java/co/yml/charts/common/utils/DataUtils.kt

@@ -11,6 +11,8 @@ import co.yml.charts.common.model.Point
 import co.yml.charts.ui.barchart.models.BarChartType
 import co.yml.charts.ui.barchart.models.BarData
 import co.yml.charts.ui.barchart.models.GroupBar
+import co.yml.charts.ui.bubblechart.model.Bubble
+import co.yml.charts.ui.bubblechart.model.BubbleStyle
 import co.yml.charts.ui.piechart.models.PieChartData
 import kotlin.math.sin
 import kotlin.random.Random
@@ -35,6 +37,77 @@ object DataUtils {
         return list
     }
 
+    /**
+     * Returns list of points
+     * @param listSize: Size of total number of points needed.
+     * @param start: X values to start from. ex: 50 to 100
+     * @param maxRange: Max range of Y values
+     */
+    fun getRandomPoints(listSize: Int, start: Int = 0, maxRange: Int): List<Point> {
+        val list = arrayListOf<Point>()
+        for (index in 0 until listSize) {
+            list.add(
+                Point(
+                    index.toFloat(),
+                    (start until maxRange).random().toFloat()
+                )
+            )
+        }
+        return list
+    }
+
+    /**
+     * Returns list of points
+     * @param listSize: Size of total number of points needed.
+     * @param start: X values to start from. ex: 50 to 100
+     * @param maxRange: Max range of Y values
+     */
+    fun getBubbleChartDataWithGradientStyle(
+        points: List<Point>,
+        minDensity: Float = 10F,
+        maxDensity: Float = 100F
+    ): List<Bubble> {
+        val list = arrayListOf<Bubble>()
+        points.forEachIndexed { index, point ->
+            val bubbleColor = if (index % 2 == 0) Color.Red else Color.Blue
+            list.add(
+                Bubble(
+                    center = point,
+                    density = (minDensity.toInt() until maxDensity.toInt()).random().toFloat(),
+                    bubbleStyle = BubbleStyle(gradientColors = listOf(bubbleColor, Color.White), useGradience = true)
+                )
+            )
+
+        }
+        return list
+    }
+
+    /**
+     * Returns list of points
+     * @param listSize: Size of total number of points needed.
+     * @param start: X values to start from. ex: 50 to 100
+     * @param maxRange: Max range of Y values
+     */
+    fun getBubbleChartDataWithSolidStyle(
+        points: List<Point>,
+        minDensity: Float = 10F,
+        maxDensity: Float = 100F
+    ): List<Bubble> {
+        val list = arrayListOf<Bubble>()
+        points.forEachIndexed { index, point ->
+            val bubbleColor = if (index % 2 == 0) Color.Red else Color.Blue
+            list.add(
+                Bubble(
+                    center = point,
+                    density = (minDensity.toInt() until maxDensity.toInt()).random().toFloat(),
+                    bubbleStyle = BubbleStyle(solidColor = bubbleColor, useGradience = false)
+                )
+            )
+
+        }
+        return list
+    }
+
     /**
      * Return the sample bar chart data
      * @param duration : Duration of the wave in seconds
@@ -71,6 +144,7 @@ object DataUtils {
                         "%.2f".format(Random.nextDouble(1.0, maxRange.toDouble())).toFloat()
                     )
                 }
+
                 BarChartType.HORIZONTAL -> {
                     Point(
                         "%.2f".format(Random.nextDouble(1.0, maxRange.toDouble())).toFloat(),