Add bar spacing customization

fracassi-marco · Aug 11, 2023 · 4015264 · 4015264
1 parent d31a700
commit 4015264
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 13 deletions.
diff --git a/JetChart/build.gradle b/JetChart/build.gradle
@@ -59,7 +59,7 @@ afterEvaluate {
                 from components.release
                 groupId = 'io.jetchart'
                 artifactId = 'JetChart'
-                version = '1.3.1'
+                version = '1.3.2'
             }
         }
     }

diff --git a/JetChart/src/main/java/io/jetchart/bar/BarChart.kt b/JetChart/src/main/java/io/jetchart/bar/BarChart.kt
@@ -13,6 +13,8 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.geometry.Rect
 import androidx.compose.ui.graphics.drawscope.drawIntoCanvas
 import androidx.compose.ui.input.pointer.pointerInput
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
 import io.jetchart.bar.BarChartUtils.axisAreas
 import io.jetchart.bar.BarChartUtils.barDrawableArea
 import io.jetchart.bar.BarChartUtils.forEachWithArea
@@ -35,7 +37,8 @@ fun BarChart(
     xAxisDrawer: XAxisDrawer = BarXAxisDrawer(),
     yAxisDrawer: YAxisDrawer = BarYAxisWithValueDrawer(),
     labelDrawer: BarLabelDrawer = SimpleBarLabelDrawer(),
-    valueDrawer: BarValueDrawer = SimpleBarValueDrawer()
+    valueDrawer: BarValueDrawer = SimpleBarValueDrawer(),
+    barHorizontalMargin: Dp = 3.dp
 ) {
     val transitionAnimation = remember(chars.bars) { Animatable(initialValue = 0f) }
     val rectangles = remember { mutableStateMapOf<Bar, Rect>() }
@@ -63,7 +66,7 @@ fun BarChart(
 
             xAxisDrawer.drawAxisLine(this, canvas, xAxisArea)
 
-            chars.forEachWithArea(this, barDrawableArea, transitionAnimation.value, valueDrawer) { barArea, bar ->
+            chars.forEachWithArea(this, barDrawableArea, transitionAnimation.value, valueDrawer, barHorizontalMargin) { barArea, bar ->
                 barDrawer.drawBar(this, canvas, barArea, bar)
                 labelDrawer.draw(this, canvas, bar.label, barArea, xAxisArea)
                 valueDrawer.draw(this, canvas, bar.value, barArea, xAxisArea)

diff --git a/JetChart/src/main/java/io/jetchart/bar/BarChartUtils.kt b/JetChart/src/main/java/io/jetchart/bar/BarChartUtils.kt
@@ -3,6 +3,8 @@ package io.jetchart.bar
 import androidx.compose.ui.geometry.Rect
 import androidx.compose.ui.geometry.Size
 import androidx.compose.ui.graphics.drawscope.DrawScope
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
 import io.jetchart.bar.renderer.label.BarValueDrawer
 import io.jetchart.bar.renderer.xaxis.XAxisDrawer
 import io.jetchart.bar.renderer.yaxis.YAxisDrawer
@@ -39,15 +41,16 @@ internal object BarChartUtils {
   }
 
   fun Bars.forEachWithArea(
-      drawScope: DrawScope,
-      barDrawableArea: Rect,
-      progress: Float,
-      valueDrawer: BarValueDrawer,
-      block: (barArea: Rect, bar: Bar) -> Unit
-  ) {
+    drawScope: DrawScope,
+    barDrawableArea: Rect,
+    progress: Float,
+    valueDrawer: BarValueDrawer,
+    barHorizontalMargin: Dp,
+    block: (barArea: Rect, bar: Bar) -> Unit
+  ) = with(drawScope){
     val totalBars = bars.size
     val widthOfBarArea = barDrawableArea.width / totalBars
-    val offsetOfBar = widthOfBarArea * 0.2f
+    val offsetOfBar = widthOfBarArea - barHorizontalMargin.toPx()
 
     bars.forEachIndexed { index, bar ->
       val left = barDrawableArea.left + (index * widthOfBarArea)

diff --git a/README.md b/README.md
@@ -40,7 +40,7 @@ allprojects {
 2. Add the dependency
 ```groovy
 dependencies {
-    implementation 'com.github.fracassi-marco:JetChart:1.3.1'
+    implementation 'com.github.fracassi-marco:JetChart:1.3.2'
 }
 ```
 
@@ -74,7 +74,8 @@ fun BarChartComposable(text: MutableState<String>) {
         xAxisDrawer = BarXAxisDrawer(),
         yAxisDrawer = BarYAxisWithValueDrawer(),
         labelDrawer = SimpleBarLabelDrawer(),
-        valueDrawer = SimpleBarValueDrawer(drawLocation = Inside)
+        valueDrawer = SimpleBarValueDrawer(drawLocation = Inside),
+        barHorizontalMargin = 5.dp
     )
 }
 ```

diff --git a/app/src/main/java/io/jetchart/demo/MainActivity.kt b/app/src/main/java/io/jetchart/demo/MainActivity.kt
@@ -100,7 +100,8 @@ fun BarChartComposable(text: MutableState<String>) {
         xAxisDrawer = BarXAxisDrawer(),
         yAxisDrawer = BarYAxisWithValueDrawer(),
         labelDrawer = SimpleBarLabelDrawer(),
-        valueDrawer = SimpleBarValueDrawer(drawLocation = Inside)
+        valueDrawer = SimpleBarValueDrawer(drawLocation = Inside),
+        barHorizontalMargin = 5.dp
     )
 }