added TickPlacement Option to XAxis (#125)

appreciated · Oct 4, 2021 · 038c95f · 038c95f
1 parent c4b2ad9
commit 038c95f
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 0 deletions.
diff --git a/src/main/java/com/github/appreciated/apexcharts/config/XAxis.java b/src/main/java/com/github/appreciated/apexcharts/config/XAxis.java
@@ -11,6 +11,7 @@ public class XAxis {
     private AxisBorder axisBorder;
     private AxisTicks axisTicks;
     private BigDecimal tickAmount;
+    private TickPlacement tickPlacement;
     private Double min;
     private Double max;
     private Double range;
@@ -44,6 +45,10 @@ public BigDecimal getTickAmount() {
         return tickAmount;
     }
 
+    public TickPlacement getTickPlacement() {
+        return tickPlacement;
+    }
+
     public Double getMin() {
         return min;
     }
@@ -100,6 +105,10 @@ public void setTickAmount(BigDecimal tickAmount) {
         this.tickAmount = tickAmount;
     }
 
+    public void setTickPlacement(TickPlacement tickPlacement) {
+        this.tickPlacement = tickPlacement;
+    }
+
     public void setMin(Double min) {
         this.min = min;
     }

diff --git a/src/main/java/com/github/appreciated/apexcharts/config/builder/XAxisBuilder.java b/src/main/java/com/github/appreciated/apexcharts/config/builder/XAxisBuilder.java
@@ -14,6 +14,7 @@ public class XAxisBuilder {
     private AxisBorder axisBorder;
     private AxisTicks axisTicks;
     private BigDecimal tickAmount;
+    private TickPlacement tickPlacement;
     private Double min;
     private Double max;
     private Double range;
@@ -61,6 +62,11 @@ public XAxisBuilder withTickAmount(BigDecimal tickAmount) {
         return this;
     }
 
+    public XAxisBuilder withTickPlacement(TickPlacement tickPlacement) {
+        this.tickPlacement = tickPlacement;
+        return this;
+    }
+
     public XAxisBuilder withMin(Double min) {
         this.min = min;
         return this;
@@ -113,6 +119,7 @@ public XAxis build() {
         xAxis.setAxisBorder(axisBorder);
         xAxis.setAxisTicks(axisTicks);
         xAxis.setTickAmount(tickAmount);
+        xAxis.setTickPlacement(tickPlacement);
         xAxis.setMin(min);
         xAxis.setMax(max);
         xAxis.setRange(range);

diff --git a/src/main/java/com/github/appreciated/apexcharts/config/xaxis/TickPlacement.java b/src/main/java/com/github/appreciated/apexcharts/config/xaxis/TickPlacement.java
@@ -0,0 +1,11 @@
+package com.github.appreciated.apexcharts.config.xaxis;
+
+public enum TickPlacement {
+    between("between"),
+    on("on");
+    private final String name;
+
+    TickPlacement(String name) {
+        this.name = name;
+    }
+}
diff --git a/src/test/java/com/github/appreciated/apexcharts/examples/line/LineChartExample.java b/src/test/java/com/github/appreciated/apexcharts/examples/line/LineChartExample.java
@@ -9,6 +9,7 @@
 import com.github.appreciated.apexcharts.config.chart.builder.ZoomBuilder;
 import com.github.appreciated.apexcharts.config.grid.builder.RowBuilder;
 import com.github.appreciated.apexcharts.config.stroke.Curve;
+import com.github.appreciated.apexcharts.config.xaxis.TickPlacement;
 import com.github.appreciated.apexcharts.helper.Series;
 
 public class LineChartExample extends ApexChartsBuilder {
@@ -29,6 +30,7 @@ public LineChartExample() {
                         ).build())
                 .withXaxis(XAxisBuilder.get()
                         .withCategories("Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep")
+                        .withTickPlacement(TickPlacement.between)
                         .build())
                 .withSeries(new Series<>("Desktops", 10.0, 41.0, 35.0, 51.0, 49.0, 62.0, 69.0, 91.0, 148.0));
     }