Skip to content

Commit 5181c03

Browse files
egorikftpegorikftp
committed
Move ir-* modules into sdk
1 parent e8df354 commit 5181c03

File tree

108 files changed

+1287
-1249
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

108 files changed

+1287
-1249
lines changed

‎components/generator/jvm/imagevector/api/imagevector.api‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public final class io/github/composegears/valkyrie/generator/jvm/imagevector/Ful
2222

2323
public final class io/github/composegears/valkyrie/generator/jvm/imagevector/ImageVectorGenerator {
2424
public static final field INSTANCE Lio/github/composegears/valkyrie/generator/jvm/imagevector/ImageVectorGenerator;
25-
public final fun convert (Lio/github/composegears/valkyrie/ir/IrImageVector;Ljava/lang/String;Lio/github/composegears/valkyrie/generator/jvm/imagevector/ImageVectorGeneratorConfig;)Lio/github/composegears/valkyrie/generator/jvm/imagevector/ImageVectorSpecOutput;
25+
public final fun convert (Lio/github/composegears/valkyrie/sdk/ir/core/IrImageVector;Ljava/lang/String;Lio/github/composegears/valkyrie/generator/jvm/imagevector/ImageVectorGeneratorConfig;)Lio/github/composegears/valkyrie/generator/jvm/imagevector/ImageVectorSpecOutput;
2626
}
2727

