Move pane order definitions to their respective scaffold defaults
Test: compile time
Change-Id: I77734bc2eac986db7ee4c9fad24c6ce03dac3abe
diff --git a/compose/material3/adaptive/adaptive-layout/src/androidInstrumentedTest/kotlin/androidx/compose/material3/adaptive/layout/ThreePaneScaffoldScreenshotTest.kt b/compose/material3/adaptive/adaptive-layout/src/androidInstrumentedTest/kotlin/androidx/compose/material3/adaptive/layout/ThreePaneScaffoldScreenshotTest.kt
index 4538a66..f16e8ae 100644
--- a/compose/material3/adaptive/adaptive-layout/src/androidInstrumentedTest/kotlin/androidx/compose/material3/adaptive/layout/ThreePaneScaffoldScreenshotTest.kt
+++ b/compose/material3/adaptive/adaptive-layout/src/androidInstrumentedTest/kotlin/androidx/compose/material3/adaptive/layout/ThreePaneScaffoldScreenshotTest.kt
@@ -462,7 +462,7 @@
SampleThreePaneScaffold(
scaffoldDirective,
scaffoldValue,
- ThreePaneScaffoldDefaults.ListDetailLayoutPaneOrder
+ ListDetailPaneScaffoldDefaults.PaneOrder
)
}
@@ -480,7 +480,7 @@
SampleThreePaneScaffold(
scaffoldDirective,
scaffoldValue,
- ThreePaneScaffoldDefaults.ListDetailLayoutPaneOrder
+ ListDetailPaneScaffoldDefaults.PaneOrder
)
}
@@ -501,7 +501,7 @@
SampleThreePaneScaffold(
scaffoldDirective = scaffoldDirective,
scaffoldValue = scaffoldValue,
- paneOrder = ThreePaneScaffoldDefaults.ListDetailLayoutPaneOrder,
+ paneOrder = ListDetailPaneScaffoldDefaults.PaneOrder,
paneExpansionState = paneExpansionState,
paneExpansionDragHandle = paneExpansionDragHandle
)
diff --git a/compose/material3/adaptive/adaptive-layout/src/androidInstrumentedTest/kotlin/androidx/compose/material3/adaptive/layout/ThreePaneScaffoldTest.kt b/compose/material3/adaptive/adaptive-layout/src/androidInstrumentedTest/kotlin/androidx/compose/material3/adaptive/layout/ThreePaneScaffoldTest.kt
index f738efb..fa8853c 100644
--- a/compose/material3/adaptive/adaptive-layout/src/androidInstrumentedTest/kotlin/androidx/compose/material3/adaptive/layout/ThreePaneScaffoldTest.kt
+++ b/compose/material3/adaptive/adaptive-layout/src/androidInstrumentedTest/kotlin/androidx/compose/material3/adaptive/layout/ThreePaneScaffoldTest.kt
@@ -176,7 +176,7 @@
SampleThreePaneScaffold(
MockScaffoldDirective,
scaffoldValue,
- ThreePaneScaffoldDefaults.ListDetailLayoutPaneOrder
+ ListDetailPaneScaffoldDefaults.PaneOrder
)
}
diff --git a/compose/material3/adaptive/adaptive-layout/src/androidUnitTest/kotlin/androidx/compose/material3/adaptive/layout/ThreePaneMotionTest.kt b/compose/material3/adaptive/adaptive-layout/src/androidUnitTest/kotlin/androidx/compose/material3/adaptive/layout/ThreePaneMotionTest.kt
index d39835c..4b6ec8b 100644
--- a/compose/material3/adaptive/adaptive-layout/src/androidUnitTest/kotlin/androidx/compose/material3/adaptive/layout/ThreePaneMotionTest.kt
+++ b/compose/material3/adaptive/adaptive-layout/src/androidUnitTest/kotlin/androidx/compose/material3/adaptive/layout/ThreePaneMotionTest.kt
@@ -353,5 +353,5 @@
}
@OptIn(ExperimentalMaterial3AdaptiveApi::class)
-internal val PaneOrder = ThreePaneScaffoldDefaults.SupportingPaneLayoutPaneOrder
+internal val PaneOrder = SupportingPaneScaffoldDefaults.PaneOrder
internal const val SpacerSize = 123
diff --git a/compose/material3/adaptive/adaptive-layout/src/commonMain/kotlin/androidx/compose/material3/adaptive/layout/ListDetailPaneScaffold.kt b/compose/material3/adaptive/adaptive-layout/src/commonMain/kotlin/androidx/compose/material3/adaptive/layout/ListDetailPaneScaffold.kt
index 6ab8f53..6c3906d 100644
--- a/compose/material3/adaptive/adaptive-layout/src/commonMain/kotlin/androidx/compose/material3/adaptive/layout/ListDetailPaneScaffold.kt
+++ b/compose/material3/adaptive/adaptive-layout/src/commonMain/kotlin/androidx/compose/material3/adaptive/layout/ListDetailPaneScaffold.kt
@@ -58,7 +58,7 @@
modifier = modifier.fillMaxSize(),
scaffoldDirective = directive,
scaffoldValue = value,
- paneOrder = ThreePaneScaffoldDefaults.ListDetailLayoutPaneOrder,
+ paneOrder = ListDetailPaneScaffoldDefaults.PaneOrder,
secondaryPane = listPane,
tertiaryPane = extraPane,
primaryPane = detailPane
@@ -87,6 +87,17 @@
listPaneAdaptStrategy,
extraPaneAdaptStrategy
)
+
+ /**
+ * Denotes [ThreePaneScaffold] to use the list-detail pane-order to arrange its panes
+ * horizontally, which allocates panes in the order of secondary, primary, and tertiary from
+ * start to end.
+ */
+ internal val PaneOrder = ThreePaneScaffoldHorizontalOrder(
+ ThreePaneScaffoldRole.Secondary,
+ ThreePaneScaffoldRole.Primary,
+ ThreePaneScaffoldRole.Tertiary
+ )
}
/**
diff --git a/compose/material3/adaptive/adaptive-layout/src/commonMain/kotlin/androidx/compose/material3/adaptive/layout/SupportingPaneScaffold.kt b/compose/material3/adaptive/adaptive-layout/src/commonMain/kotlin/androidx/compose/material3/adaptive/layout/SupportingPaneScaffold.kt
index 8c62ee1..6e76baf 100644
--- a/compose/material3/adaptive/adaptive-layout/src/commonMain/kotlin/androidx/compose/material3/adaptive/layout/SupportingPaneScaffold.kt
+++ b/compose/material3/adaptive/adaptive-layout/src/commonMain/kotlin/androidx/compose/material3/adaptive/layout/SupportingPaneScaffold.kt
@@ -52,7 +52,7 @@
modifier = modifier.fillMaxSize(),
scaffoldDirective = directive,
scaffoldValue = value,
- paneOrder = ThreePaneScaffoldDefaults.SupportingPaneLayoutPaneOrder,
+ paneOrder = SupportingPaneScaffoldDefaults.PaneOrder,
secondaryPane = supportingPane,
tertiaryPane = extraPane,
primaryPane = mainPane
@@ -81,6 +81,17 @@
supportingPaneAdaptStrategy,
extraPaneAdaptStrategy
)
+
+ /**
+ * Denotes [ThreePaneScaffold] to use the supporting-pane pane-order to arrange its panes
+ * horizontally, which allocates panes in the order of primary, secondary, and tertiary from
+ * start to end.
+ */
+ internal val PaneOrder = ThreePaneScaffoldHorizontalOrder(
+ ThreePaneScaffoldRole.Primary,
+ ThreePaneScaffoldRole.Secondary,
+ ThreePaneScaffoldRole.Tertiary
+ )
}
/**
diff --git a/compose/material3/adaptive/adaptive-layout/src/commonMain/kotlin/androidx/compose/material3/adaptive/layout/ThreePaneScaffold.kt b/compose/material3/adaptive/adaptive-layout/src/commonMain/kotlin/androidx/compose/material3/adaptive/layout/ThreePaneScaffold.kt
index 6e92343..75eaeca 100644
--- a/compose/material3/adaptive/adaptive-layout/src/commonMain/kotlin/androidx/compose/material3/adaptive/layout/ThreePaneScaffold.kt
+++ b/compose/material3/adaptive/adaptive-layout/src/commonMain/kotlin/androidx/compose/material3/adaptive/layout/ThreePaneScaffold.kt
@@ -872,30 +872,6 @@
*/
@ExperimentalMaterial3AdaptiveApi
internal object ThreePaneScaffoldDefaults {
- /**
- * Denotes [ThreePaneScaffold] to use the list-detail pane-order to arrange its panes
- * horizontally, which allocates panes in the order of secondary, primary, and tertiary from
- * start to end.
- */
- // TODO(conradchen/sgibly): Consider moving this to the ListDetailPaneScaffoldDefaults
- val ListDetailLayoutPaneOrder = ThreePaneScaffoldHorizontalOrder(
- ThreePaneScaffoldRole.Secondary,
- ThreePaneScaffoldRole.Primary,
- ThreePaneScaffoldRole.Tertiary
- )
-
- /**
- * Denotes [ThreePaneScaffold] to use the supporting-pane pane-order to arrange its panes
- * horizontally, which allocates panes in the order of primary, secondary, and tertiary from
- * start to end.
- */
- // TODO(conradchen/sgibly): Consider moving this to the SupportingPaneScaffoldDefaults
- val SupportingPaneLayoutPaneOrder = ThreePaneScaffoldHorizontalOrder(
- ThreePaneScaffoldRole.Primary,
- ThreePaneScaffoldRole.Secondary,
- ThreePaneScaffoldRole.Tertiary
- )
-
// TODO(conradchen): consider declaring a value class for priority
const val PrimaryPanePriority = 10
const val SecondaryPanePriority = 5
