Skip to content

Commit 46197ac

Browse files
committed
Organize template utilities and delete EmbeddedStory
1 parent c559e5f commit 46197ac

6 files changed

Lines changed: 17 additions & 36 deletions

File tree

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,7 @@ 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.easel.enter
14-
import dev.bnorm.storyboard.easel.exit
15-
import dev.bnorm.storyboard.easel.template.Header
16-
import dev.bnorm.storyboard.easel.template.SceneEnter
17-
import dev.bnorm.storyboard.easel.template.SceneExit
13+
import dev.bnorm.storyboard.easel.template.*
1814
import kotlin.math.roundToInt
1915

2016
fun StoryboardBuilder.AnimationScene() = scene(

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

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,12 @@ 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.rememberStoryState
16-
import dev.bnorm.storyboard.easel.EmbeddedStory
16+
import dev.bnorm.storyboard.easel.overlay.OverlayNavigation
17+
import dev.bnorm.storyboard.easel.overlay.StoryOverlay
1718
import dev.bnorm.storyboard.easel.template.Body
1819
import dev.bnorm.storyboard.easel.template.Header
1920
import dev.bnorm.storyboard.easel.template.RevealEach
21+
import dev.bnorm.storyboard.ui.StoryScene
2022

2123
@OptIn(ExperimentalTransitionApi::class)
2224
fun StoryboardBuilder.AppScene() {
@@ -37,10 +39,12 @@ fun StoryboardBuilder.AppScene() {
3739
item { Text("• You could even embed a Storyboard, in a Storyboard!") }
3840
item {
3941
MaterialTheme(colors = darkColors()) {
40-
EmbeddedStory(
41-
state,
42-
modifier = Modifier.requiredSize(state.storyboard.size / 3),
43-
)
42+
StoryOverlay(
43+
overlay = { OverlayNavigation(state) },
44+
modifier = Modifier.requiredSize(state.storyboard.size / 3)
45+
) {
46+
StoryScene(state)
47+
}
4448
}
4549
}
4650
}

storyboard-easel/src/commonMain/kotlin/dev/bnorm/storyboard/easel/EmbeddedStory.kt

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

storyboard-easel/src/commonMain/kotlin/dev/bnorm/storyboard/easel/Story.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ import dev.bnorm.storyboard.ui.StoryScene
2121
import kotlinx.coroutines.Job
2222
import kotlinx.coroutines.launch
2323

24+
// TODO rename:
25+
// - Story -> StoryAndOverview?
26+
// - StoryScene -> Story?
2427
@Composable
2528
fun Story(
2629
storyState: StoryState,

storyboard-easel/src/commonMain/kotlin/dev/bnorm/storyboard/easel/SceneSection.kt renamed to storyboard-easel/src/commonMain/kotlin/dev/bnorm/storyboard/easel/template/SceneSection.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package dev.bnorm.storyboard.easel
1+
package dev.bnorm.storyboard.easel.template
22

33
import androidx.compose.material.Text
44
import androidx.compose.runtime.Composable

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
@file:OptIn(ExperimentalTypeInference::class)
22

3-
package dev.bnorm.storyboard.easel
3+
package dev.bnorm.storyboard.easel.template
44

55
import androidx.compose.animation.EnterTransition
66
import androidx.compose.animation.ExitTransition
77
import dev.bnorm.storyboard.core.AdvanceDirection
8-
import dev.bnorm.storyboard.core.SceneScope
98
import dev.bnorm.storyboard.core.Frame
9+
import dev.bnorm.storyboard.core.SceneScope
1010
import kotlin.experimental.ExperimentalTypeInference
1111

1212
/**
@@ -32,7 +32,7 @@ import kotlin.experimental.ExperimentalTypeInference
3232
* [ ] <-{Exit}--- [ ] <-{Enter}-- [ ] // Backwards
3333
* ```
3434
*
35-
* This distinction is a mirror of the [SceneScope.frame] of a scene, which has
35+
* This distinction is the same as the [SceneScope.frame] of a scene, which has
3636
* a [Frame.Start] as the first element and a [Frame.End] as the last
3737
* element, to help manage transitions between scenes.
3838
*/

0 commit comments

Comments
 (0)