Create ir-compose module

ComposeGears · Jan 20, 2025 · dda0c4c · dda0c4c
1 parent 97dfd45
commit dda0c4c
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 7 deletions.
diff --git a/components/ir-compose/build.gradle.kts b/components/ir-compose/build.gradle.kts
@@ -0,0 +1,12 @@
+plugins {
+    alias(libs.plugins.kotlin.jvm)
+    alias(libs.plugins.kotlin.compose)
+    alias(libs.plugins.jetbrains.compose)
+}
+
+dependencies {
+    api(projects.components.ir)
+
+    implementation(compose.material3)
+    implementation(compose.ui)
+}
diff --git a/...rie/parser/ktfile/util/IrToImageVector.kt → ...rs/valkyrie/ir/compose/IrToImageVector.kt b/...rie/parser/ktfile/util/IrToImageVector.kt → ...rs/valkyrie/ir/compose/IrToImageVector.kt
@@ -1,4 +1,4 @@
-package io.github.composegears.valkyrie.parser.ktfile.util
+package io.github.composegears.valkyrie.ir.compose
 
 import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.graphics.Brush

diff --git a/components/parser/ktfile/build.gradle.kts b/components/parser/ktfile/build.gradle.kts
@@ -17,7 +17,7 @@ sourceSets {
 
 dependencies {
     implementation(projects.components.extensions)
-    implementation(projects.components.ir)
+    implementation(projects.components.irCompose)
     implementation(projects.components.psi.imagevector)
 
     implementation(compose.material3)

diff --git a/...rc/main/kotlin/io/github/composegears/valkyrie/parser/ktfile/KtFileToImageVectorParser.kt b/...rc/main/kotlin/io/github/composegears/valkyrie/parser/ktfile/KtFileToImageVectorParser.kt
@@ -1,7 +1,7 @@
 package io.github.composegears.valkyrie.parser.ktfile
 
 import androidx.compose.ui.graphics.vector.ImageVector
-import io.github.composegears.valkyrie.parser.ktfile.util.toComposeImageVector
+import io.github.composegears.valkyrie.ir.compose.toComposeImageVector
 import io.github.composegears.valkyrie.psi.imagevector.ImageVectorPsiParser
 import org.jetbrains.kotlin.psi.KtFile
 

diff --git a/idea-plugin/build.gradle.kts b/idea-plugin/build.gradle.kts
@@ -12,13 +12,15 @@ dependencies {
     implementation(projects.components.extensions)
     implementation(projects.components.generator.iconpack)
     implementation(projects.components.generator.imagevector)
-    implementation(projects.components.ir)
+    implementation(projects.components.irCompose)
     implementation(projects.components.parser.ktfile)
     implementation(projects.components.parser.svgxml)
     implementation(projects.components.psi.iconpack)
     implementation(projects.components.psi.imagevector)
 
-    compileOnly(compose.desktop.currentOs)
+    compileOnly(compose.desktop.currentOs) {
+        exclude(group = "org.jetbrains.compose.material")
+    }
     implementation(compose.desktop.common)
     implementation(compose.desktop.linux_arm64)
     implementation(compose.desktop.linux_x64)

diff --git a/...ithub/composegears/valkyrie/ui/foundation/components/previewer/ImageVectorPreviewPanel.kt b/...ithub/composegears/valkyrie/ui/foundation/components/previewer/ImageVectorPreviewPanel.kt
@@ -25,7 +25,7 @@ import androidx.compose.ui.unit.min
 import androidx.compose.ui.unit.times
 import io.github.composegears.valkyrie.ir.IR_STUB
 import io.github.composegears.valkyrie.ir.IrImageVector
-import io.github.composegears.valkyrie.parser.ktfile.util.toComposeImageVector
+import io.github.composegears.valkyrie.ir.compose.toComposeImageVector
 import io.github.composegears.valkyrie.ui.foundation.VerticalSpacer
 import io.github.composegears.valkyrie.ui.foundation.previewbg.BgType.PixelGrid
 import io.github.composegears.valkyrie.ui.foundation.previewbg.PreviewBackground

diff --git a/...ub/composegears/valkyrie/ui/screen/mode/iconpack/conversion/ui/batch/ui/IconPreviewBox.kt b/...ub/composegears/valkyrie/ui/screen/mode/iconpack/conversion/ui/batch/ui/IconPreviewBox.kt
@@ -19,7 +19,7 @@ import androidx.compose.ui.input.pointer.pointerInput
 import androidx.compose.ui.unit.dp
 import io.github.composegears.valkyrie.ir.IR_STUB
 import io.github.composegears.valkyrie.ir.IrImageVector
-import io.github.composegears.valkyrie.parser.ktfile.util.toComposeImageVector
+import io.github.composegears.valkyrie.ir.compose.toComposeImageVector
 import io.github.composegears.valkyrie.ui.foundation.previewbg.BgType
 import io.github.composegears.valkyrie.ui.foundation.previewbg.PreviewBackground
 import io.github.composegears.valkyrie.ui.foundation.theme.PreviewTheme

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -52,6 +52,7 @@ include("components:generator:common")
 include("components:generator:iconpack")
 include("components:generator:imagevector")
 include("components:ir")
+include("components:ir-compose")
 include("components:parser:ktfile")
 include("components:parser:svgxml")
 include("components:psi:iconpack")