Skip to content

Commit 287b325

Browse files
committed
Move stateCount scene builder into StoryboardBuilder
This is used so much it should be part of the builder class and not need an import.
1 parent fbdf5e9 commit 287b325

7 files changed

Lines changed: 11 additions & 17 deletions

File tree

examples/basic/src/commonMain/kotlin/AnimationScene.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import androidx.compose.ui.platform.LocalDensity
1010
import androidx.compose.ui.unit.IntOffset
1111
import androidx.compose.ui.unit.dp
1212
import dev.bnorm.storyboard.core.StoryboardBuilder
13-
import dev.bnorm.storyboard.core.scene
1413
import dev.bnorm.storyboard.easel.enter
1514
import dev.bnorm.storyboard.easel.exit
1615
import dev.bnorm.storyboard.easel.template.Header

examples/basic/src/commonMain/kotlin/NavigationScene.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import androidx.compose.ui.Alignment
88
import androidx.compose.ui.Modifier
99
import androidx.compose.ui.unit.dp
1010
import dev.bnorm.storyboard.core.StoryboardBuilder
11-
import dev.bnorm.storyboard.core.scene
1211
import dev.bnorm.storyboard.easel.notes.NotesTab
1312
import dev.bnorm.storyboard.easel.template.Body
1413
import dev.bnorm.storyboard.easel.template.Header

examples/interactive/src/commonMain/kotlin/AppScene.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import androidx.compose.ui.Modifier
1313
import androidx.compose.ui.unit.dp
1414
import dev.bnorm.storyboard.core.StoryboardBuilder
1515
import dev.bnorm.storyboard.core.StoryboardState
16-
import dev.bnorm.storyboard.core.scene
1716
import dev.bnorm.storyboard.easel.EmbeddedStoryboard
1817
import dev.bnorm.storyboard.easel.template.Body
1918
import dev.bnorm.storyboard.easel.template.Header

examples/interactive/src/commonMain/kotlin/ButtonScene.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import androidx.compose.ui.input.pointer.PointerIcon
1616
import androidx.compose.ui.input.pointer.pointerHoverIcon
1717
import androidx.compose.ui.unit.dp
1818
import dev.bnorm.storyboard.core.StoryboardBuilder
19-
import dev.bnorm.storyboard.core.scene
2019
import dev.bnorm.storyboard.easel.template.Body
2120
import dev.bnorm.storyboard.easel.template.Header
2221
import dev.bnorm.storyboard.easel.template.RevealEach

examples/interactive/src/commonMain/kotlin/NextScene.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import androidx.compose.material.Text
55
import androidx.compose.ui.Alignment
66
import androidx.compose.ui.Modifier
77
import dev.bnorm.storyboard.core.StoryboardBuilder
8-
import dev.bnorm.storyboard.core.scene
98

109
fun StoryboardBuilder.NextScene() {
1110
scene {

examples/interactive/src/commonMain/kotlin/TextFieldScene.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import androidx.compose.material.TextField
1111
import androidx.compose.ui.Modifier
1212
import androidx.compose.ui.unit.dp
1313
import dev.bnorm.storyboard.core.StoryboardBuilder
14-
import dev.bnorm.storyboard.core.scene
1514
import dev.bnorm.storyboard.easel.template.Body
1615
import dev.bnorm.storyboard.easel.template.Header
1716
import dev.bnorm.storyboard.easel.template.RevealEach

storyboard-core/src/commonMain/kotlin/dev/bnorm/storyboard/core/StoryboardBuilder.kt

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,17 @@ sealed interface StoryboardBuilder {
2020
exitTransition: (AdvanceDirection) -> ExitTransition = DefaultExitTransition,
2121
content: SceneContent<T>,
2222
): Scene<T>
23+
24+
@StoryboardBuilderDsl
25+
fun scene(
26+
stateCount: Int = 1,
27+
enterTransition: (AdvanceDirection) -> EnterTransition = DefaultEnterTransition,
28+
exitTransition: (AdvanceDirection) -> ExitTransition = DefaultExitTransition,
29+
content: SceneContent<Int>,
30+
): Scene<Int> {
31+
require(stateCount > 0) { "stateCount must be greater than 0" }
32+
return scene((0..<stateCount).toList(), enterTransition, exitTransition, content)
33+
}
2334
}
2435

2536
@StoryboardBuilderDsl
@@ -32,17 +43,6 @@ fun <T> StoryboardBuilder.scene(
3243
return scene(states.asList(), enterTransition, exitTransition, content)
3344
}
3445

35-
@StoryboardBuilderDsl
36-
fun StoryboardBuilder.scene(
37-
stateCount: Int = 1,
38-
enterTransition: (AdvanceDirection) -> EnterTransition = DefaultEnterTransition,
39-
exitTransition: (AdvanceDirection) -> ExitTransition = DefaultExitTransition,
40-
content: SceneContent<Int>,
41-
): Scene<Int> {
42-
require(stateCount > 0) { "stateCount must be greater than 0" }
43-
return scene((0..<stateCount).toList(), enterTransition, exitTransition, content)
44-
}
45-
4646
@StoryboardBuilderDsl
4747
inline fun <reified T : Enum<T>> StoryboardBuilder.sceneForEnum(
4848
noinline enterTransition: (AdvanceDirection) -> EnterTransition = DefaultEnterTransition,

0 commit comments

Comments
 (0)