2828
public final class io/github/composegears/valkyrie/generator/jvm/imagevector/ImageVectorGeneratorConfig {

‎components/generator/jvm/imagevector/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ kotlin {
1818

1919
dependencies {
2020
implementation(projects.sdk.core.extensions)
21+
implementation(projects.sdk.ir.core)
2122
api(projects.components.generator.jvm.poetExtensions)
2223
api(projects.components.generator.core)
23-
implementation(projects.components.ir)
2424

2525
implementation(libs.kotlinpoet)
2626

‎components/generator/jvm/imagevector/src/main/kotlin/io/github/composegears/valkyrie/generator/jvm/imagevector/ImageVectorFileSpec.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import io.github.composegears.valkyrie.generator.jvm.imagevector.OutputFormat.Ba
44
import io.github.composegears.valkyrie.generator.jvm.imagevector.OutputFormat.LazyProperty
55
import io.github.composegears.valkyrie.generator.jvm.imagevector.spec.BackingPropertySpec
66
import io.github.composegears.valkyrie.generator.jvm.imagevector.spec.LazyPropertySpec
7-
import io.github.composegears.valkyrie.ir.IrImageVector
7+
import io.github.composegears.valkyrie.sdk.ir.core.IrImageVector
88

99
internal data class ImageVectorSpecConfig(
1010
val iconName: String,

‎components/generator/jvm/imagevector/src/main/kotlin/io/github/composegears/valkyrie/generator/jvm/imagevector/ImageVectorGenerator.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package io.github.composegears.valkyrie.generator.jvm.imagevector
22

3-
import io.github.composegears.valkyrie.ir.IrImageVector
3+
import io.github.composegears.valkyrie.sdk.ir.core.IrImageVector
44

55
data class ImageVectorGeneratorConfig(
66
val packageName: String,

‎components/generator/jvm/imagevector/src/main/kotlin/io/github/composegears/valkyrie/generator/jvm/imagevector/spec/BackingPropertySpec.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import io.github.composegears.valkyrie.generator.jvm.imagevector.ImageVectorSpec
1414
import io.github.composegears.valkyrie.generator.jvm.imagevector.util.ClassNames
1515
import io.github.composegears.valkyrie.generator.jvm.imagevector.util.backingPropertyName
1616
import io.github.composegears.valkyrie.generator.jvm.imagevector.util.backingPropertySpec
17-
import io.github.composegears.valkyrie.ir.IrImageVector
17+
import io.github.composegears.valkyrie.sdk.ir.core.IrImageVector
1818

1919
internal class BackingPropertySpec(private val config: ImageVectorSpecConfig) {
2020

‎components/generator/jvm/imagevector/src/main/kotlin/io/github/composegears/valkyrie/generator/jvm/imagevector/spec/Common.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import io.github.composegears.valkyrie.generator.jvm.imagevector.util.addPath
99
import io.github.composegears.valkyrie.generator.jvm.imagevector.util.iconPreviewSpec
1010
import io.github.composegears.valkyrie.generator.jvm.imagevector.util.iconPreviewSpecForNestedPack
1111
import io.github.composegears.valkyrie.generator.jvm.imagevector.util.imageVectorBuilderSpecs
12-
import io.github.composegears.valkyrie.ir.IrImageVector
13-
import io.github.composegears.valkyrie.ir.IrVectorNode
12+
import io.github.composegears.valkyrie.sdk.ir.core.IrImageVector
13+
import io.github.composegears.valkyrie.sdk.ir.core.IrVectorNode
1414

1515
internal fun ImageVectorSpecConfig.resolvePackageName(): String = when {
1616
iconNestedPack.isEmpty() -> iconPackage

‎components/generator/jvm/imagevector/src/main/kotlin/io/github/composegears/valkyrie/generator/jvm/imagevector/spec/LazyPropertySpec.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import io.github.composegears.valkyrie.generator.jvm.ext.setIndent
1111
import io.github.composegears.valkyrie.generator.jvm.imagevector.ImageVectorSpecConfig
1212
import io.github.composegears.valkyrie.generator.jvm.imagevector.ImageVectorSpecOutput
1313
import io.github.composegears.valkyrie.generator.jvm.imagevector.util.ClassNames
14-
import io.github.composegears.valkyrie.ir.IrImageVector
14+
import io.github.composegears.valkyrie.sdk.ir.core.IrImageVector
1515

1616
internal class LazyPropertySpec(private val config: ImageVectorSpecConfig) {
1717

‎components/generator/jvm/imagevector/src/main/kotlin/io/github/composegears/valkyrie/generator/jvm/imagevector/spec/PathNodeSpec.kt‎

Lines changed: 30 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,26 @@
11
package io.github.composegears.valkyrie.generator.jvm.imagevector.spec
22

33
import io.github.composegears.valkyrie.generator.core.formatFloat
4-
import io.github.composegears.valkyrie.ir.IrPathNode
5-
import io.github.composegears.valkyrie.ir.IrPathNode.Close
6-
import io.github.composegears.valkyrie.ir.IrPathNode.HorizontalTo
7-
import io.github.composegears.valkyrie.ir.IrPathNode.LineTo
8-
import io.github.composegears.valkyrie.ir.IrPathNode.MoveTo
9-
import io.github.composegears.valkyrie.ir.IrPathNode.RelativeHorizontalTo
10-
import io.github.composegears.valkyrie.ir.IrPathNode.RelativeLineTo
11-
import io.github.composegears.valkyrie.ir.IrPathNode.RelativeMoveTo
12-
import io.github.composegears.valkyrie.ir.IrPathNode.RelativeVerticalTo
13-
import io.github.composegears.valkyrie.ir.IrPathNode.VerticalTo
4+
import io.github.composegears.valkyrie.sdk.ir.core.IrPathNode
5+
import io.github.composegears.valkyrie.sdk.ir.core.IrPathNode.ArcTo
6+
import io.github.composegears.valkyrie.sdk.ir.core.IrPathNode.Close
7+
import io.github.composegears.valkyrie.sdk.ir.core.IrPathNode.CurveTo
8+
import io.github.composegears.valkyrie.sdk.ir.core.IrPathNode.HorizontalTo
9+
import io.github.composegears.valkyrie.sdk.ir.core.IrPathNode.LineTo
10+
import io.github.composegears.valkyrie.sdk.ir.core.IrPathNode.MoveTo
11+
import io.github.composegears.valkyrie.sdk.ir.core.IrPathNode.QuadTo
12+
import io.github.composegears.valkyrie.sdk.ir.core.IrPathNode.ReflectiveCurveTo
13+
import io.github.composegears.valkyrie.sdk.ir.core.IrPathNode.ReflectiveQuadTo
14+
import io.github.composegears.valkyrie.sdk.ir.core.IrPathNode.RelativeArcTo
15+
import io.github.composegears.valkyrie.sdk.ir.core.IrPathNode.RelativeCurveTo
16+
import io.github.composegears.valkyrie.sdk.ir.core.IrPathNode.RelativeHorizontalTo
17+
import io.github.composegears.valkyrie.sdk.ir.core.IrPathNode.RelativeLineTo
18+
import io.github.composegears.valkyrie.sdk.ir.core.IrPathNode.RelativeMoveTo
19+
import io.github.composegears.valkyrie.sdk.ir.core.IrPathNode.RelativeQuadTo
20+
import io.github.composegears.valkyrie.sdk.ir.core.IrPathNode.RelativeReflectiveCurveTo
21+
import io.github.composegears.valkyrie.sdk.ir.core.IrPathNode.RelativeReflectiveQuadTo
22+
import io.github.composegears.valkyrie.sdk.ir.core.IrPathNode.RelativeVerticalTo
23+
import io.github.composegears.valkyrie.sdk.ir.core.IrPathNode.VerticalTo
1424

1525
internal fun IrPathNode.asStatement(): String = when (this) {
1626
is Close -> "close()"
@@ -22,30 +32,30 @@ internal fun IrPathNode.asStatement(): String = when (this) {
2232
is HorizontalTo -> "horizontalLineTo(${x.formatFloat()})"
2333
is RelativeVerticalTo -> "verticalLineToRelative(${y.formatFloat()})"
2434
is VerticalTo -> "verticalLineTo(${y.formatFloat()})"
25-
is IrPathNode.RelativeCurveTo -> {
35+
is RelativeCurveTo -> {
2636
"curveToRelative(${dx1.formatFloat()}, ${dy1.formatFloat()}, ${dx2.formatFloat()}, ${dy2.formatFloat()}, ${dx3.formatFloat()}, ${dy3.formatFloat()})"
2737
}
28-
is IrPathNode.CurveTo -> {
38+
is CurveTo -> {
2939
"curveTo(${x1.formatFloat()}, ${y1.formatFloat()}, ${x2.formatFloat()}, ${y2.formatFloat()}, ${x3.formatFloat()}, ${y3.formatFloat()})"
3040
}
31-
is IrPathNode.RelativeReflectiveCurveTo -> {
41+
is RelativeReflectiveCurveTo -> {
3242
"reflectiveCurveToRelative(${x1.formatFloat()}, ${y1.formatFloat()}, ${x2.formatFloat()}, ${y2.formatFloat()})"
3343
}
34-
is IrPathNode.ReflectiveCurveTo -> {
44+
is ReflectiveCurveTo -> {
3545
"reflectiveCurveTo(${x1.formatFloat()}, ${y1.formatFloat()}, ${x2.formatFloat()}, ${y2.formatFloat()})"
3646
}
37-
is IrPathNode.RelativeQuadTo -> {
47+
is RelativeQuadTo -> {
3848
"quadToRelative(${x1.formatFloat()}, ${y1.formatFloat()}, ${x2.formatFloat()}, ${y2.formatFloat()})"
3949
}
40-
is IrPathNode.QuadTo -> {
50+
is QuadTo -> {
4151
"quadTo(${x1.formatFloat()}, ${y1.formatFloat()}, ${x2.formatFloat()}, ${y2.formatFloat()})"
4252
}
43-
is IrPathNode.RelativeReflectiveQuadTo -> "reflectiveQuadToRelative(${x.formatFloat()}, ${y.formatFloat()})"
44-
is IrPathNode.ReflectiveQuadTo -> "reflectiveQuadTo(${x.formatFloat()}, ${y.formatFloat()})"
45-
is IrPathNode.RelativeArcTo -> {
53+
is RelativeReflectiveQuadTo -> "reflectiveQuadToRelative(${x.formatFloat()}, ${y.formatFloat()})"
54+
is ReflectiveQuadTo -> "reflectiveQuadTo(${x.formatFloat()}, ${y.formatFloat()})"
55+
is RelativeArcTo -> {
4656
"arcToRelative(${horizontalEllipseRadius.formatFloat()}, ${verticalEllipseRadius.formatFloat()}, ${theta.formatFloat()}, isMoreThanHalf = $isMoreThanHalf, isPositiveArc = $isPositiveArc, ${arcStartDx.formatFloat()}, ${arcStartDy.formatFloat()})"
4757
}
48-
is IrPathNode.ArcTo -> {
58+
is ArcTo -> {
4959
"arcTo(${horizontalEllipseRadius.formatFloat()}, ${verticalEllipseRadius.formatFloat()}, ${theta.formatFloat()}, isMoreThanHalf = $isMoreThanHalf, isPositiveArc = $isPositiveArc, ${arcStartX.formatFloat()}, ${arcStartY.formatFloat()})"
5060
}
5161
}

‎components/generator/jvm/imagevector/src/main/kotlin/io/github/composegears/valkyrie/generator/jvm/imagevector/util/GroupBuilder.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ import io.github.composegears.valkyrie.generator.jvm.imagevector.util.GroupParam
1818
import io.github.composegears.valkyrie.generator.jvm.imagevector.util.GroupParams.ScaleYParam
1919
import io.github.composegears.valkyrie.generator.jvm.imagevector.util.GroupParams.TranslationXParam
2020
import io.github.composegears.valkyrie.generator.jvm.imagevector.util.GroupParams.TranslationYParam
21-
import io.github.composegears.valkyrie.ir.IrPathNode
22-
import io.github.composegears.valkyrie.ir.IrVectorNode
21+
import io.github.composegears.valkyrie.sdk.ir.core.IrPathNode
22+
import io.github.composegears.valkyrie.sdk.ir.core.IrVectorNode
2323

2424
context(config: ImageVectorSpecConfig)
2525
internal fun CodeBlock.Builder.addGroup(

‎components/generator/jvm/imagevector/src/main/kotlin/io/github/composegears/valkyrie/generator/jvm/imagevector/util/ImageVectorBuilderSpec.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import io.github.composegears.valkyrie.generator.core.trimTrailingZero
88
import io.github.composegears.valkyrie.generator.jvm.ext.newLine
99
import io.github.composegears.valkyrie.generator.jvm.ext.trailingComma
1010
import io.github.composegears.valkyrie.generator.jvm.imagevector.ImageVectorSpecConfig
11-
import io.github.composegears.valkyrie.ir.IrImageVector
11+
import io.github.composegears.valkyrie.sdk.ir.core.IrImageVector
1212

1313
context(config: ImageVectorSpecConfig)
1414
internal fun imageVectorBuilderSpecs(

0 commit comments

Comments
 (0)