wttech · kamil-orwat-vmltech · Apr 29, 2025 · Apr 29, 2025 · Apr 30, 2025 · Apr 30, 2025
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/code/ArgumentType.java b/core/src/main/java/com/vml/es/aem/acm/core/code/ArgumentType.java
@@ -8,5 +8,7 @@ public enum ArgumentType {
     STRING,
     TEXT,
     SELECT,
-    MULTISELECT
+    MULTISELECT,
+    COLOR,
+    NUMBER_RANGE
 }
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/code/Arguments.java b/core/src/main/java/com/vml/es/aem/acm/core/code/Arguments.java
@@ -145,6 +145,32 @@ public void integerNumber(String name, Closure<IntegerArgument> options) {
         add(argument);
     }
 
+    public void color(String name) {
+        color(name, null);
+    }
+
+    public void color(String name, Closure<ColorArgument> options) {
+        ColorArgument argument = new ColorArgument(name);
+        GroovyUtils.with(argument, options);
+        add(argument);
+    }
+
+    public void integerRange(String name, Closure<IntegerRangeArgument> options) {
+        IntegerRangeArgument argument = new IntegerRangeArgument(name);
+        GroovyUtils.with(argument, options);
+        add(argument);
+    }
+
+    public void decimalRange(String name) {
+        decimalRange(name, null);
+    }
+
+    public void decimalRange(String name, Closure<DecimalRangeArgument> options) {
+        DecimalRangeArgument argument = new DecimalRangeArgument(name);
+        GroovyUtils.with(argument, options);
+        add(argument);
+    }
+
     public void decimalNumber(String name) {
         decimalNumber(name, null);
     }

diff --git a/core/src/main/java/com/vml/es/aem/acm/core/code/arg/ColorArgument.java b/core/src/main/java/com/vml/es/aem/acm/core/code/arg/ColorArgument.java
@@ -0,0 +1,56 @@
+package com.vml.es.aem.acm.core.code.arg;
+
+import com.vml.es.aem.acm.core.code.Argument;
+import com.vml.es.aem.acm.core.code.ArgumentType;
+import java.util.Arrays;
+
+public class ColorArgument extends Argument<String> {
+    private ColorArgument.Format format = ColorArgument.Format.RGBA;
+
+    public ColorArgument(String name) {
+        super(name, ArgumentType.COLOR);
+    }
+
+    public Format getFormat() {
+        return format;
+    }
+
+    public void setFormat(String format) {
+        this.format = ColorArgument.Format.of(format);
+    }
+
+    public void setFormat(ColorArgument.Format format) {
+        this.format = format;
+    }
+
+    public void hex() {
+        this.format = ColorArgument.Format.HEX;
+    }
+
+    public void hsl() {
+        this.format = ColorArgument.Format.HSL;
+    }
+
+    public void rgba() {
+        this.format = ColorArgument.Format.RGBA;
+    }
+
+    public void hsb() {
+        this.format = ColorArgument.Format.HSB;
+    }
+
+    public enum Format {
+        HEX,
+        HSL,
+        RGBA,
+        HSB;
+
+        public static ColorArgument.Format of(String name) {
+            return Arrays.stream(ColorArgument.Format.values())
+                    .filter(r -> r.name().equalsIgnoreCase(name))
+                    .findFirst()
+                    .orElseThrow(() ->
+                            new IllegalArgumentException(String.format("Color format '%s' is not supported!", name)));
+        }
+    }
+}
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/code/arg/DecimalArgument.java b/core/src/main/java/com/vml/es/aem/acm/core/code/arg/DecimalArgument.java
@@ -3,13 +3,18 @@
 import com.vml.es.aem.acm.core.code.Argument;
 import com.vml.es.aem.acm.core.code.ArgumentType;
 import java.math.BigDecimal;
