Skip to content

Commit f998276

Browse files
bnormbnorm
committed
Convert some fields to JvmField
1 parent 72984d9 commit f998276

File tree

7 files changed

+22
-18
lines changed

7 files changed

+22
-18
lines changed

‎storyboard-easel/src/commonMain/kotlin/dev/bnorm/storyboard/easel/template/animation.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ inline fun AdvanceDirection.exit(
5858
}
5959

6060
fun enter(
61-
start: SceneEnterTransition = SceneEnterTransition.Default,
62-
end: SceneEnterTransition = SceneEnterTransition.Default,
61+
start: SceneEnterTransition = SceneEnterTransition.None,
62+
end: SceneEnterTransition = SceneEnterTransition.None,
6363
): SceneEnterTransition = SceneEnterTransition { direction ->
6464
direction.enter(
6565
{ start(direction) },
@@ -68,8 +68,8 @@ fun enter(
6868
}
6969

7070
fun exit(
71-
start: SceneExitTransition = SceneExitTransition.Default,
72-
end: SceneExitTransition = SceneExitTransition.Default,
71+
start: SceneExitTransition = SceneExitTransition.None,
72+
end: SceneExitTransition = SceneExitTransition.None,
7373
): SceneExitTransition = SceneExitTransition { direction ->
7474
direction.exit(
7575
{ start(direction) },

‎storyboard/api/storyboard.api‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,12 @@ public final class dev/bnorm/storyboard/SceneContentKt {
6262

6363
public abstract interface class dev/bnorm/storyboard/SceneDecorator {
6464
public static final field Companion Ldev/bnorm/storyboard/SceneDecorator$Companion;
65+
public static final field None Ldev/bnorm/storyboard/SceneDecorator;
6566
public abstract fun decorate (Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;I)V
6667
}
6768

6869
public final class dev/bnorm/storyboard/SceneDecorator$Companion {
6970
public final fun from ([Ldev/bnorm/storyboard/SceneDecorator;)Ldev/bnorm/storyboard/SceneDecorator;
70-
public final fun getNone ()Ldev/bnorm/storyboard/SceneDecorator;
7171
}
7272

7373
public final class dev/bnorm/storyboard/SceneDecoratorKt {
@@ -78,15 +78,15 @@ public final class dev/bnorm/storyboard/SceneDecoratorKt {
7878

7979
public abstract interface class dev/bnorm/storyboard/SceneEnterTransition : kotlin/jvm/functions/Function1 {
8080
public static final field Companion Ldev/bnorm/storyboard/SceneEnterTransition$Companion;
81-
public static final field Default Ldev/bnorm/storyboard/SceneEnterTransition;
81+
public static final field None Ldev/bnorm/storyboard/SceneEnterTransition;
8282
}
8383

8484
public final class dev/bnorm/storyboard/SceneEnterTransition$Companion {
8585
}
8686

8787
public abstract interface class dev/bnorm/storyboard/SceneExitTransition : kotlin/jvm/functions/Function1 {
8888
public static final field Companion Ldev/bnorm/storyboard/SceneExitTransition$Companion;
89-
public static final field Default Ldev/bnorm/storyboard/SceneExitTransition;
89+
public static final field None Ldev/bnorm/storyboard/SceneExitTransition;
9090
}
9191

9292
public final class dev/bnorm/storyboard/SceneExitTransition$Companion {
@@ -95,13 +95,13 @@ public final class dev/bnorm/storyboard/SceneExitTransition$Companion {
9595
public final class dev/bnorm/storyboard/SceneFormat {
9696
public static final field $stable I
9797
public static final field Companion Ldev/bnorm/storyboard/SceneFormat$Companion;
98+
public static final field Default Ldev/bnorm/storyboard/SceneFormat;
9899
public synthetic fun <init> (JLandroidx/compose/ui/unit/Density;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
99100
public final fun getDensity ()Landroidx/compose/ui/unit/Density;
100101
public final fun getSize-YbymL2g ()J
101102
}
102103

103104
public final class dev/bnorm/storyboard/SceneFormat$Companion {
104-
public final fun getDefault ()Ldev/bnorm/storyboard/SceneFormat;
105105
}
106106

107107
public final class dev/bnorm/storyboard/SceneFormatKt {

‎storyboard/api/storyboard.klib.api‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,15 @@ abstract fun interface dev.bnorm.storyboard/SceneDecorator { // dev.bnorm.storyb
3434

3535
abstract fun interface dev.bnorm.storyboard/SceneEnterTransition : kotlin/Function1<dev.bnorm.storyboard/AdvanceDirection, androidx.compose.animation/EnterTransition> { // dev.bnorm.storyboard/SceneEnterTransition|null[0]
3636
final object Companion { // dev.bnorm.storyboard/SceneEnterTransition.Companion|null[0]
37-
final val Default // dev.bnorm.storyboard/SceneEnterTransition.Companion.Default|{}Default[0]
38-
final fun <get-Default>(): dev.bnorm.storyboard/SceneEnterTransition // dev.bnorm.storyboard/SceneEnterTransition.Companion.Default.<get-Default>|<get-Default>(){}[0]
37+
final val None // dev.bnorm.storyboard/SceneEnterTransition.Companion.None|{}None[0]
38+
final fun <get-None>(): dev.bnorm.storyboard/SceneEnterTransition // dev.bnorm.storyboard/SceneEnterTransition.Companion.None.<get-None>|<get-None>(){}[0]
3939
}
4040
}
4141

4242
abstract fun interface dev.bnorm.storyboard/SceneExitTransition : kotlin/Function1<dev.bnorm.storyboard/AdvanceDirection, androidx.compose.animation/ExitTransition> { // dev.bnorm.storyboard/SceneExitTransition|null[0]
4343
final object Companion { // dev.bnorm.storyboard/SceneExitTransition.Companion|null[0]
44-
final val Default // dev.bnorm.storyboard/SceneExitTransition.Companion.Default|{}Default[0]
45-
final fun <get-Default>(): dev.bnorm.storyboard/SceneExitTransition // dev.bnorm.storyboard/SceneExitTransition.Companion.Default.<get-Default>|<get-Default>(){}[0]
44+
final val None // dev.bnorm.storyboard/SceneExitTransition.Companion.None|{}None[0]
45+
final fun <get-None>(): dev.bnorm.storyboard/SceneExitTransition // dev.bnorm.storyboard/SceneExitTransition.Companion.None.<get-None>|<get-None>(){}[0]
4646
}
4747
}
4848

‎storyboard/src/commonMain/kotlin/dev/bnorm/storyboard/SceneDecorator.kt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,14 @@ package dev.bnorm.storyboard
33
import androidx.compose.animation.AnimatedVisibilityScope
44
import androidx.compose.animation.SharedTransitionScope
55
import androidx.compose.runtime.Composable
6+
import kotlin.jvm.JvmField
67

78
public fun interface SceneDecorator {
89
@Composable
910
public fun decorate(content: @Composable () -> Unit)
1011

1112
public companion object {
13+
@JvmField
1214
public val None: SceneDecorator = SceneDecorator { it() }
1315

1416
public fun from(vararg decorators: SceneDecorator): SceneDecorator {

‎storyboard/src/commonMain/kotlin/dev/bnorm/storyboard/SceneFormat.kt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package dev.bnorm.storyboard
33
import androidx.compose.ui.unit.Density
44
import androidx.compose.ui.unit.DpSize
55
import androidx.compose.ui.unit.IntSize
6+
import kotlin.jvm.JvmField
67

78
public class SceneFormat(
89
/** Defines the pixel dimensions of each scene in a Storyboard. */
@@ -11,6 +12,7 @@ public class SceneFormat(
1112
public val density: Density,
1213
) {
1314
public companion object {
15+
@JvmField
1416
public val Default: SceneFormat = SceneFormat(
1517
size = IntSize(1920, 1080),
1618
density = Density(2f),

‎storyboard/src/commonMain/kotlin/dev/bnorm/storyboard/SceneTransition.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ import kotlin.jvm.JvmField
77
public fun interface SceneEnterTransition : (AdvanceDirection) -> EnterTransition {
88
public companion object {
99
@JvmField
10-
public val Default: SceneEnterTransition = SceneEnterTransition { EnterTransition.Companion.None }
10+
public val None: SceneEnterTransition = SceneEnterTransition { EnterTransition.None }
1111
}
1212
}
1313

1414
public fun interface SceneExitTransition : (AdvanceDirection) -> ExitTransition {
1515
public companion object {
1616
@JvmField
17-
public val Default: SceneExitTransition = SceneExitTransition { ExitTransition.None }
17+
public val None: SceneExitTransition = SceneExitTransition { ExitTransition.None }
1818
}
1919
}

‎storyboard/src/commonMain/kotlin/dev/bnorm/storyboard/StoryboardBuilder.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@ public sealed interface StoryboardBuilder {
88
@StoryboardBuilderDsl
99
public fun <T> scene(
1010
states: List<T>,
11-
enterTransition: SceneEnterTransition = SceneEnterTransition.Default,
12-
exitTransition: SceneExitTransition = SceneExitTransition.Default,
11+
enterTransition: SceneEnterTransition = SceneEnterTransition.None,
12+
exitTransition: SceneExitTransition = SceneExitTransition.None,
1313
content: SceneContent<T>,
1414
): Scene<T>
1515

1616
@StoryboardBuilderDsl
1717
public fun scene(
1818
stateCount: Int = 1,
19-
enterTransition: SceneEnterTransition = SceneEnterTransition.Default,
20-
exitTransition: SceneExitTransition = SceneExitTransition.Default,
19+
enterTransition: SceneEnterTransition = SceneEnterTransition.None,
20+
exitTransition: SceneExitTransition = SceneExitTransition.None,
2121
content: SceneContent<Int>,
2222
): Scene<Int> {
2323
require(stateCount >= 0) { "stateCount must be greater than or equal to 0" }

0 commit comments

Comments
 (0)