Skip to content

Commit ced1f20

Browse files
egorikftpegorikftp
committed
Move :compose:core into :sdk:compose:foundation, update Spacer
1 parent da1e72f commit ced1f20

File tree

65 files changed

+196
-220
lines changed

Some content is hidden

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

65 files changed

+196
-220
lines changed

‎compose/codeviewer/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ plugins {
77
kotlin {
88
sourceSets {
99
commonMain.dependencies {
10-
implementation(projects.compose.core)
10+
implementation(projects.sdk.compose.foundation)
1111
implementation(projects.compose.ui)
1212
implementation(projects.compose.util)
1313

‎compose/codeviewer/src/commonMain/kotlin/io/github/composegears/valkyrie/compose/codeviewer/KotlinCodeViewer.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ import dev.snipme.highlights.Highlights
1212
import dev.snipme.highlights.model.SyntaxLanguage
1313
import dev.snipme.highlights.model.SyntaxThemes
1414
import io.github.composegears.valkyrie.compose.codeviewer.core.CodeEditor
15-
import io.github.composegears.valkyrie.compose.core.rememberMutableState
1615
import io.github.composegears.valkyrie.compose.util.isLight
16+
import io.github.composegears.valkyrie.sdk.compose.foundation.rememberMutableState
1717

1818
@Composable
1919
fun KotlinCodeViewer(

‎compose/codeviewer/src/commonMain/kotlin/io/github/composegears/valkyrie/compose/codeviewer/core/CodeEditor.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ import androidx.compose.ui.text.style.TextAlign
3636
import androidx.compose.ui.unit.dp
3737
import androidx.compose.ui.unit.sp
3838
import dev.snipme.highlights.Highlights
39-
import io.github.composegears.valkyrie.compose.core.rememberMutableIntState
40-
import io.github.composegears.valkyrie.compose.core.rememberMutableState
4139
import io.github.composegears.valkyrie.compose.ui.foundation.HorizontalScrollbar
4240
import io.github.composegears.valkyrie.compose.ui.foundation.VerticalScrollbar
4341
import io.github.composegears.valkyrie.compose.util.disabled
42+
import io.github.composegears.valkyrie.sdk.compose.foundation.rememberMutableIntState
43+
import io.github.composegears.valkyrie.sdk.compose.foundation.rememberMutableState
4444

4545
@Composable
4646
fun CodeEditor(

‎compose/core/api/core.klib.api‎

Lines changed: 0 additions & 28 deletions
This file was deleted.

‎compose/ui/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ plugins {
77
kotlin {
88
sourceSets {
99
commonMain.dependencies {
10-
implementation(projects.compose.core)
10+
implementation(projects.sdk.compose.foundation)
1111
implementation(projects.compose.util)
1212

1313
implementation(compose.material3)

‎compose/ui/src/commonMain/kotlin/io/github/composegears/valkyrie/compose/ui/InfoCard.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ import androidx.compose.ui.Modifier
1818
import androidx.compose.ui.graphics.vector.ImageVector
1919
import androidx.compose.ui.unit.dp
2020
import androidx.compose.ui.unit.sp
21-
import io.github.composegears.valkyrie.compose.core.layout.CenterVerticalRow
2221
import io.github.composegears.valkyrie.compose.util.dim
22+
import io.github.composegears.valkyrie.sdk.compose.foundation.layout.CenterVerticalRow
2323

2424
@Composable
2525
fun InfoCard(

compose/core/api/core.api renamed to sdk/compose/foundation/api/foundation.api

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,35 @@
1-
public final class io/github/composegears/valkyrie/compose/core/ModifierKt {
1+
public final class io/github/composegears/valkyrie/sdk/compose/foundation/ModifierKt {
22
public static final fun animatedBorder-jIwJxvA (Landroidx/compose/ui/Modifier;Ljava/util/List;Landroidx/compose/ui/graphics/Shape;FILandroidx/compose/animation/core/Easing;Landroidx/compose/runtime/Composer;II)Landroidx/compose/ui/Modifier;
33
public static final fun applyIf (Landroidx/compose/ui/Modifier;ZLkotlin/jvm/functions/Function1;)Landroidx/compose/ui/Modifier;
44
}
55

6-
public final class io/github/composegears/valkyrie/compose/core/RememberMutableStateKt {
6+
public final class io/github/composegears/valkyrie/sdk/compose/foundation/RememberMutableStateKt {
77
public static final fun rememberMutableIntState (Ljava/lang/Object;Lkotlin/jvm/functions/Function0;Landroidx/compose/runtime/Composer;I)Landroidx/compose/runtime/MutableIntState;
88
public static final fun rememberMutableState (Landroidx/compose/runtime/SnapshotMutationPolicy;Lkotlin/jvm/functions/Function0;Landroidx/compose/runtime/Composer;II)Landroidx/compose/runtime/MutableState;
99
public static final fun rememberMutableState (Ljava/lang/Object;Landroidx/compose/runtime/SnapshotMutationPolicy;Lkotlin/jvm/functions/Function0;Landroidx/compose/runtime/Composer;II)Landroidx/compose/runtime/MutableState;
1010
public static final fun rememberMutableState (Ljava/lang/Object;Ljava/lang/Object;Landroidx/compose/runtime/SnapshotMutationPolicy;Lkotlin/jvm/functions/Function0;Landroidx/compose/runtime/Composer;II)Landroidx/compose/runtime/MutableState;
1111
}
1212

13-
public final class io/github/composegears/valkyrie/compose/core/animation/ExpandedAnimatedContentKt {
13+
public final class io/github/composegears/valkyrie/sdk/compose/foundation/animation/ExpandedAnimatedContentKt {
1414
public static final fun ExpandedAnimatedContent (Ljava/lang/Object;Landroidx/compose/ui/Modifier;Lkotlin/jvm/functions/Function4;Landroidx/compose/runtime/Composer;II)V
1515
}
1616

17-
public final class io/github/composegears/valkyrie/compose/core/animation/RememberShimmerKt {
18-
public static final fun rememberShimmer (FILandroidx/compose/animation/core/Easing;FFLandroidx/compose/runtime/Composer;II)Lio/github/composegears/valkyrie/compose/core/animation/Shimmer;
19-
public static final fun shimmer-TN_CM5M (Landroidx/compose/ui/Modifier;Lio/github/composegears/valkyrie/compose/core/animation/Shimmer;FZLjava/util/List;Landroidx/compose/runtime/Composer;II)Landroidx/compose/ui/Modifier;
17+
public final class io/github/composegears/valkyrie/sdk/compose/foundation/animation/RememberShimmerKt {
18+
public static final fun rememberShimmer (FILandroidx/compose/animation/core/Easing;FFLandroidx/compose/runtime/Composer;II)Lio/github/composegears/valkyrie/sdk/compose/foundation/animation/Shimmer;
19+
public static final fun shimmer-TN_CM5M (Landroidx/compose/ui/Modifier;Lio/github/composegears/valkyrie/sdk/compose/foundation/animation/Shimmer;FZLjava/util/List;Landroidx/compose/runtime/Composer;II)Landroidx/compose/ui/Modifier;
2020
}
2121

22-
public final class io/github/composegears/valkyrie/compose/core/animation/Shimmer {
22+
public final class io/github/composegears/valkyrie/sdk/compose/foundation/animation/Shimmer {
2323
public static final field $stable I
2424
}
2525

26-
public final class io/github/composegears/valkyrie/compose/core/layout/RowKt {
26+
public final class io/github/composegears/valkyrie/sdk/compose/foundation/layout/RowKt {
2727
public static final fun CenterVerticalRow (Landroidx/compose/ui/Modifier;Landroidx/compose/foundation/layout/Arrangement$Horizontal;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V
2828
}
2929

30-
public final class io/github/composegears/valkyrie/compose/core/layout/SpacerKt {
31-
public static final fun HorizontalSpacer-uFdPcIQ (Landroidx/compose/foundation/layout/RowScope;FLandroidx/compose/ui/Modifier;Landroidx/compose/runtime/Composer;II)V
32-
public static final fun SizeSpacer--orJrPs (FLandroidx/compose/ui/Modifier;Landroidx/compose/runtime/Composer;II)V
33-
public static final fun VerticalSpacer-uFdPcIQ (Landroidx/compose/foundation/layout/ColumnScope;FLandroidx/compose/ui/Modifier;Landroidx/compose/runtime/Composer;II)V
30+
public final class io/github/composegears/valkyrie/sdk/compose/foundation/layout/SpacerKt {
31+
public static final fun Spacer-uFdPcIQ (Landroidx/compose/foundation/layout/ColumnScope;FLandroidx/compose/ui/Modifier;Landroidx/compose/runtime/Composer;II)V
32+
public static final fun Spacer-uFdPcIQ (Landroidx/compose/foundation/layout/RowScope;FLandroidx/compose/ui/Modifier;Landroidx/compose/runtime/Composer;II)V
3433
public static final fun WeightSpacer (Landroidx/compose/foundation/layout/ColumnScope;Landroidx/compose/ui/Modifier;FLandroidx/compose/runtime/Composer;II)V
3534
public static final fun WeightSpacer (Landroidx/compose/foundation/layout/RowScope;Landroidx/compose/ui/Modifier;FLandroidx/compose/runtime/Composer;II)V
3635
}

0 commit comments

Comments
 (0)