File tree Expand file tree Collapse file tree
basic/src/commonMain/kotlin
interactive/src/commonMain/kotlin
storyboard-easel/src/commonMain/kotlin/dev/bnorm/storyboard/easel Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -10,11 +10,7 @@ import androidx.compose.ui.platform.LocalDensity
1010import androidx.compose.ui.unit.IntOffset
1111import androidx.compose.ui.unit.dp
1212import 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.*
1814import kotlin.math.roundToInt
1915
2016fun StoryboardBuilder.AnimationScene () = scene(
Original file line number Diff line number Diff line change @@ -13,10 +13,12 @@ import androidx.compose.ui.Modifier
1313import androidx.compose.ui.unit.dp
1414import dev.bnorm.storyboard.core.StoryboardBuilder
1515import 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
1718import dev.bnorm.storyboard.easel.template.Body
1819import dev.bnorm.storyboard.easel.template.Header
1920import dev.bnorm.storyboard.easel.template.RevealEach
21+ import dev.bnorm.storyboard.ui.StoryScene
2022
2123@OptIn(ExperimentalTransitionApi ::class )
2224fun 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 }
Load Diff This file was deleted.
Original file line number Diff line number Diff line change @@ -21,6 +21,9 @@ import dev.bnorm.storyboard.ui.StoryScene
2121import kotlinx.coroutines.Job
2222import kotlinx.coroutines.launch
2323
24+ // TODO rename:
25+ // - Story -> StoryAndOverview?
26+ // - StoryScene -> Story?
2427@Composable
2528fun Story (
2629 storyState : StoryState ,
Original file line number Diff line number Diff line change 1- package dev.bnorm.storyboard.easel
1+ package dev.bnorm.storyboard.easel.template
22
33import androidx.compose.material.Text
44import androidx.compose.runtime.Composable
Original file line number Diff line number Diff line change 11@file:OptIn(ExperimentalTypeInference ::class )
22
3- package dev.bnorm.storyboard.easel
3+ package dev.bnorm.storyboard.easel.template
44
55import androidx.compose.animation.EnterTransition
66import androidx.compose.animation.ExitTransition
77import dev.bnorm.storyboard.core.AdvanceDirection
8- import dev.bnorm.storyboard.core.SceneScope
98import dev.bnorm.storyboard.core.Frame
9+ import dev.bnorm.storyboard.core.SceneScope
1010import 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 */
You can’t perform that action at this time.
0 commit comments