[Gradle] Introduce ImageVector generation configuration, enhance task structure

Author: egorikftp

README.md

@@ -408,17 +408,32 @@ valkyrie {
   // Example: src/commonMain/valkyrieResources/, src/androidMain/valkyrieResources/
   resourceDirectoryName = "valkyrieResources"
 
-  // Optional: Output format for generated ImageVectors (default: BackingProperty)
-  outputFormat = OutputFormat.BackingProperty // or OutputFormat.LazyProperty
-
-  // Optional: Code generation settings
-  useComposeColors = true // Use androidx.compose.ui.graphics.Color (default: true)
-  generatePreview = false // Generate @Preview composable functions (default: false)
-  previewAnnotationType = PreviewAnnotationType.AndroidX // AndroidX or Jetbrains (default: AndroidX)
-  useFlatPackage = false // Generate flat package structure without subfolders (default: false)
-  useExplicitMode = false // Add explicit visibility modifiers (default: false)
-  addTrailingComma = false // Add trailing commas in generated code (default: false)
-  indentSize = 4 // Number of spaces for indentation (default: 4)
+  // Optional: Generate flat package structure without subfolders (default: false)
+  useFlatPackage = false
+
+  // Optional: ImageVector generation configuration
+  imageVector {
+    // Output format for generated ImageVectors (default: BackingProperty)
+    outputFormat = OutputFormat.BackingProperty // or OutputFormat.LazyProperty
+
+    // Use predefined Compose colors instead of hex color codes (e.g. Color.Black instead of Color(0xFF000000)) (default: true)
+    useComposeColors = true
+
+    // Generate `@Preview` function for ImageVector (default: false)
+    generatePreview = false
+
+    // Specifies the type of Preview annotation to generate for @Preview
+    previewAnnotationType = PreviewAnnotationType.AndroidX
+
+    // Add explicit `public` modifier to generated declarations (default: false)
+    useExplicitMode = false
+
+    // Insert a trailing comma after the last element of ImageVector.Builder block and path params (default: false)
+    addTrailingComma = false
+
+    // Number of spaces used for each level of indentation in generated code (default: 4)
+    indentSize = 4
+  }
 
   // Optional: Custom output directory (default: build/generated/sources/valkyrie)
   outputDirectory = layout.buildDirectory.dir("generated/valkyrie")

tools/gradle-plugin/api/gradle-plugin.api

@@ -1,36 +1,24 @@
-public abstract class io/github/composegears/valkyrie/gradle/GenerateImageVectorsTask : org/gradle/api/DefaultTask {
-	public fun <init> ()V
-	public final fun execute ()V
-	public abstract fun getAddTrailingComma ()Lorg/gradle/api/provider/Property;
-	public abstract fun getGeneratePreview ()Lorg/gradle/api/provider/Property;
-	public abstract fun getIconFiles ()Lorg/gradle/api/file/ConfigurableFileCollection;
-	public abstract fun getIconPackName ()Lorg/gradle/api/provider/Property;
-	public abstract fun getIndentSize ()Lorg/gradle/api/provider/Property;
-	public abstract fun getNestedPackName ()Lorg/gradle/api/provider/Property;
-	public abstract fun getOutputDirectory ()Lorg/gradle/api/file/DirectoryProperty;
-	public abstract fun getOutputFormat ()Lorg/gradle/api/provider/Property;
-	public abstract fun getPackageName ()Lorg/gradle/api/provider/Property;
-	public abstract fun getPreviewAnnotationType ()Lorg/gradle/api/provider/Property;
-	public abstract fun getUseComposeColors ()Lorg/gradle/api/provider/Property;
-	public abstract fun getUseExplicitMode ()Lorg/gradle/api/provider/Property;
-	public abstract fun getUseFlatPackage ()Lorg/gradle/api/provider/Property;
+public abstract class io/github/composegears/valkyrie/gradle/ImageVectorConfigExtension {
+	public fun <init> (Lorg/gradle/api/model/ObjectFactory;)V
+	public final fun getAddTrailingComma ()Lorg/gradle/api/provider/Property;
+	public final fun getGeneratePreview ()Lorg/gradle/api/provider/Property;
+	public final fun getIndentSize ()Lorg/gradle/api/provider/Property;
+	public final fun getOutputFormat ()Lorg/gradle/api/provider/Property;
+	public final fun getPreviewAnnotationType ()Lorg/gradle/api/provider/Property;
+	public final fun getUseComposeColors ()Lorg/gradle/api/provider/Property;
+	public final fun getUseExplicitMode ()Lorg/gradle/api/provider/Property;
 }
 
-public abstract interface class io/github/composegears/valkyrie/gradle/ValkyrieExtension {
-	public abstract fun getAddTrailingComma ()Lorg/gradle/api/provider/Property;
-	public abstract fun getGenerateAtSync ()Lorg/gradle/api/provider/Property;
-	public abstract fun getGeneratePreview ()Lorg/gradle/api/provider/Property;
-	public abstract fun getIconPackName ()Lorg/gradle/api/provider/Property;
-	public abstract fun getIndentSize ()Lorg/gradle/api/provider/Property;
-	public abstract fun getNestedPackName ()Lorg/gradle/api/provider/Property;
-	public abstract fun getOutputDirectory ()Lorg/gradle/api/file/DirectoryProperty;
-	public abstract fun getOutputFormat ()Lorg/gradle/api/provider/Property;
-	public abstract fun getPackageName ()Lorg/gradle/api/provider/Property;
-	public abstract fun getPreviewAnnotationType ()Lorg/gradle/api/provider/Property;
-	public abstract fun getResourceDirectoryName ()Lorg/gradle/api/provider/Property;
-	public abstract fun getUseComposeColors ()Lorg/gradle/api/provider/Property;
-	public abstract fun getUseExplicitMode ()Lorg/gradle/api/provider/Property;
-	public abstract fun getUseFlatPackage ()Lorg/gradle/api/provider/Property;
+public abstract class io/github/composegears/valkyrie/gradle/ValkyrieExtension {
+	public fun <init> (Lorg/gradle/api/model/ObjectFactory;)V
+	public final fun getGenerateAtSync ()Lorg/gradle/api/provider/Property;
+	public final fun getIconPackName ()Lorg/gradle/api/provider/Property;
+	public final fun getNestedPackName ()Lorg/gradle/api/provider/Property;
+	public final fun getOutputDirectory ()Lorg/gradle/api/file/DirectoryProperty;
+	public final fun getPackageName ()Lorg/gradle/api/provider/Property;
+	public final fun getResourceDirectoryName ()Lorg/gradle/api/provider/Property;
+	public final fun getUseFlatPackage ()Lorg/gradle/api/provider/Property;
+	public final fun imageVector (Lkotlin/jvm/functions/Function1;)V
 }
 
 public final class io/github/composegears/valkyrie/gradle/ValkyrieGradlePlugin : org/gradle/api/Plugin {

tools/gradle-plugin/src/main/kotlin/io/github/composegears/valkyrie/gradle/ImageVectorConfigExtension.kt

@@ -0,0 +1,83 @@
+package io.github.composegears.valkyrie.gradle
+
+import io.github.composegears.valkyrie.generator.jvm.imagevector.OutputFormat
+import io.github.composegears.valkyrie.generator.jvm.imagevector.PreviewAnnotationType
+import io.github.composegears.valkyrie.gradle.dsl.property
+import javax.inject.Inject
+import org.gradle.api.model.ObjectFactory
+import org.gradle.api.provider.Property
+
+abstract class ImageVectorConfigExtension @Inject constructor(objects: ObjectFactory) {
+    /**
+     * Specifies the output format for the generated ImageVector.
+     *
+     * Available options:
+     * - [OutputFormat.BackingProperty]: Uses backing property for the output.
+     * - [OutputFormat.LazyProperty]: Generates a lazy property representation.
+     *
+     * Default: [OutputFormat.BackingProperty]
+     */
+    val outputFormat: Property<OutputFormat> = objects
+        .property<OutputFormat>()
+        .convention(OutputFormat.BackingProperty)
+
+    /**
+     * Use predefined Compose colors instead of hex color codes (e.g. Color.Black instead of Color(0xFF000000))
+     *
+     * Default: `true`
+     */
+    val useComposeColors: Property<Boolean> = objects
+        .property<Boolean>()
+        .convention(true)
+
+    /**
+     * Generate `@Preview` function for ImageVector.
+     *
+     * Default: `false`
+     */
+    val generatePreview: Property<Boolean> = objects
+        .property<Boolean>()
+        .convention(false)
+
+    /**
+     * Specifies the type of Preview annotation to generate for @Preview.
+     *
+     * Available options:
+     * - [PreviewAnnotationType.AndroidX]: Use AndroidX Preview annotation
+     *   (`androidx.compose.ui.tooling.preview.Preview`).
+     * - [PreviewAnnotationType.Jetbrains]: Use JetBrains (Desktop) Preview annotation
+     *   (`androidx.compose.desktop.ui.tooling.preview.Preview`).
+     *
+     * Default: [PreviewAnnotationType.AndroidX]
+     */
+    val previewAnnotationType: Property<PreviewAnnotationType> = objects
+        .property<PreviewAnnotationType>()
+        .convention(PreviewAnnotationType.AndroidX)
+
+    /**
+     * Add explicit `public` modifier to generated declarations.
+     *
+     * Default: `false`
+     */
+    val useExplicitMode: Property<Boolean> = objects
+        .property<Boolean>()
+        .convention(false)
+
+    /**
+     * Insert a trailing comma after the last element of ImageVector.Builder block and path params.
+     *
+     * Default: `false`
+     */
+    val addTrailingComma: Property<Boolean> = objects
+        .property<Boolean>()
+        .convention(false)
+
+    /**
+     * Number of spaces used for each level of indentation in generated code.
+     *
+     * Default: `4`
+     */
+    val indentSize: Property<Int> = objects
+        .property<Int>()
+        .convention(4)
+}