bar chart padding

Author: AkYML

YChartsLib/src/main/java/co/yml/charts/axis/XAxis.kt

@@ -225,6 +225,7 @@ fun getXAxisScale(
 private fun XAxisPreview() {
     val axisData = AxisData.Builder()
         .labelAndAxisLinePadding(10.dp)
+        .startDrawPadding(12.dp)
         .axisPosition(Gravity.BOTTOM)
         .axisLabelFontSize(14.sp)
         .labelData { index -> index.toString() }

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

@@ -50,7 +50,7 @@ object DataUtils {
         for (index in 0 until listSize) {
             list.add(
                 Point(
-                    (start until maxRange).random().toFloat(),
+                   index.toFloat(),
                     (start until maxRange).random().toFloat()
                 )
             )
@@ -195,15 +195,15 @@ object DataUtils {
             val point = when (barChartType) {
                 BarChartType.VERTICAL -> {
                     Point(
-                        index.toFloat(),
+                       index.toFloat(),
                         "%.2f".format(Random.nextDouble(1.0, maxRange.toDouble())).toFloat()
                     )
                 }
 
                 BarChartType.HORIZONTAL -> {
                     Point(
                         "%.2f".format(Random.nextDouble(1.0, maxRange.toDouble())).toFloat(),
-                        index.toFloat()
+                        "%.2f".format(Random.nextDouble(1.0, maxRange.toDouble())).toFloat()
                     )
                 }
             }

YChartsLib/src/main/java/co/yml/charts/ui/bubblechart/BubbleChart.kt

@@ -8,6 +8,7 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.wrapContentHeight
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.material.ExperimentalMaterialApi
@@ -34,6 +35,7 @@ import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.semantics.contentDescription
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
 import co.yml.charts.axis.XAxis
 import co.yml.charts.axis.YAxis
 import co.yml.charts.axis.getXAxisScale
@@ -129,13 +131,6 @@ fun BubbleChart(modifier: Modifier, bubbleChartData: BubbleChartData) {
                 containerBackgroundColor = backgroundColor,
                 isPinchZoomEnabled = isZoomAllowed,
                 drawXAndYAxis = { scrollOffset, xZoom ->
-                    YAxis(
-                        modifier = Modifier
-                            .fillMaxHeight()
-                            .onGloballyPositioned {
-                                columnWidth = it.size.width.toFloat()
-                            }, yAxisData = yAxisData
-                    )
                     XAxis(xAxisData = xAxisData,
                         modifier = Modifier
                             .fillMaxWidth()
@@ -154,6 +149,14 @@ fun BubbleChart(modifier: Modifier, bubbleChartData: BubbleChartData) {
                         zoomScale = xZoom,
                         chartData = bubblePoints,
                         axisStart = columnWidth)
+                    YAxis(
+                        modifier = Modifier
+                            .fillMaxHeight()
+                            .onGloballyPositioned {
+                                columnWidth = it.size.width.toFloat()
+                            }, yAxisData = yAxisData
+                    )
+
                 },
                 onDraw = { scrollOffset, xZoom ->
                     val yBottom = size.height - rowHeight

app/src/main/java/co/yml/ycharts/app/presentation/BarChartActivity.kt

@@ -138,6 +138,7 @@ private fun BarchartWithSolidBars() {
         .steps(barData.size - 1)
         .bottomPadding(40.dp)
         .axisLabelAngle(20f)
+        .startDrawPadding(48.dp)
         .labelData { index -> barData[index].label }
         .build()
     val yAxisData = AxisData.Builder()
@@ -175,6 +176,7 @@ private fun BarchartWithGradientBars() {
         .steps(barData.size - 1)
         .bottomPadding(40.dp)
         .axisLabelAngle(20f)
+        .startDrawPadding(48.dp)
         .labelData { index -> barData[index].label }
         .build()
     val yAxisData = AxisData.Builder()
@@ -216,6 +218,7 @@ private fun BarchartWithBackgroundColor() {
         .axisStepSize(30.dp)
         .steps(barData.size - 1)
         .bottomPadding(40.dp)
+        .startDrawPadding(48.dp)
         .axisLabelAngle(20f)
         .labelData { index -> barData[index].label }
         .backgroundColor(backgroundColor)

app/src/main/java/co/yml/ycharts/app/presentation/BubbleChartActivity.kt

@@ -109,14 +109,16 @@ private fun BubbleChartWithGrid(pointsData: List<Point>) {
     val steps = 5
     val xAxisData = AxisData.Builder()
         .axisStepSize(30.dp)
+        .startDrawPadding(55.dp)
+        .startDrawPadding(20.dp)
         .steps(pointsData.size - 1)
         .labelData { i -> i.toString() }
         .labelAndAxisLinePadding(15.dp)
         .build()
 
     val yAxisData = AxisData.Builder()
         .steps(steps)
-        .labelAndAxisLinePadding(20.dp)
+        .labelAndAxisLinePadding(50.dp)
         .labelData { i ->
             // Add yMin to get the negative axis values to the scale
             val yMin = pointsData.minOf { it.y }
@@ -154,6 +156,7 @@ private fun SolidBubbleChart(pointsData: List<Point>) {
         .axisStepSize(30.dp)
         .steps(pointsData.size - 1)
         .labelData { i -> i.toString() }
+        .startDrawPadding(55.dp)
         .labelAndAxisLinePadding(15.dp)
         .build()