+import java.util.Arrays;
 
 public class DecimalArgument extends Argument<BigDecimal> {
 
     private BigDecimal min;
 
     private BigDecimal max;
 
+    private Display display = Display.INPUT;
+
+    private BigDecimal step;
+
     public DecimalArgument(String name) {
         super(name, ArgumentType.DECIMAL);
     }
@@ -29,4 +34,43 @@ public BigDecimal getMax() {
     public void setMax(BigDecimal max) {
         this.max = max;
     }
+
+    public void input() {
+        this.display = Display.INPUT;
+    }
+
+    public void slider() {
+        this.display = Display.SLIDER;
+    }
+
+    public void slider(BigDecimal min, BigDecimal max) {
+        this.display = Display.SLIDER;
+        this.min = min;
+        this.max = max;
+    }
+
+    public Display getDisplay() {
+        return display;
+    }
+
+    public BigDecimal getStep() {
+        return step;
+    }
+
+    public void setStep(BigDecimal step) {
+        this.step = step;
+    }
+
+    public enum Display {
+        INPUT,
+        SLIDER;
+
+        public static DecimalArgument.Display of(String name) {
+            return Arrays.stream(DecimalArgument.Display.values())
+                    .filter(r -> r.name().equalsIgnoreCase(name))
+                    .findFirst()
+                    .orElseThrow(() -> new IllegalArgumentException(
+                            String.format("Decimal argument cannot be displayed as '%s'!", name)));
+        }
+    }
 }
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/code/arg/DecimalRangeArgument.java b/core/src/main/java/com/vml/es/aem/acm/core/code/arg/DecimalRangeArgument.java
@@ -0,0 +1,51 @@
+package com.vml.es.aem.acm.core.code.arg;
+
+import com.vml.es.aem.acm.core.code.Argument;
+import com.vml.es.aem.acm.core.code.ArgumentType;
+import com.vml.es.aem.acm.core.util.RangeArgumentObject;
+import java.math.BigDecimal;
+import java.util.List;
+
+public class DecimalRangeArgument extends Argument<RangeArgumentObject<BigDecimal>> {
+    private BigDecimal min;
+
+    private BigDecimal max;
+
+    private BigDecimal step;
+
+    public DecimalRangeArgument(String name) {
+        super(name, ArgumentType.NUMBER_RANGE);
+    }
+
+    public void setValue(List<BigDecimal> value) {
+        if (value.size() != 2) {
+            throw new IllegalArgumentException(
+                    String.format("Range value must be a list of two elements but specified '%s'!", value));
+        }
+        super.setValue(new RangeArgumentObject<>(value.get(0), value.get(1)));
+    }
+
+    public BigDecimal getMin() {
+        return min;
+    }
+
+    public void setMin(BigDecimal min) {
+        this.min = min;
+    }
+
+    public BigDecimal getStep() {
+        return step;
+    }
+
+    public void setStep(BigDecimal step) {
+        this.step = step;
+    }
+
+    public BigDecimal getMax() {
+        return max;
+    }
+
+    public void setMax(BigDecimal max) {
+        this.max = max;
+    }
+}
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/code/arg/IntegerArgument.java b/core/src/main/java/com/vml/es/aem/acm/core/code/arg/IntegerArgument.java
@@ -2,13 +2,18 @@
 
 import com.vml.es.aem.acm.core.code.Argument;
 import com.vml.es.aem.acm.core.code.ArgumentType;
+import java.util.Arrays;
 
 public class IntegerArgument extends Argument<Integer> {
 
     private Integer min;
 
     private Integer max;
 
+    private Display display = Display.INPUT;
+
+    private Integer step;
+
     public IntegerArgument(String name) {
         super(name, ArgumentType.INTEGER);
     }
@@ -28,4 +33,43 @@ public Integer getMax() {
     public void setMax(Integer max) {
         this.max = max;
     }
+
+    public void input() {
+        this.display = Display.INPUT;
+    }
+
+    public void slider() {
+        this.display = Display.SLIDER;
+    }
+
+    public void slider(Integer min, Integer max) {
+        this.display = Display.SLIDER;
+        this.min = min;
+        this.max = max;
+    }
+
+    public Display getDisplay() {
+        return display;
+    }
+
+    public Integer getStep() {
+        return step;
+    }
+
+    public void setStep(Integer step) {
+        this.step = step;
+    }
+
+    public enum Display {
+        INPUT,
+        SLIDER;
+
+        public static IntegerArgument.Display of(String name) {
+            return Arrays.stream(IntegerArgument.Display.values())
+                    .filter(r -> r.name().equalsIgnoreCase(name))
+                    .findFirst()
+                    .orElseThrow(() -> new IllegalArgumentException(
+                            String.format("Decimal argument cannot be displayed as '%s'!", name)));
+        }
+    }
 }
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/code/arg/IntegerRangeArgument.java b/core/src/main/java/com/vml/es/aem/acm/core/code/arg/IntegerRangeArgument.java
@@ -0,0 +1,50 @@
+package com.vml.es.aem.acm.core.code.arg;
+
+import com.vml.es.aem.acm.core.code.Argument;
+import com.vml.es.aem.acm.core.code.ArgumentType;
+import com.vml.es.aem.acm.core.util.RangeArgumentObject;
+import java.util.List;
+
+public class IntegerRangeArgument extends Argument<RangeArgumentObject<Integer>> {
+    private Integer min;
+
+    private Integer max;
+
+    private Integer step;
+
+    public IntegerRangeArgument(String name) {
+        super(name, ArgumentType.NUMBER_RANGE);
+    }
+
+    public void setValue(List<Integer> value) {
+        if (value.size() != 2) {
+            throw new IllegalArgumentException(
+                    String.format("Range value must be a list of two elements but specified '%s'!", value));
+        }
+        super.setValue(new RangeArgumentObject<>(value.get(0), value.get(1)));
+    }
+
+    public Integer getMin() {
+        return min;
+    }
+
+    public void setMin(Integer min) {
+        this.min = min;
+    }
+
+    public Integer getStep() {
+        return step;
+    }
+
+    public void setStep(Integer step) {
+        this.step = step;
+    }
+
+    public Integer getMax() {
+        return max;
+    }
+
+    public void setMax(Integer max) {
+        this.max = max;
+    }
+}
diff --git a/core/src/main/java/com/vml/es/aem/acm/core/util/RangeArgumentObject.java b/core/src/main/java/com/vml/es/aem/acm/core/util/RangeArgumentObject.java
@@ -0,0 +1,30 @@
+package com.vml.es.aem.acm.core.util;
+
+import java.io.Serializable;
+
+public class RangeArgumentObject<T extends Comparable<T>> implements Serializable {
+    private T start;
+
+    private T end;
+
+    public RangeArgumentObject(T start, T end) {
+        this.start = start;
+        this.end = end;
+    }
+
+    public T getStart() {
+        return start;
+    }
+
+    public void setStart(T start) {
+        this.start = start;
+    }
+
+    public T getEnd() {
+        return end;
+    }
+
+    public void setEnd(T end) {
+        this.end = end;
+    }
+}
diff --git a/...ent/src/main/content/jcr_root/conf/acm/settings/snippet/available/core/argument/color.yml b/...ent/src/main/content/jcr_root/conf/acm/settings/snippet/available/core/argument/color.yml
@@ -0,0 +1,12 @@
+group: Argument
+name: argument_color
+content: |
+  args.color("${1:name}") { label = "${2:label}"; value = ${3:value} }
+documentation: |
+    An argument that allows to choose a value from color picker.<br>
+    It returns a string with the color in selected format, RGBA is the default<br>
+    <br>
+    **Example**:<br>
+    ```groovy
+    args.color("color") { label = "background color"; value = "#ff0000"; hex() }
+    ```
diff --git a/...t/src/main/content/jcr_root/conf/acm/settings/snippet/available/core/argument/decimal.yml b/...t/src/main/content/jcr_root/conf/acm/settings/snippet/available/core/argument/decimal.yml
@@ -1,12 +1,13 @@
 group: Argument
 name: argument_decimal
 content: |
-  args.decimalNumber("${1:name}") { label = "${2:label}"; value = "${3:value}" }
+  args.decimalNumber("${1:name}") { label = "${2:label}"; value = ${3:value} }
 documentation: |
   An argument holding a decimal number value.<br>
-
-  For example:
+  can be displayed as an input and slider.<br>
+  **Example**:<br>
   ```groovy
   args.decimalNumber("discount") { label = "Discount (%)"; value = 15.5 }
   args.decimalNumber("weight") { label = "Weight (kg)"; value = 75.3 }
-  ```
+  args.decimalNumber("proportion") { label = "Proportion"; value = 20.00; min = 10.00; max = 60.00; step = 0.5; slider() }
+  ```