From 155869c6a7e8f0743c36616ec44069f9c4a2a326 Mon Sep 17 00:00:00 2001 From: Adetunji Dahunsi Date: Sat, 28 Jun 2025 15:12:10 -0400 Subject: [PATCH 1/4] Rename transform to decorators --- .../MovableSharedElementTransform.kt | 14 +++---- .../transforms/ThreePaneAdaptiveTransform.kt | 12 +++--- .../treenav/compose/MultiPaneDisplayState.kt | 24 +++++------ .../transforms/PaneModifierTransform.kt | 6 +-- .../treenav/compose/transforms/Transforms.kt | 40 +++++++++---------- .../com/tunjid/demo/common/ui/DemoApp.kt | 18 ++++----- 6 files changed, 57 insertions(+), 57 deletions(-) diff --git a/library/compose-threepane/src/commonMain/kotlin/com/tunjid/treenav/compose/threepane/transforms/MovableSharedElementTransform.kt b/library/compose-threepane/src/commonMain/kotlin/com/tunjid/treenav/compose/threepane/transforms/MovableSharedElementTransform.kt index 28496d9..73b668c 100644 --- a/library/compose-threepane/src/commonMain/kotlin/com/tunjid/treenav/compose/threepane/transforms/MovableSharedElementTransform.kt +++ b/library/compose-threepane/src/commonMain/kotlin/com/tunjid/treenav/compose/threepane/transforms/MovableSharedElementTransform.kt @@ -41,11 +41,11 @@ import com.tunjid.treenav.compose.moveablesharedelement.MovableSharedElementScop import com.tunjid.treenav.compose.moveablesharedelement.PaneMovableSharedElementScope import com.tunjid.treenav.compose.moveablesharedelement.rememberPaneMovableSharedElementScope import com.tunjid.treenav.compose.threepane.ThreePane -import com.tunjid.treenav.compose.transforms.PaneTransform -import com.tunjid.treenav.compose.transforms.paneRenderTransform +import com.tunjid.treenav.compose.transforms.PaneDecorator +import com.tunjid.treenav.compose.transforms.paneRenderDecorator /** - * A [PaneTransform] that applies semantics of movable shared elements to + * A [PaneDecorator] that applies semantics of movable shared elements to * [ThreePane] layouts. * * It is an opinionated implementation that always shows the movable shared element in @@ -60,10 +60,10 @@ import com.tunjid.treenav.compose.transforms.paneRenderTransform * There should be one instance of this per [MultiPaneDisplay]. */ fun - threePanedMovableSharedElementTransform( + threePanedMovableSharedElementDecorator( movableSharedElementHostState: MovableSharedElementHostState, -): PaneTransform = - paneRenderTransform { destination, destinationPaneMapper -> +): PaneDecorator = + paneRenderDecorator { destination, destinationPaneMapper -> val delegate = rememberPaneMovableSharedElementScope( movableSharedElementHostState = movableSharedElementHostState ) @@ -82,7 +82,7 @@ fun /** * Requires that this [PaneScope] is a [MovableSharedElementScope] specifically configured for * [ThreePane] layouts and returns it. This only succeeds if the [MultiPaneDisplayState] has the - * [threePanedMovableSharedElementTransform] applied to it. + * [threePanedMovableSharedElementDecorator] applied to it. * * In the case this [PaneScope] is not the [MovableSharedElementScope] requested, an exception * will be thrown. diff --git a/library/compose-threepane/src/commonMain/kotlin/com/tunjid/treenav/compose/threepane/transforms/ThreePaneAdaptiveTransform.kt b/library/compose-threepane/src/commonMain/kotlin/com/tunjid/treenav/compose/threepane/transforms/ThreePaneAdaptiveTransform.kt index bca561a..318170d 100644 --- a/library/compose-threepane/src/commonMain/kotlin/com/tunjid/treenav/compose/threepane/transforms/ThreePaneAdaptiveTransform.kt +++ b/library/compose-threepane/src/commonMain/kotlin/com/tunjid/treenav/compose/threepane/transforms/ThreePaneAdaptiveTransform.kt @@ -25,22 +25,22 @@ import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import com.tunjid.treenav.Node import com.tunjid.treenav.compose.threepane.ThreePane -import com.tunjid.treenav.compose.transforms.PaneTransform -import com.tunjid.treenav.compose.transforms.paneMappingTransform +import com.tunjid.treenav.compose.transforms.PaneDecorator +import com.tunjid.treenav.compose.transforms.paneMappingDecorator /** - * An [PaneTransform] that selectively displays panes for a [ThreePane] layout + * An [PaneDecorator] that selectively displays panes for a [ThreePane] layout * based on the space available determined by the [windowWidthState]. * * @param windowWidthState provides the current width of the display in Dp. */ fun - threePanedAdaptiveTransform( + threePaneAdaptiveDecorator( windowWidthState: State, secondaryPaneBreakPoint: State = mutableStateOf(SECONDARY_PANE_MIN_WIDTH_BREAKPOINT_DP), tertiaryPaneBreakPoint: State = mutableStateOf(TERTIARY_PANE_MIN_WIDTH_BREAKPOINT_DP), -): PaneTransform = - paneMappingTransform { destination, destinationPaneMapper -> +): PaneDecorator = + paneMappingDecorator { destination, destinationPaneMapper -> val showSecondary by remember { derivedStateOf { windowWidthState.value >= secondaryPaneBreakPoint.value } } diff --git a/library/compose/src/commonMain/kotlin/com/tunjid/treenav/compose/MultiPaneDisplayState.kt b/library/compose/src/commonMain/kotlin/com/tunjid/treenav/compose/MultiPaneDisplayState.kt index 7df2e03..b5902a4 100644 --- a/library/compose/src/commonMain/kotlin/com/tunjid/treenav/compose/MultiPaneDisplayState.kt +++ b/library/compose/src/commonMain/kotlin/com/tunjid/treenav/compose/MultiPaneDisplayState.kt @@ -24,9 +24,9 @@ import androidx.compose.runtime.Stable import androidx.compose.runtime.State import com.tunjid.treenav.Node import com.tunjid.treenav.compose.navigation3.runtime.NavEntry -import com.tunjid.treenav.compose.transforms.PaneMappingTransform -import com.tunjid.treenav.compose.transforms.PaneTransform -import com.tunjid.treenav.compose.transforms.PaneRenderTransform +import com.tunjid.treenav.compose.transforms.PaneMappingDecorator +import com.tunjid.treenav.compose.transforms.PaneDecorator +import com.tunjid.treenav.compose.transforms.PaneRenderDecorator /** * Class for configuring a [MultiPaneDisplay] for selecting, adapting and placing navigation @@ -115,14 +115,14 @@ class MultiPaneDisplayState in * @param destinationTransform a transform of the [navigationState] to its current destination. * @param popTransform a transform of the [navigationState] when back is pressed. * @param onPopped an action to perform when the navigation state has been popped to a new state. - * @param entryProvider provides the [PaneTransform]s and content needed to render + * @param entryProvider provides the [PaneDecorator]s and content needed to render * a [Destination] in its pane. - * @param transforms a list of transforms applied to every [Destination] before it is + * @param paneDecorators a list of decorators applied to every [Destination] before it is * rendered in its pane. Order matters; they are applied from last to first. */ fun MultiPaneDisplayState( panes: List, - transforms: List>, + paneDecorators: List>, navigationState: State, backStackTransform: (NavigationState) -> List, destinationTransform: (NavigationState) -> Destination, @@ -132,7 +132,7 @@ fun MultiPaneDisplayState( NoContentTransform }, entryProvider: (Destination) -> PaneEntry, -) = transforms.fold( +) = paneDecorators.fold( initial = MultiPaneDisplayState( panes = panes, navigationState = navigationState, @@ -154,7 +154,7 @@ fun MultiPaneDisplayState( private operator fun MultiPaneDisplayState.plus( - transform: PaneTransform, + transform: PaneDecorator, ): MultiPaneDisplayState = MultiPaneDisplayState( panes = panes, @@ -166,21 +166,21 @@ private operator fun transitionSpec = transitionSpec, paneEntryProvider = paneEntryProvider, destinationPanes = when (transform) { - is PaneMappingTransform -> { destination -> + is PaneMappingDecorator -> { destination -> transform.toPanesAndDestinations( destination = destination, - previousTransform = destinationPanes, + previousDecorator = destinationPanes, ) } else -> destinationPanes }, destinationContent = when (transform) { - is PaneRenderTransform -> { paneEntry, destination -> + is PaneRenderDecorator -> { paneEntry, destination -> with(transform) { Render( destination = destination, - previousTransform = previous@{ innerDestination -> + previousDecorator = previous@{ innerDestination -> destinationContent( this@previous, paneEntry, diff --git a/library/compose/src/commonMain/kotlin/com/tunjid/treenav/compose/transforms/PaneModifierTransform.kt b/library/compose/src/commonMain/kotlin/com/tunjid/treenav/compose/transforms/PaneModifierTransform.kt index bacfb13..9e9bb39 100644 --- a/library/compose/src/commonMain/kotlin/com/tunjid/treenav/compose/transforms/PaneModifierTransform.kt +++ b/library/compose/src/commonMain/kotlin/com/tunjid/treenav/compose/transforms/PaneModifierTransform.kt @@ -28,10 +28,10 @@ import com.tunjid.treenav.compose.PaneScope * * @param paneModifier a lambda for specifying the [Modifier] for each [Pane] in a [PaneScope]. */ -fun paneModifierTransform( +fun paneModifierDecorator( paneModifier: PaneScope.() -> Modifier = { Modifier }, -): PaneTransform = - paneRenderTransform { destination, destinationContent -> +): PaneDecorator = + paneRenderDecorator { destination, destinationContent -> Box( modifier = paneModifier() ) { diff --git a/library/compose/src/commonMain/kotlin/com/tunjid/treenav/compose/transforms/Transforms.kt b/library/compose/src/commonMain/kotlin/com/tunjid/treenav/compose/transforms/Transforms.kt index 3cf6312..d227970 100644 --- a/library/compose/src/commonMain/kotlin/com/tunjid/treenav/compose/transforms/Transforms.kt +++ b/library/compose/src/commonMain/kotlin/com/tunjid/treenav/compose/transforms/Transforms.kt @@ -9,13 +9,13 @@ import com.tunjid.treenav.compose.PaneScope /** * Provides APIs for adjusting what is presented in a [MultiPaneDisplay]. */ -sealed interface PaneTransform +sealed interface PaneDecorator /** - * A [PaneTransform] that allows for changing which [Destination] shows in which [Pane]. + * A [PaneDecorator] that allows for changing which [Destination] shows in which [Pane]. */ -internal fun interface PaneMappingTransform - : PaneTransform { +internal fun interface PaneMappingDecorator + : PaneDecorator { /** * Given the current [Destination], provide what [Destination] to show in a [Pane]. @@ -23,35 +23,35 @@ internal fun interface PaneMappingTransform * back stack of the [MultiPaneDisplayState.navigationState]. * * @param destination the current [Destination] to display. - * @param previousTransform a [PaneTransform] that when invoked, returns the pane to destination + * @param previousDecorator a [PaneDecorator] that when invoked, returns the pane to destination * mapping for the current [Destination] pre-transform that can then be composed with new logic. */ @Composable fun toPanesAndDestinations( destination: Destination, - previousTransform: @Composable (Destination) -> Map, + previousDecorator: @Composable (Destination) -> Map, ): Map } /** - * A [PaneTransform] that allows for the rendering semantics of a [Destination] in a given + * A [PaneDecorator] that allows for the rendering semantics of a [Destination] in a given * [PaneScope]. */ -internal fun interface PaneRenderTransform - : PaneTransform { +internal fun interface PaneRenderDecorator + : PaneDecorator { /** * Given the current [Destination], and its [PaneScope], compose additional presentation * logic. * * @param destination the current [Destination] to display in the provided [PaneScope]. - * @param previousTransform a [PaneTransform] that when invoked, renders the [Destination] - * for the [PaneScope ]pre-transform that can then be composed with new logic. + * @param previousDecorator a [PaneDecorator] that when invoked, renders the [Destination] + * for the [PaneScope ]pre-decoration that can then be composed with new logic. */ @Composable fun PaneScope.Render( destination: Destination, - previousTransform: @Composable PaneScope.(Destination) -> Unit, + previousDecorator: @Composable PaneScope.(Destination) -> Unit, ) } @@ -67,30 +67,30 @@ internal fun interface PaneRenderTransform * - destinationPaneMapper: A lambda that when invoked, returns the pane to destination * mapping for the current [Destination] pre-transform that can then be composed with new logic. */ -fun paneMappingTransform( +fun paneMappingDecorator( mappingTransform: @Composable ( destination: Destination, - destinationPaneMapper: @Composable (Destination) -> Map + destinationPaneDecorator: @Composable (Destination) -> Map ) -> Map -): PaneTransform = - PaneMappingTransform { destination, previousTransform -> +): PaneDecorator = + PaneMappingDecorator { destination, previousTransform -> mappingTransform(destination, previousTransform) } /** - * A [PaneTransform] that allows for adjusting the rendering semantics of a [Destination] in a + * A [PaneDecorator] that allows for adjusting the rendering semantics of a [Destination] in a * for a given [Pane] in the [PaneScope]. * * @param renderTransform a lambda providing the Composable to render. It has two arguments: * - destination: The [Destination] being rendered in the provided [PaneScope]. * - destinationContent: A lambda that when invoked, renders the [Destination] pre-transform */ -fun paneRenderTransform( +fun paneRenderDecorator( renderTransform: @Composable PaneScope.( destination: Destination, destinationContent: @Composable PaneScope.(Destination) -> Unit ) -> Unit -): PaneTransform = - PaneRenderTransform { destination, previousTransform -> +): PaneDecorator = + PaneRenderDecorator { destination, previousTransform -> renderTransform(destination, previousTransform) } diff --git a/sample/common/src/commonMain/kotlin/com/tunjid/demo/common/ui/DemoApp.kt b/sample/common/src/commonMain/kotlin/com/tunjid/demo/common/ui/DemoApp.kt index da3a9f3..72ef23e 100644 --- a/sample/common/src/commonMain/kotlin/com/tunjid/demo/common/ui/DemoApp.kt +++ b/sample/common/src/commonMain/kotlin/com/tunjid/demo/common/ui/DemoApp.kt @@ -85,10 +85,10 @@ import com.tunjid.treenav.compose.moveablesharedelement.MovableSharedElementHost import com.tunjid.treenav.compose.multiPaneDisplayBackstack import com.tunjid.treenav.compose.navigation3.ui.NavigationEventHandler import com.tunjid.treenav.compose.threepane.ThreePane -import com.tunjid.treenav.compose.threepane.transforms.threePanedAdaptiveTransform -import com.tunjid.treenav.compose.threepane.transforms.threePanedMovableSharedElementTransform -import com.tunjid.treenav.compose.transforms.PaneTransform -import com.tunjid.treenav.compose.transforms.paneModifierTransform +import com.tunjid.treenav.compose.threepane.transforms.threePaneAdaptiveDecorator +import com.tunjid.treenav.compose.threepane.transforms.threePanedMovableSharedElementDecorator +import com.tunjid.treenav.compose.transforms.PaneDecorator +import com.tunjid.treenav.compose.transforms.paneModifierDecorator import com.tunjid.treenav.pop import com.tunjid.treenav.popToRoot import com.tunjid.treenav.requireCurrent @@ -117,7 +117,7 @@ fun App( state = appState.rememberMultiPaneDisplayState( remember { listOf( - threePanedAdaptiveTransform( + threePaneAdaptiveDecorator( secondaryPaneBreakPoint = mutableStateOf( SecondaryPaneMinWidthBreakpointDp ), @@ -128,10 +128,10 @@ fun App( appState.splitLayoutState.size } ), - threePanedMovableSharedElementTransform( + threePanedMovableSharedElementDecorator( movableSharedElementHostState = movableSharedElementHostState ), - paneModifierTransform { + paneModifierDecorator { if (paneState.pane == ThreePane.Primary && inPredictiveBack && isActive @@ -322,7 +322,7 @@ class AppState( companion object { @Composable fun AppState.rememberMultiPaneDisplayState( - transforms: List>, + transforms: List>, ): MultiPaneDisplayState { val displayState = remember { MultiPaneDisplayState( @@ -345,7 +345,7 @@ class AppState( is SampleDestination.Avatar -> avatarPaneEntry() } }, - transforms = transforms, + paneDecorators = transforms, ) } DisposableEffect(Unit) { From fc1ecf64d92c0b323dd9d5127dbaf65e166add6a Mon Sep 17 00:00:00 2001 From: Adetunji Dahunsi Date: Sat, 28 Jun 2025 15:18:39 -0400 Subject: [PATCH 2/4] Rename from PaneTransform to PaneDecorator --- ...eePaneAdaptiveTransform.kt => ThreePaneAdaptiveDecorator.kt} | 0 ...ntTransform.kt => ThreePaneMovableSharedElementDecorator.kt} | 2 +- .../compose/transforms/{Transforms.kt => PaneDecorator.kt} | 0 .../{PaneModifierTransform.kt => PaneModifierDecorator.kt} | 0 4 files changed, 1 insertion(+), 1 deletion(-) rename library/compose-threepane/src/commonMain/kotlin/com/tunjid/treenav/compose/threepane/transforms/{ThreePaneAdaptiveTransform.kt => ThreePaneAdaptiveDecorator.kt} (100%) rename library/compose-threepane/src/commonMain/kotlin/com/tunjid/treenav/compose/threepane/transforms/{MovableSharedElementTransform.kt => ThreePaneMovableSharedElementDecorator.kt} (99%) rename library/compose/src/commonMain/kotlin/com/tunjid/treenav/compose/transforms/{Transforms.kt => PaneDecorator.kt} (100%) rename library/compose/src/commonMain/kotlin/com/tunjid/treenav/compose/transforms/{PaneModifierTransform.kt => PaneModifierDecorator.kt} (100%) diff --git a/library/compose-threepane/src/commonMain/kotlin/com/tunjid/treenav/compose/threepane/transforms/ThreePaneAdaptiveTransform.kt b/library/compose-threepane/src/commonMain/kotlin/com/tunjid/treenav/compose/threepane/transforms/ThreePaneAdaptiveDecorator.kt similarity index 100% rename from library/compose-threepane/src/commonMain/kotlin/com/tunjid/treenav/compose/threepane/transforms/ThreePaneAdaptiveTransform.kt rename to library/compose-threepane/src/commonMain/kotlin/com/tunjid/treenav/compose/threepane/transforms/ThreePaneAdaptiveDecorator.kt diff --git a/library/compose-threepane/src/commonMain/kotlin/com/tunjid/treenav/compose/threepane/transforms/MovableSharedElementTransform.kt b/library/compose-threepane/src/commonMain/kotlin/com/tunjid/treenav/compose/threepane/transforms/ThreePaneMovableSharedElementDecorator.kt similarity index 99% rename from library/compose-threepane/src/commonMain/kotlin/com/tunjid/treenav/compose/threepane/transforms/MovableSharedElementTransform.kt rename to library/compose-threepane/src/commonMain/kotlin/com/tunjid/treenav/compose/threepane/transforms/ThreePaneMovableSharedElementDecorator.kt index 73b668c..54ee65a 100644 --- a/library/compose-threepane/src/commonMain/kotlin/com/tunjid/treenav/compose/threepane/transforms/MovableSharedElementTransform.kt +++ b/library/compose-threepane/src/commonMain/kotlin/com/tunjid/treenav/compose/threepane/transforms/ThreePaneMovableSharedElementDecorator.kt @@ -96,7 +96,7 @@ fun PaneScope< """ The current PaneScope (${this::class.qualifiedName}) is not an instance of a ThreePaneMovableSharedElementScope. You must configure your ThreePane MultiPaneDisplay with - threePanedMovableSharedElementTransform(). + threePaneAdaptiveDecorator(). """.trimIndent() } return this diff --git a/library/compose/src/commonMain/kotlin/com/tunjid/treenav/compose/transforms/Transforms.kt b/library/compose/src/commonMain/kotlin/com/tunjid/treenav/compose/transforms/PaneDecorator.kt similarity index 100% rename from library/compose/src/commonMain/kotlin/com/tunjid/treenav/compose/transforms/Transforms.kt rename to library/compose/src/commonMain/kotlin/com/tunjid/treenav/compose/transforms/PaneDecorator.kt diff --git a/library/compose/src/commonMain/kotlin/com/tunjid/treenav/compose/transforms/PaneModifierTransform.kt b/library/compose/src/commonMain/kotlin/com/tunjid/treenav/compose/transforms/PaneModifierDecorator.kt similarity index 100% rename from library/compose/src/commonMain/kotlin/com/tunjid/treenav/compose/transforms/PaneModifierTransform.kt rename to library/compose/src/commonMain/kotlin/com/tunjid/treenav/compose/transforms/PaneModifierDecorator.kt From cb11a77940cba8f3166c874aa18b7ec479be987c Mon Sep 17 00:00:00 2001 From: Adetunji Dahunsi Date: Sat, 28 Jun 2025 16:27:11 -0400 Subject: [PATCH 3/4] Rename transforms to paneDecorators --- .../commonMain/kotlin/com/tunjid/demo/common/ui/DemoApp.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sample/common/src/commonMain/kotlin/com/tunjid/demo/common/ui/DemoApp.kt b/sample/common/src/commonMain/kotlin/com/tunjid/demo/common/ui/DemoApp.kt index 72ef23e..1535e1a 100644 --- a/sample/common/src/commonMain/kotlin/com/tunjid/demo/common/ui/DemoApp.kt +++ b/sample/common/src/commonMain/kotlin/com/tunjid/demo/common/ui/DemoApp.kt @@ -322,7 +322,7 @@ class AppState( companion object { @Composable fun AppState.rememberMultiPaneDisplayState( - transforms: List>, + paneDecorators: List>, ): MultiPaneDisplayState { val displayState = remember { MultiPaneDisplayState( @@ -345,7 +345,7 @@ class AppState( is SampleDestination.Avatar -> avatarPaneEntry() } }, - paneDecorators = transforms, + paneDecorators = paneDecorators, ) } DisposableEffect(Unit) { From b68e2ef00215f2bb73258783137f34c280bcb545 Mon Sep 17 00:00:00 2001 From: Adetunji Dahunsi Date: Sat, 28 Jun 2025 16:30:41 -0400 Subject: [PATCH 4/4] Change package names --- .../threepane/transforms/ThreePaneAdaptiveDecorator.kt | 4 ++-- .../transforms/ThreePaneMovableSharedElementDecorator.kt | 4 ++-- .../com/tunjid/treenav/compose/MultiPaneDisplayState.kt | 6 +++--- .../compose/{transforms => panedecorators}/PaneDecorator.kt | 2 +- .../{transforms => panedecorators}/PaneModifierDecorator.kt | 2 +- .../commonMain/kotlin/com/tunjid/demo/common/ui/DemoApp.kt | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) rename library/compose/src/commonMain/kotlin/com/tunjid/treenav/compose/{transforms => panedecorators}/PaneDecorator.kt (98%) rename library/compose/src/commonMain/kotlin/com/tunjid/treenav/compose/{transforms => panedecorators}/PaneModifierDecorator.kt (96%) diff --git a/library/compose-threepane/src/commonMain/kotlin/com/tunjid/treenav/compose/threepane/transforms/ThreePaneAdaptiveDecorator.kt b/library/compose-threepane/src/commonMain/kotlin/com/tunjid/treenav/compose/threepane/transforms/ThreePaneAdaptiveDecorator.kt index 318170d..36f5731 100644 --- a/library/compose-threepane/src/commonMain/kotlin/com/tunjid/treenav/compose/threepane/transforms/ThreePaneAdaptiveDecorator.kt +++ b/library/compose-threepane/src/commonMain/kotlin/com/tunjid/treenav/compose/threepane/transforms/ThreePaneAdaptiveDecorator.kt @@ -25,8 +25,8 @@ import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import com.tunjid.treenav.Node import com.tunjid.treenav.compose.threepane.ThreePane -import com.tunjid.treenav.compose.transforms.PaneDecorator -import com.tunjid.treenav.compose.transforms.paneMappingDecorator +import com.tunjid.treenav.compose.panedecorators.PaneDecorator +import com.tunjid.treenav.compose.panedecorators.paneMappingDecorator /** * An [PaneDecorator] that selectively displays panes for a [ThreePane] layout diff --git a/library/compose-threepane/src/commonMain/kotlin/com/tunjid/treenav/compose/threepane/transforms/ThreePaneMovableSharedElementDecorator.kt b/library/compose-threepane/src/commonMain/kotlin/com/tunjid/treenav/compose/threepane/transforms/ThreePaneMovableSharedElementDecorator.kt index 54ee65a..708aef0 100644 --- a/library/compose-threepane/src/commonMain/kotlin/com/tunjid/treenav/compose/threepane/transforms/ThreePaneMovableSharedElementDecorator.kt +++ b/library/compose-threepane/src/commonMain/kotlin/com/tunjid/treenav/compose/threepane/transforms/ThreePaneMovableSharedElementDecorator.kt @@ -41,8 +41,8 @@ import com.tunjid.treenav.compose.moveablesharedelement.MovableSharedElementScop import com.tunjid.treenav.compose.moveablesharedelement.PaneMovableSharedElementScope import com.tunjid.treenav.compose.moveablesharedelement.rememberPaneMovableSharedElementScope import com.tunjid.treenav.compose.threepane.ThreePane -import com.tunjid.treenav.compose.transforms.PaneDecorator -import com.tunjid.treenav.compose.transforms.paneRenderDecorator +import com.tunjid.treenav.compose.panedecorators.PaneDecorator +import com.tunjid.treenav.compose.panedecorators.paneRenderDecorator /** * A [PaneDecorator] that applies semantics of movable shared elements to diff --git a/library/compose/src/commonMain/kotlin/com/tunjid/treenav/compose/MultiPaneDisplayState.kt b/library/compose/src/commonMain/kotlin/com/tunjid/treenav/compose/MultiPaneDisplayState.kt index b5902a4..3eb7953 100644 --- a/library/compose/src/commonMain/kotlin/com/tunjid/treenav/compose/MultiPaneDisplayState.kt +++ b/library/compose/src/commonMain/kotlin/com/tunjid/treenav/compose/MultiPaneDisplayState.kt @@ -24,9 +24,9 @@ import androidx.compose.runtime.Stable import androidx.compose.runtime.State import com.tunjid.treenav.Node import com.tunjid.treenav.compose.navigation3.runtime.NavEntry -import com.tunjid.treenav.compose.transforms.PaneMappingDecorator -import com.tunjid.treenav.compose.transforms.PaneDecorator -import com.tunjid.treenav.compose.transforms.PaneRenderDecorator +import com.tunjid.treenav.compose.panedecorators.PaneMappingDecorator +import com.tunjid.treenav.compose.panedecorators.PaneDecorator +import com.tunjid.treenav.compose.panedecorators.PaneRenderDecorator /** * Class for configuring a [MultiPaneDisplay] for selecting, adapting and placing navigation diff --git a/library/compose/src/commonMain/kotlin/com/tunjid/treenav/compose/transforms/PaneDecorator.kt b/library/compose/src/commonMain/kotlin/com/tunjid/treenav/compose/panedecorators/PaneDecorator.kt similarity index 98% rename from library/compose/src/commonMain/kotlin/com/tunjid/treenav/compose/transforms/PaneDecorator.kt rename to library/compose/src/commonMain/kotlin/com/tunjid/treenav/compose/panedecorators/PaneDecorator.kt index d227970..8306f59 100644 --- a/library/compose/src/commonMain/kotlin/com/tunjid/treenav/compose/transforms/PaneDecorator.kt +++ b/library/compose/src/commonMain/kotlin/com/tunjid/treenav/compose/panedecorators/PaneDecorator.kt @@ -1,4 +1,4 @@ -package com.tunjid.treenav.compose.transforms +package com.tunjid.treenav.compose.panedecorators import androidx.compose.runtime.Composable import com.tunjid.treenav.Node diff --git a/library/compose/src/commonMain/kotlin/com/tunjid/treenav/compose/transforms/PaneModifierDecorator.kt b/library/compose/src/commonMain/kotlin/com/tunjid/treenav/compose/panedecorators/PaneModifierDecorator.kt similarity index 96% rename from library/compose/src/commonMain/kotlin/com/tunjid/treenav/compose/transforms/PaneModifierDecorator.kt rename to library/compose/src/commonMain/kotlin/com/tunjid/treenav/compose/panedecorators/PaneModifierDecorator.kt index 9e9bb39..4240bc4 100644 --- a/library/compose/src/commonMain/kotlin/com/tunjid/treenav/compose/transforms/PaneModifierDecorator.kt +++ b/library/compose/src/commonMain/kotlin/com/tunjid/treenav/compose/panedecorators/PaneModifierDecorator.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.tunjid.treenav.compose.transforms +package com.tunjid.treenav.compose.panedecorators import androidx.compose.foundation.layout.Box import androidx.compose.ui.Modifier diff --git a/sample/common/src/commonMain/kotlin/com/tunjid/demo/common/ui/DemoApp.kt b/sample/common/src/commonMain/kotlin/com/tunjid/demo/common/ui/DemoApp.kt index 1535e1a..f70afdc 100644 --- a/sample/common/src/commonMain/kotlin/com/tunjid/demo/common/ui/DemoApp.kt +++ b/sample/common/src/commonMain/kotlin/com/tunjid/demo/common/ui/DemoApp.kt @@ -87,8 +87,8 @@ import com.tunjid.treenav.compose.navigation3.ui.NavigationEventHandler import com.tunjid.treenav.compose.threepane.ThreePane import com.tunjid.treenav.compose.threepane.transforms.threePaneAdaptiveDecorator import com.tunjid.treenav.compose.threepane.transforms.threePanedMovableSharedElementDecorator -import com.tunjid.treenav.compose.transforms.PaneDecorator -import com.tunjid.treenav.compose.transforms.paneModifierDecorator +import com.tunjid.treenav.compose.panedecorators.PaneDecorator +import com.tunjid.treenav.compose.panedecorators.paneModifierDecorator import com.tunjid.treenav.pop import com.tunjid.treenav.popToRoot import com.tunjid.treenav.requireCurrent