[go: nahoru, domu]

[Material3][Defaults] Fix naming conventions for composable defaults

Test: N/A
RelNote: Fix naming conventions for composable defaults.
Bug: 239428178
Bug: 239427991
Bug: 239426747
Change-Id: I62b27a186bdad34390c0a7bda567f824f3def1ab
diff --git a/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/NavigationBar.kt b/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/NavigationBar.kt
index 42541a1..72f36d4 100644
--- a/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/NavigationBar.kt
+++ b/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/NavigationBar.kt
@@ -92,7 +92,7 @@
 @Composable
 fun NavigationBar(
     modifier: Modifier = Modifier,
-    containerColor: Color = NavigationBarDefaults.ContainerColor,
+    containerColor: Color = NavigationBarDefaults.containerColor,
     contentColor: Color = MaterialTheme.colorScheme.contentColorFor(containerColor),
     tonalElevation: Dp = NavigationBarDefaults.Elevation,
     content: @Composable RowScope.() -> Unit
@@ -242,11 +242,11 @@
 
 /** Defaults used in [NavigationBar]. */
 object NavigationBarDefaults {
-    /** Default color for a navigation bar. */
-    val ContainerColor: Color @Composable get() = NavigationBarTokens.ContainerColor.toColor()
-
     /** Default elevation for a navigation bar. */
     val Elevation: Dp = NavigationBarTokens.ContainerElevation
+
+    /** Default color for a navigation bar. */
+    val containerColor: Color @Composable get() = NavigationBarTokens.ContainerColor.toColor()
 }
 
 /** Defaults used in [NavigationBarItem]. */