Merge "Updating tokens to v0_76" into androidx-main
diff --git a/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/Button.kt b/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/Button.kt
index 6b44cef..c1f231a 100644
--- a/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/Button.kt
+++ b/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/Button.kt
@@ -34,7 +34,7 @@
import androidx.compose.foundation.layout.padding
import androidx.compose.material3.tokens.ElevatedButtonTokens
import androidx.compose.material3.tokens.FilledButtonTokens
-import androidx.compose.material3.tokens.FilledButtonTonalTokens
+import androidx.compose.material3.tokens.FilledTonalButtonTokens
import androidx.compose.material3.tokens.OutlinedButtonTokens
import androidx.compose.material3.tokens.TextButtonTokens
import androidx.compose.material3.tokens.TypographyTokens
@@ -270,7 +270,7 @@
enabled: Boolean = true,
interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
elevation: ButtonElevation? = ButtonDefaults.filledTonalButtonElevation(),
- shape: Shape = FilledButtonTonalTokens.ContainerShape,
+ shape: Shape = FilledTonalButtonTokens.ContainerShape,
border: BorderStroke? = null,
colors: ButtonColors = ButtonDefaults.filledTonalButtonColors(),
contentPadding: PaddingValues = ButtonDefaults.ContentPadding,
@@ -568,14 +568,14 @@
*/
@Composable
fun filledTonalButtonColors(
- containerColor: Color = FilledButtonTonalTokens.ContainerColor.toColor(),
- contentColor: Color = FilledButtonTonalTokens.LabelTextColor.toColor(),
- disabledContainerColor: Color = FilledButtonTonalTokens.DisabledContainerColor
+ containerColor: Color = FilledTonalButtonTokens.ContainerColor.toColor(),
+ contentColor: Color = FilledTonalButtonTokens.LabelTextColor.toColor(),
+ disabledContainerColor: Color = FilledTonalButtonTokens.DisabledContainerColor
.toColor()
- .copy(alpha = FilledButtonTonalTokens.DisabledContainerOpacity),
- disabledContentColor: Color = FilledButtonTonalTokens.DisabledLabelTextColor
+ .copy(alpha = FilledTonalButtonTokens.DisabledContainerOpacity),
+ disabledContentColor: Color = FilledTonalButtonTokens.DisabledLabelTextColor
.toColor()
- .copy(alpha = FilledButtonTonalTokens.DisabledLabelTextOpacity),
+ .copy(alpha = FilledTonalButtonTokens.DisabledLabelTextOpacity),
): ButtonColors =
DefaultButtonColors(
containerColor = containerColor,
@@ -720,10 +720,10 @@
*/
@Composable
fun filledTonalButtonElevation(
- defaultElevation: Dp = FilledButtonTonalTokens.ContainerElevation,
- pressedElevation: Dp = FilledButtonTonalTokens.PressedContainerElevation,
- focusedElevation: Dp = FilledButtonTonalTokens.FocusContainerElevation,
- hoveredElevation: Dp = FilledButtonTonalTokens.HoverContainerElevation,
+ defaultElevation: Dp = FilledTonalButtonTokens.ContainerElevation,
+ pressedElevation: Dp = FilledTonalButtonTokens.PressedContainerElevation,
+ focusedElevation: Dp = FilledTonalButtonTokens.FocusContainerElevation,
+ hoveredElevation: Dp = FilledTonalButtonTokens.HoverContainerElevation,
disabledElevation: Dp = 0.dp
): ButtonElevation {
return remember(
diff --git a/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/BadgeTokens.kt b/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/BadgeTokens.kt
index 40bd2f2..6236ce1 100644
--- a/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/BadgeTokens.kt
+++ b/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/BadgeTokens.kt
@@ -13,13 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+// VERSION: v0_76
// GENERATED CODE - DO NOT MODIFY BY HAND
-// TO MODIFY THIS FILE UPDATE:
-// ux/material/dsdb/contrib/generators/tokens/src/compose/templates/component.jinja2
package androidx.compose.material3.tokens
-import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.ui.unit.dp
internal object BadgeTokens {
@@ -27,8 +25,8 @@
val LargeColor = ColorSchemeKeyTokens.Error
val LargeLabelTextColor = ColorSchemeKeyTokens.OnError
val LargeLabelTextFont = TypographyKeyTokens.LabelSmall
- val LargeShape = RoundedCornerShape(8.0.dp)
+ val LargeShape = ShapeTokens.CornerFull
val LargeSize = 16.0.dp
- val Shape = RoundedCornerShape(3.0.dp)
+ val Shape = ShapeTokens.CornerFull
val Size = 6.0.dp
}
diff --git a/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/CheckboxTokens.kt b/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/CheckboxTokens.kt
index dbe9eaa..777aaef 100644
--- a/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/CheckboxTokens.kt
+++ b/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/CheckboxTokens.kt
@@ -13,13 +13,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+// VERSION: v0_76
// GENERATED CODE - DO NOT MODIFY BY HAND
package androidx.compose.material3.tokens
+import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.ui.unit.dp
internal object CheckboxTokens {
+ val ContainerShape = RoundedCornerShape(2.0.dp)
val DisabledSelectedIconColor = ColorSchemeKeyTokens.Primary
const val DisabledSelectedIconOpacity = 0.38f
val DisabledUnselectedIconColor = ColorSchemeKeyTokens.Primary
diff --git a/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/CircularProgressIndicatorTokens.kt b/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/CircularProgressIndicatorTokens.kt
index 3d5fe24..5952b60 100644
--- a/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/CircularProgressIndicatorTokens.kt
+++ b/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/CircularProgressIndicatorTokens.kt
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+// VERSION: v0_76
// GENERATED CODE - DO NOT MODIFY BY HAND
package androidx.compose.material3.tokens
@@ -21,6 +22,7 @@
internal object CircularProgressIndicatorTokens {
val ActiveIndicatorColor = ColorSchemeKeyTokens.Primary
+ val ActiveShape = ShapeTokens.CornerNone
val ActiveIndicatorWidth = 4.0.dp
val FourColorActiveIndicatorFourColor = ColorSchemeKeyTokens.TertiaryContainer
val FourColorActiveIndicatorOneColor = ColorSchemeKeyTokens.Primary
diff --git a/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/ColorDarkTokens.kt b/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/ColorDarkTokens.kt
index d7a1e8b..6b0f41d 100644
--- a/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/ColorDarkTokens.kt
+++ b/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/ColorDarkTokens.kt
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+// VERSION: v0_76
// GENERATED CODE - DO NOT MODIFY BY HAND
package androidx.compose.material3.tokens
diff --git a/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/ColorLightTokens.kt b/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/ColorLightTokens.kt
index 41e2ae8..bb04d20 100644
--- a/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/ColorLightTokens.kt
+++ b/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/ColorLightTokens.kt
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+// VERSION: v0_76
// GENERATED CODE - DO NOT MODIFY BY HAND
package androidx.compose.material3.tokens
diff --git a/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/ColorSchemeKeyTokens.kt b/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/ColorSchemeKeyTokens.kt
index 1cd5f5f..f72297c 100644
--- a/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/ColorSchemeKeyTokens.kt
+++ b/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/ColorSchemeKeyTokens.kt
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+// VERSION: v0_76
// GENERATED CODE - DO NOT MODIFY BY HAND
package androidx.compose.material3.tokens
diff --git a/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/DialogTokens.kt b/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/DialogTokens.kt
index be70c69..20f4f45 100644
--- a/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/DialogTokens.kt
+++ b/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/DialogTokens.kt
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+// VERSION: v0_76
// GENERATED CODE - DO NOT MODIFY BY HAND
package androidx.compose.material3.tokens
-import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.ui.unit.dp
internal object DialogTokens {
@@ -31,7 +31,7 @@
val ActionPressedStateLayerColor = ColorSchemeKeyTokens.Primary
val ContainerColor = ColorSchemeKeyTokens.Surface
val ContainerElevation = ElevationTokens.Level3
- val ContainerShape = RoundedCornerShape(28.0.dp)
+ val ContainerShape = ShapeTokens.CornerExtraLarge
val SubheadColor = ColorSchemeKeyTokens.OnSurface
val SubheadFont = TypographyKeyTokens.HeadlineSmall
val SupportingTextColor = ColorSchemeKeyTokens.OnSurfaceVariant
diff --git a/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/ElevatedButtonTokens.kt b/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/ElevatedButtonTokens.kt
index bbdb795..e2e040c 100644
--- a/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/ElevatedButtonTokens.kt
+++ b/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/ElevatedButtonTokens.kt
@@ -13,18 +13,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+// VERSION: v0_76
// GENERATED CODE - DO NOT MODIFY BY HAND
package androidx.compose.material3.tokens
-import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.ui.unit.dp
internal object ElevatedButtonTokens {
val ContainerColor = ColorSchemeKeyTokens.Surface
val ContainerElevation = ElevationTokens.Level1
val ContainerHeight = 40.0.dp
- val ContainerShape = RoundedCornerShape(20.0.dp)
+ val ContainerShape = ShapeTokens.CornerFull
val DisabledContainerColor = ColorSchemeKeyTokens.OnSurface
val DisabledContainerElevation = ElevationTokens.Level0
const val DisabledContainerOpacity = 0.12f
diff --git a/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/ElevatedCardTokens.kt b/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/ElevatedCardTokens.kt
index 806f27d..e3b14c6 100644
--- a/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/ElevatedCardTokens.kt
+++ b/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/ElevatedCardTokens.kt
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+// VERSION: v0_76
// GENERATED CODE - DO NOT MODIFY BY HAND
package androidx.compose.material3.tokens
@@ -22,7 +23,7 @@
internal object ElevatedCardTokens {
val ContainerColor = ColorSchemeKeyTokens.Surface
val ContainerElevation = ElevationTokens.Level1
- val ContainerShape = ShapeTokens.Medium
+ val ContainerShape = ShapeTokens.CornerMedium
val DraggedContainerElevation = ElevationTokens.Level4
val DraggedStateLayerColor = ColorSchemeKeyTokens.OnSurface
val FocusContainerElevation = ElevationTokens.Level1
diff --git a/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/ElevationTokens.kt b/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/ElevationTokens.kt
index a301b6d..01485ae 100644
--- a/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/ElevationTokens.kt
+++ b/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/ElevationTokens.kt
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+// VERSION: v0_76
// GENERATED CODE - DO NOT MODIFY BY HAND
package androidx.compose.material3.tokens
diff --git a/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/ExtendedFabPrimaryTokens.kt b/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/ExtendedFabPrimaryTokens.kt
index c38ed9c..612d634 100644
--- a/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/ExtendedFabPrimaryTokens.kt
+++ b/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/ExtendedFabPrimaryTokens.kt
@@ -13,18 +13,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+// VERSION: v0_76
// GENERATED CODE - DO NOT MODIFY BY HAND
package androidx.compose.material3.tokens
-import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.ui.unit.dp
internal object ExtendedFabPrimaryTokens {
val ContainerColor = ColorSchemeKeyTokens.PrimaryContainer
val ContainerElevation = ElevationTokens.Level3
val ContainerHeight = 56.0.dp
- val ContainerShape = RoundedCornerShape(16.0.dp)
+ val ContainerShape = ShapeTokens.CornerLarge
val FocusContainerElevation = ElevationTokens.Level3
val FocusIconColor = ColorSchemeKeyTokens.OnPrimaryContainer
val FocusLabelTextColor = ColorSchemeKeyTokens.OnPrimaryContainer
diff --git a/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/FabPrimaryLargeTokens.kt b/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/FabPrimaryLargeTokens.kt
index e0d825a..e3f22b2 100644
--- a/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/FabPrimaryLargeTokens.kt
+++ b/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/FabPrimaryLargeTokens.kt
@@ -13,18 +13,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+// VERSION: v0_76
// GENERATED CODE - DO NOT MODIFY BY HAND
package androidx.compose.material3.tokens
-import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.ui.unit.dp
internal object FabPrimaryLargeTokens {
val ContainerColor = ColorSchemeKeyTokens.PrimaryContainer
val ContainerElevation = ElevationTokens.Level3
val ContainerHeight = 96.0.dp
- val ContainerShape = RoundedCornerShape(28.0.dp)
+ val ContainerShape = ShapeTokens.CornerExtraLarge
val ContainerWidth = 96.0.dp
val FocusContainerElevation = ElevationTokens.Level3
val FocusIconColor = ColorSchemeKeyTokens.OnPrimaryContainer
diff --git a/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/FabPrimarySmallTokens.kt b/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/FabPrimarySmallTokens.kt
index 2fe18e68..61c9ac3 100644
--- a/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/FabPrimarySmallTokens.kt
+++ b/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/FabPrimarySmallTokens.kt
@@ -13,18 +13,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+// VERSION: v0_76
// GENERATED CODE - DO NOT MODIFY BY HAND
package androidx.compose.material3.tokens
-import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.ui.unit.dp
internal object FabPrimarySmallTokens {
val ContainerColor = ColorSchemeKeyTokens.PrimaryContainer
val ContainerElevation = ElevationTokens.Level3
val ContainerHeight = 40.0.dp
- val ContainerShape = RoundedCornerShape(12.0.dp)
+ val ContainerShape = ShapeTokens.CornerMedium
val ContainerWidth = 40.0.dp
val FocusContainerElevation = ElevationTokens.Level3
val FocusIconColor = ColorSchemeKeyTokens.OnPrimaryContainer
diff --git a/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/FabPrimaryTokens.kt b/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/FabPrimaryTokens.kt
index c34d2f1..0b95df5 100644
--- a/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/FabPrimaryTokens.kt
+++ b/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/FabPrimaryTokens.kt
@@ -13,18 +13,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+// VERSION: v0_76
// GENERATED CODE - DO NOT MODIFY BY HAND
package androidx.compose.material3.tokens
-import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.ui.unit.dp
internal object FabPrimaryTokens {
val ContainerColor = ColorSchemeKeyTokens.PrimaryContainer
val ContainerElevation = ElevationTokens.Level3
val ContainerHeight = 56.0.dp
- val ContainerShape = RoundedCornerShape(16.0.dp)
+ val ContainerShape = ShapeTokens.CornerLarge
val ContainerWidth = 56.0.dp
val FocusContainerElevation = ElevationTokens.Level3
val FocusIconColor = ColorSchemeKeyTokens.OnPrimaryContainer
diff --git a/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/FilledButtonTokens.kt b/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/FilledButtonTokens.kt
index 74eea7a..03d54ec 100644
--- a/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/FilledButtonTokens.kt
+++ b/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/FilledButtonTokens.kt
@@ -13,18 +13,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+// VERSION: v0_76
// GENERATED CODE - DO NOT MODIFY BY HAND
package androidx.compose.material3.tokens
-import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.ui.unit.dp
internal object FilledButtonTokens {
val ContainerColor = ColorSchemeKeyTokens.Primary
val ContainerElevation = ElevationTokens.Level0
val ContainerHeight = 40.0.dp
- val ContainerShape = RoundedCornerShape(20.0.dp)
+ val ContainerShape = ShapeTokens.CornerFull
val DisabledContainerColor = ColorSchemeKeyTokens.OnSurface
val DisabledContainerElevation = ElevationTokens.Level0
const val DisabledContainerOpacity = 0.12f
diff --git a/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/FilledCardTokens.kt b/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/FilledCardTokens.kt
index a4d59b7..13c9338 100644
--- a/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/FilledCardTokens.kt
+++ b/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/FilledCardTokens.kt
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+// VERSION: v0_76
// GENERATED CODE - DO NOT MODIFY BY HAND
package androidx.compose.material3.tokens
@@ -22,7 +23,7 @@
internal object FilledCardTokens {
val ContainerColor = ColorSchemeKeyTokens.SurfaceVariant
val ContainerElevation = ElevationTokens.Level0
- val ContainerShape = ShapeTokens.Medium
+ val ContainerShape = ShapeTokens.CornerMedium
val DraggedContainerElevation = ElevationTokens.Level3
val DraggedStateLayerColor = ColorSchemeKeyTokens.OnSurface
val FocusContainerElevation = ElevationTokens.Level0
diff --git a/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/FilledButtonTonalTokens.kt b/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/FilledTonalButtonTokens.kt
similarity index 92%
rename from compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/FilledButtonTonalTokens.kt
rename to compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/FilledTonalButtonTokens.kt
index 4835f99..4005b7e 100644
--- a/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/FilledButtonTonalTokens.kt
+++ b/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/FilledTonalButtonTokens.kt
@@ -13,19 +13,20 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+// VERSION: v0_76
// GENERATED CODE - DO NOT MODIFY BY HAND
package androidx.compose.material3.tokens
-import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.ui.unit.dp
-internal object FilledButtonTonalTokens {
+internal object FilledTonalButtonTokens {
val ContainerColor = ColorSchemeKeyTokens.SecondaryContainer
val ContainerElevation = ElevationTokens.Level0
val ContainerHeight = 40.0.dp
- val ContainerShape = RoundedCornerShape(20.0.dp)
+ val ContainerShape = ShapeTokens.CornerFull
val DisabledContainerColor = ColorSchemeKeyTokens.OnSurface
+ val DisabledContainerElevation = ElevationTokens.Level0
const val DisabledContainerOpacity = 0.12f
val DisabledLabelTextColor = ColorSchemeKeyTokens.OnSurface
const val DisabledLabelTextOpacity = 0.38f
diff --git a/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/IconButtonTokens.kt b/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/IconButtonTokens.kt
index 2720a0e..6dc4fea 100644
--- a/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/IconButtonTokens.kt
+++ b/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/IconButtonTokens.kt
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+// VERSION: v0_76
// GENERATED CODE - DO NOT MODIFY BY HAND
package androidx.compose.material3.tokens
@@ -22,13 +23,21 @@
internal object IconButtonTokens {
val DisabledIconColor = ColorSchemeKeyTokens.OnSurface
const val DisabledIconOpacity = 0.38f
- val FocusIconColor = ColorSchemeKeyTokens.Primary
- val FocusStateLayerColor = ColorSchemeKeyTokens.Primary
- val HoverIconColor = ColorSchemeKeyTokens.Primary
- val HoverStateLayerColor = ColorSchemeKeyTokens.Primary
- val IconColor = ColorSchemeKeyTokens.Primary
val IconSize = 24.0.dp
- val PressedIconColor = ColorSchemeKeyTokens.Primary
- val PressedStateLayerColor = ColorSchemeKeyTokens.Primary
+ val SelectedFocusIconColor = ColorSchemeKeyTokens.Primary
+ val SelectedFocusStateLayerColor = ColorSchemeKeyTokens.Primary
+ val SelectedHoverIconColor = ColorSchemeKeyTokens.Primary
+ val SelectedHoverStateLayerColor = ColorSchemeKeyTokens.Primary
+ val SelectedIconColor = ColorSchemeKeyTokens.Primary
+ val SelectedPressedIconColor = ColorSchemeKeyTokens.Primary
+ val SelectedPressedStateLayerColor = ColorSchemeKeyTokens.Primary
+ val StateLayerShape = ShapeTokens.CornerFull
val StateLayerSize = 40.0.dp
+ val UnselectedFocusIconColor = ColorSchemeKeyTokens.OnSurfaceVariant
+ val UnselectedFocusStateLayerColor = ColorSchemeKeyTokens.OnSurfaceVariant
+ val UnselectedHoverIconColor = ColorSchemeKeyTokens.OnSurfaceVariant
+ val UnselectedHoverStateLayerColor = ColorSchemeKeyTokens.OnSurfaceVariant
+ val UnselectedIconColor = ColorSchemeKeyTokens.OnSurfaceVariant
+ val UnselectedPressedIconColor = ColorSchemeKeyTokens.OnSurfaceVariant
+ val UnselectedPressedStateLayerColor = ColorSchemeKeyTokens.OnSurfaceVariant
}
diff --git a/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/LinearProgressIndicatorTokens.kt b/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/LinearProgressIndicatorTokens.kt
index c8c47266..eda5234 100644
--- a/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/LinearProgressIndicatorTokens.kt
+++ b/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/LinearProgressIndicatorTokens.kt
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+// VERSION: v0_76
// GENERATED CODE - DO NOT MODIFY BY HAND
package androidx.compose.material3.tokens
@@ -22,10 +23,12 @@
internal object LinearProgressIndicatorTokens {
val ActiveIndicatorColor = ColorSchemeKeyTokens.Primary
val ActiveIndicatorHeight = 4.0.dp
+ val ActiveShape = ShapeTokens.CornerNone
val FourColorActiveIndicatorFourColor = ColorSchemeKeyTokens.TertiaryContainer
val FourColorActiveIndicatorOneColor = ColorSchemeKeyTokens.Primary
val FourColorActiveIndicatorThreeColor = ColorSchemeKeyTokens.Tertiary
val FourColorActiveIndicatorTwoColor = ColorSchemeKeyTokens.PrimaryContainer
val TrackColor = ColorSchemeKeyTokens.SurfaceVariant
val TrackHeight = 4.0.dp
+ val TrackShape = ShapeTokens.CornerNone
}
diff --git a/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/MenuTokens.kt b/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/MenuTokens.kt
index 4602731..f5d5f44 100644
--- a/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/MenuTokens.kt
+++ b/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/MenuTokens.kt
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+// VERSION: v0_76
// GENERATED CODE - DO NOT MODIFY BY HAND
package androidx.compose.material3.tokens
@@ -22,7 +23,7 @@
internal object MenuTokens {
val ContainerColor = ColorSchemeKeyTokens.Surface
val ContainerElevation = ElevationTokens.Level2
- val ContainerShape = ShapeTokens.Small
+ val ContainerShape = ShapeTokens.CornerExtraSmall
val DividerColor = ColorSchemeKeyTokens.SurfaceVariant
val DividerHeight = 1.0.dp
val ListItemContainerHeight = 48.0.dp
diff --git a/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/NavigationBarTokens.kt b/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/NavigationBarTokens.kt
index 72dae76..1206292 100644
--- a/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/NavigationBarTokens.kt
+++ b/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/NavigationBarTokens.kt
@@ -13,32 +13,33 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+// VERSION: v0_76
// GENERATED CODE - DO NOT MODIFY BY HAND
package androidx.compose.material3.tokens
-import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.ui.unit.dp
internal object NavigationBarTokens {
- val ActiveFocusIconColor = ColorSchemeKeyTokens.OnSecondary
+ val ActiveFocusIconColor = ColorSchemeKeyTokens.OnSecondaryContainer
val ActiveFocusLabelTextColor = ColorSchemeKeyTokens.OnSurface
val ActiveFocusStateLayerColor = ColorSchemeKeyTokens.OnSurface
- val ActiveHoverIconColor = ColorSchemeKeyTokens.OnSecondary
+ val ActiveHoverIconColor = ColorSchemeKeyTokens.OnSecondaryContainer
val ActiveHoverLabelTextColor = ColorSchemeKeyTokens.OnSurface
val ActiveHoverStateLayerColor = ColorSchemeKeyTokens.OnSurface
val ActiveIconColor = ColorSchemeKeyTokens.OnSecondaryContainer
val ActiveIndicatorColor = ColorSchemeKeyTokens.SecondaryContainer
val ActiveIndicatorHeight = 32.0.dp
- val ActiveIndicatorShape = RoundedCornerShape(16.0.dp)
+ val ActiveIndicatorShape = ShapeTokens.CornerLarge
val ActiveIndicatorWidth = 64.0.dp
val ActiveLabelTextColor = ColorSchemeKeyTokens.OnSurface
- val ActivePressedIconColor = ColorSchemeKeyTokens.OnSecondary
+ val ActivePressedIconColor = ColorSchemeKeyTokens.OnSecondaryContainer
val ActivePressedLabelTextColor = ColorSchemeKeyTokens.OnSurface
val ActivePressedStateLayerColor = ColorSchemeKeyTokens.OnSurface
val ContainerColor = ColorSchemeKeyTokens.Surface
val ContainerElevation = ElevationTokens.Level2
val ContainerHeight = 80.0.dp
+ val ContainerShape = ShapeTokens.CornerNone
val IconSize = 24.0.dp
val InactiveFocusIconColor = ColorSchemeKeyTokens.OnSurface
val InactiveFocusLabelTextColor = ColorSchemeKeyTokens.OnSurface
@@ -52,4 +53,4 @@
val InactivePressedLabelTextColor = ColorSchemeKeyTokens.OnSurface
val InactivePressedStateLayerColor = ColorSchemeKeyTokens.OnSurface
val LabelTextFont = TypographyKeyTokens.LabelMedium
-}
\ No newline at end of file
+}
diff --git a/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/NavigationDrawerTokens.kt b/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/NavigationDrawerTokens.kt
index 7c47a58..d1faad5 100644
--- a/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/NavigationDrawerTokens.kt
+++ b/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/NavigationDrawerTokens.kt
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+// VERSION: v0_76
// GENERATED CODE - DO NOT MODIFY BY HAND
package androidx.compose.material3.tokens
-import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.ui.unit.dp
internal object NavigationDrawerTokens {
@@ -30,14 +30,16 @@
val ActiveIconColor = ColorSchemeKeyTokens.OnSecondaryContainer
val ActiveIndicatorColor = ColorSchemeKeyTokens.SecondaryContainer
val ActiveIndicatorHeight = 56.0.dp
- val ActiveIndicatorShape = RoundedCornerShape(28.0.dp)
+ val ActiveIndicatorShape = ShapeTokens.CornerFull
val ActiveIndicatorWidth = 336.0.dp
val ActiveLabelTextColor = ColorSchemeKeyTokens.OnSecondaryContainer
val ActivePressedIconColor = ColorSchemeKeyTokens.OnSecondaryContainer
val ActivePressedLabelTextColor = ColorSchemeKeyTokens.OnSecondaryContainer
val ActivePressedStateLayerColor = ColorSchemeKeyTokens.OnSecondaryContainer
+ val BottomContainerShape = ShapeTokens.CornerLargeTop
val ContainerColor = ColorSchemeKeyTokens.Surface
const val ContainerHeightPercent = 100.0f
+ val ContainerShape = ShapeTokens.CornerLargeEnd
val ContainerWidth = 360.0.dp
val DividerColor = ColorSchemeKeyTokens.Outline
val HeadlineColor = ColorSchemeKeyTokens.OnSurfaceVariant
@@ -55,7 +57,9 @@
val InactivePressedLabelTextColor = ColorSchemeKeyTokens.OnSurface
val InactivePressedStateLayerColor = ColorSchemeKeyTokens.OnSecondaryContainer
val LabelTextFont = TypographyKeyTokens.LabelLarge
+ val LargeBadgeLabelColor = ColorSchemeKeyTokens.OnSurfaceVariant
+ val LargeBadgeLabelFont = TypographyKeyTokens.LabelLarge
val ModalContainerElevation = ElevationTokens.Level1
const val ScrimOpacity = 0.4f
val StandardContainerElevation = ElevationTokens.Level0
-}
\ No newline at end of file
+}
diff --git a/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/NavigationRailTokens.kt b/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/NavigationRailTokens.kt
index 33b4548..a0e3186 100644
--- a/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/NavigationRailTokens.kt
+++ b/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/NavigationRailTokens.kt
@@ -13,31 +13,32 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+// VERSION: v0_76
// GENERATED CODE - DO NOT MODIFY BY HAND
package androidx.compose.material3.tokens
-import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.ui.unit.dp
internal object NavigationRailTokens {
- val ActiveFocusIconColor = ColorSchemeKeyTokens.OnSecondary
+ val ActiveFocusIconColor = ColorSchemeKeyTokens.OnSecondaryContainer
val ActiveFocusLabelTextColor = ColorSchemeKeyTokens.OnSurface
val ActiveFocusStateLayerColor = ColorSchemeKeyTokens.OnSurface
- val ActiveHoverIconColor = ColorSchemeKeyTokens.OnSecondary
+ val ActiveHoverIconColor = ColorSchemeKeyTokens.OnSecondaryContainer
val ActiveHoverLabelTextColor = ColorSchemeKeyTokens.OnSurface
val ActiveHoverStateLayerColor = ColorSchemeKeyTokens.OnSurface
val ActiveIconColor = ColorSchemeKeyTokens.OnSecondaryContainer
val ActiveIndicatorColor = ColorSchemeKeyTokens.SecondaryContainer
val ActiveIndicatorHeight = 32.0.dp
- val ActiveIndicatorShape = RoundedCornerShape(16.0.dp)
+ val ActiveIndicatorShape = ShapeTokens.CornerFull
val ActiveIndicatorWidth = 56.0.dp
val ActiveLabelTextColor = ColorSchemeKeyTokens.OnSurface
- val ActivePressedIconColor = ColorSchemeKeyTokens.OnSecondary
+ val ActivePressedIconColor = ColorSchemeKeyTokens.OnSecondaryContainer
val ActivePressedLabelTextColor = ColorSchemeKeyTokens.OnSurface
val ActivePressedStateLayerColor = ColorSchemeKeyTokens.OnSurface
val ContainerColor = ColorSchemeKeyTokens.Surface
val ContainerElevation = ElevationTokens.Level0
+ val ContainerShape = ShapeTokens.CornerNone
val ContainerWidth = 80.0.dp
val IconSize = 24.0.dp
val InactiveFocusIconColor = ColorSchemeKeyTokens.OnSurface
@@ -61,5 +62,5 @@
val MenuPressedIconColor = ColorSchemeKeyTokens.OnSurface
val MenuPressedStateLayerColor = ColorSchemeKeyTokens.OnSurface
val NoLabelActiveIndicatorHeight = 56.0.dp
- val NoLabelActiveIndicatorShape = RoundedCornerShape(28.0.dp)
-}
\ No newline at end of file
+ val NoLabelActiveIndicatorShape = ShapeTokens.CornerFull
+}
diff --git a/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/OutlinedButtonTokens.kt b/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/OutlinedButtonTokens.kt
index 5bf7a15..c3c5192 100644
--- a/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/OutlinedButtonTokens.kt
+++ b/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/OutlinedButtonTokens.kt
@@ -13,16 +13,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+// VERSION: v0_76
// GENERATED CODE - DO NOT MODIFY BY HAND
package androidx.compose.material3.tokens
-import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.ui.unit.dp
internal object OutlinedButtonTokens {
val ContainerHeight = 40.0.dp
- val ContainerShape = RoundedCornerShape(20.0.dp)
+ val ContainerShape = ShapeTokens.CornerFull
val DisabledLabelTextColor = ColorSchemeKeyTokens.OnSurface
const val DisabledLabelTextOpacity = 0.38f
val DisabledOutlineColor = ColorSchemeKeyTokens.OnSurface
@@ -40,7 +40,6 @@
val PressedLabelTextColor = ColorSchemeKeyTokens.Primary
val PressedOutlineColor = ColorSchemeKeyTokens.Outline
val PressedStateLayerColor = ColorSchemeKeyTokens.Primary
- val BackgroundContainerColor = ColorSchemeKeyTokens.Surface
val DisabledIconColor = ColorSchemeKeyTokens.OnSurface
const val DisabledIconOpacity = 0.38f
val FocusIconColor = ColorSchemeKeyTokens.Primary
diff --git a/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/OutlinedCardTokens.kt b/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/OutlinedCardTokens.kt
index 217b545..cf531a3 100644
--- a/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/OutlinedCardTokens.kt
+++ b/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/OutlinedCardTokens.kt
@@ -1,5 +1,5 @@
/*
- * Copyright 2022 The Android Open Source Project
+ * Copyright 2021 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+// VERSION: v0_76
// GENERATED CODE - DO NOT MODIFY BY HAND
package androidx.compose.material3.tokens
@@ -22,7 +23,7 @@
internal object OutlinedCardTokens {
val ContainerColor = ColorSchemeKeyTokens.Surface
val ContainerElevation = ElevationTokens.Level0
- val ContainerShape = ShapeTokens.Medium
+ val ContainerShape = ShapeTokens.CornerMedium
val DraggedContainerElevation = ElevationTokens.Level3
val DraggedOutlineColor = ColorSchemeKeyTokens.Outline
val DraggedStateLayerColor = ColorSchemeKeyTokens.OnSurface
diff --git a/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/PaletteTokens.kt b/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/PaletteTokens.kt
index c0cc9bd..658dddd3 100644
--- a/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/PaletteTokens.kt
+++ b/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/PaletteTokens.kt
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+// VERSION: v0_76
// GENERATED CODE - DO NOT MODIFY BY HAND
package androidx.compose.material3.tokens
diff --git a/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/RadioButtonTokens.kt b/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/RadioButtonTokens.kt
index 04fb1d1..33066be 100644
--- a/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/RadioButtonTokens.kt
+++ b/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/RadioButtonTokens.kt
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+// VERSION: v0_76
// GENERATED CODE - DO NOT MODIFY BY HAND
package androidx.compose.material3.tokens
diff --git a/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/ShapeTokens.kt b/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/ShapeTokens.kt
index f536558..c0034a0 100644
--- a/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/ShapeTokens.kt
+++ b/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/ShapeTokens.kt
@@ -13,16 +13,48 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+// VERSION: v0_76
// GENERATED CODE - DO NOT MODIFY BY HAND
package androidx.compose.material3.tokens
+import androidx.compose.foundation.shape.CircleShape
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.ui.unit.dp
-// TODO(b/209589029): Remove once the shape subsystem is in place.
internal object ShapeTokens {
- val Large = RoundedCornerShape(8.0.dp)
- val Medium = RoundedCornerShape(8.0.dp)
- val Small = RoundedCornerShape(4.0.dp)
+ val CornerExtraLarge = RoundedCornerShape(28.0.dp)
+ val CornerExtraLargeTop =
+ RoundedCornerShape(
+ topStart = 28.0.dp,
+ topEnd = 28.0.dp,
+ bottomEnd = 0.0.dp,
+ bottomStart = 0.0.dp
+ )
+ val CornerExtraSmall = RoundedCornerShape(4.0.dp)
+ val CornerExtraSmallTop = RoundedCornerShape(
+ topStart = 4.0.dp,
+ topEnd = 4.0.dp,
+ bottomEnd = 0.0.dp,
+ bottomStart = 0.0.dp
+ )
+ val CornerFull = CircleShape
+ val CornerLarge = RoundedCornerShape(16.0.dp)
+ val CornerLargeEnd =
+ RoundedCornerShape(
+ topStart = 0.0.dp,
+ topEnd = 16.0.dp,
+ bottomEnd = 16.0.dp,
+ bottomStart = 0.0.dp
+ )
+ val CornerLargeTop =
+ RoundedCornerShape(
+ topStart = 16.0.dp,
+ topEnd = 16.0.dp,
+ bottomEnd = 0.0.dp,
+ bottomStart = 0.0.dp
+ )
+ val CornerMedium = RoundedCornerShape(12.0.dp)
+ val CornerNone = RoundedCornerShape(0.0.dp)
+ val CornerSmall = RoundedCornerShape(8.0.dp)
}
diff --git a/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/SnackbarTokens.kt b/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/SnackbarTokens.kt
index 5fdfb41..6652b9f 100644
--- a/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/SnackbarTokens.kt
+++ b/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/SnackbarTokens.kt
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+// VERSION: v0_76
// GENERATED CODE - DO NOT MODIFY BY HAND
package androidx.compose.material3.tokens
@@ -30,8 +31,14 @@
val ActionPressedStateLayerColor = ColorSchemeKeyTokens.InversePrimary
val ContainerColor = ColorSchemeKeyTokens.InverseSurface
val ContainerElevation = ElevationTokens.Level3
- val ContainerShape = ShapeTokens.Small
+ val ContainerShape = ShapeTokens.CornerExtraSmall
val IconColor = ColorSchemeKeyTokens.InverseOnSurface
+ val FocusIconColor = ColorSchemeKeyTokens.InverseOnSurface
+ val IconFocusStateLayerColor = ColorSchemeKeyTokens.InverseOnSurface
+ val HoverIconColor = ColorSchemeKeyTokens.InverseOnSurface
+ val IconHoverStateLayerColor = ColorSchemeKeyTokens.InverseOnSurface
+ val PressedIconColor = ColorSchemeKeyTokens.InverseOnSurface
+ val IconPressedStateLayerColor = ColorSchemeKeyTokens.InverseOnSurface
val IconSize = 24.0.dp
val SupportingTextColor = ColorSchemeKeyTokens.InverseOnSurface
val SupportingTextFont = TypographyKeyTokens.BodyMedium
diff --git a/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/StateTokens.kt b/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/StateTokens.kt
index 497c18c..1a635be 100644
--- a/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/StateTokens.kt
+++ b/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/StateTokens.kt
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+// VERSION: v0_76
// GENERATED CODE - DO NOT MODIFY BY HAND
package androidx.compose.material3.tokens
@@ -22,4 +23,4 @@
const val FocusStateLayerOpacity = 0.12f
const val HoverStateLayerOpacity = 0.08f
const val PressedStateLayerOpacity = 0.12f
-}
\ No newline at end of file
+}
diff --git a/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/TextButtonTokens.kt b/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/TextButtonTokens.kt
index 7e6f215..f9da716 100644
--- a/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/TextButtonTokens.kt
+++ b/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/TextButtonTokens.kt
@@ -13,17 +13,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+// VERSION: v0_76
// GENERATED CODE - DO NOT MODIFY BY HAND
package androidx.compose.material3.tokens
-import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.ui.unit.dp
internal object TextButtonTokens {
- val ContainerElevation = ElevationTokens.Level0
val ContainerHeight = 40.0.dp
- val ContainerShape = RoundedCornerShape(20.0.dp)
+ val ContainerShape = ShapeTokens.CornerFull
+ val DisabledContainerColor = ColorSchemeKeyTokens.OnSurface
+ const val DisabledContainerOpacity = 0.12f
val DisabledLabelTextColor = ColorSchemeKeyTokens.OnSurface
const val DisabledLabelTextOpacity = 0.38f
val FocusLabelTextColor = ColorSchemeKeyTokens.Primary
diff --git a/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/TopAppBarLargeTokens.kt b/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/TopAppBarLargeTokens.kt
index 55ea285..37003e1 100644
--- a/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/TopAppBarLargeTokens.kt
+++ b/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/TopAppBarLargeTokens.kt
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+// VERSION: v0_76
// GENERATED CODE - DO NOT MODIFY BY HAND
package androidx.compose.material3.tokens
@@ -23,6 +24,7 @@
val ContainerColor = ColorSchemeKeyTokens.Surface
val ContainerElevation = ElevationTokens.Level0
val ContainerHeight = 152.0.dp
+ val ContainerShape = ShapeTokens.CornerNone
val HeadlineColor = ColorSchemeKeyTokens.OnSurface
val HeadlineFont = TypographyKeyTokens.HeadlineMedium
val LeadingIconColor = ColorSchemeKeyTokens.OnSurface
diff --git a/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/TopAppBarMediumTokens.kt b/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/TopAppBarMediumTokens.kt
index e53af13..11eb2a4 100644
--- a/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/TopAppBarMediumTokens.kt
+++ b/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/TopAppBarMediumTokens.kt
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+// VERSION: v0_76
// GENERATED CODE - DO NOT MODIFY BY HAND
package androidx.compose.material3.tokens
@@ -23,6 +24,7 @@
val ContainerColor = ColorSchemeKeyTokens.Surface
val ContainerElevation = ElevationTokens.Level0
val ContainerHeight = 112.0.dp
+ val ContainerShape = ShapeTokens.CornerNone
val HeadlineColor = ColorSchemeKeyTokens.OnSurface
val HeadlineFont = TypographyKeyTokens.HeadlineSmall
val LeadingIconColor = ColorSchemeKeyTokens.OnSurface
diff --git a/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/TopAppBarSmallCenteredTokens.kt b/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/TopAppBarSmallCenteredTokens.kt
index 0ce48b3..51f6f7b 100644
--- a/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/TopAppBarSmallCenteredTokens.kt
+++ b/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/TopAppBarSmallCenteredTokens.kt
@@ -13,19 +13,20 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+// VERSION: v0_76
// GENERATED CODE - DO NOT MODIFY BY HAND
package androidx.compose.material3.tokens
-import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.ui.unit.dp
internal object TopAppBarSmallCenteredTokens {
- val AvatarShape = RoundedCornerShape(15.0.dp)
+ val AvatarShape = ShapeTokens.CornerFull
val AvatarSize = 30.0.dp
val ContainerColor = ColorSchemeKeyTokens.Surface
val ContainerElevation = ElevationTokens.Level0
val ContainerHeight = 64.0.dp
+ val ContainerShape = ShapeTokens.CornerNone
val HeadlineColor = ColorSchemeKeyTokens.OnSurface
val HeadlineFont = TypographyKeyTokens.TitleLarge
val LeadingIconColor = ColorSchemeKeyTokens.OnSurface
diff --git a/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/TopAppBarSmallTokens.kt b/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/TopAppBarSmallTokens.kt
index 09a5cf4..0119f66 100644
--- a/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/TopAppBarSmallTokens.kt
+++ b/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/TopAppBarSmallTokens.kt
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+// VERSION: v0_76
// GENERATED CODE - DO NOT MODIFY BY HAND
package androidx.compose.material3.tokens
@@ -23,6 +24,7 @@
val ContainerColor = ColorSchemeKeyTokens.Surface
val ContainerElevation = ElevationTokens.Level0
val ContainerHeight = 64.0.dp
+ val ContainerShape = ShapeTokens.CornerNone
val HeadlineColor = ColorSchemeKeyTokens.OnSurface
val HeadlineFont = TypographyKeyTokens.TitleLarge
val LeadingIconColor = ColorSchemeKeyTokens.OnSurface
@@ -30,4 +32,4 @@
val OnScrollContainerElevation = ElevationTokens.Level2
val TrailingIconColor = ColorSchemeKeyTokens.OnSurfaceVariant
val TrailingIconSize = 24.0.dp
-}
\ No newline at end of file
+}
diff --git a/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/TypeScaleTokens.kt b/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/TypeScaleTokens.kt
index 250c436..079b793 100644
--- a/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/TypeScaleTokens.kt
+++ b/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/TypeScaleTokens.kt
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+// VERSION: v0_76
// GENERATED CODE - DO NOT MODIFY BY HAND
package androidx.compose.material3.tokens
@@ -20,77 +21,77 @@
import androidx.compose.ui.unit.sp
internal object TypeScaleTokens {
- val BodyLargeFont = TypefaceTokens.PlainRegular
+ val BodyLargeFont = TypefaceTokens.Plain
val BodyLargeLineHeight = 24.0.sp
val BodyLargeSize = 16.sp
val BodyLargeTracking = 0.5.sp
val BodyLargeWeight = TypefaceTokens.WeightRegular
- val BodyMediumFont = TypefaceTokens.PlainRegular
+ val BodyMediumFont = TypefaceTokens.Plain
val BodyMediumLineHeight = 20.0.sp
val BodyMediumSize = 14.sp
val BodyMediumTracking = 0.2.sp
val BodyMediumWeight = TypefaceTokens.WeightRegular
- val BodySmallFont = TypefaceTokens.PlainRegular
+ val BodySmallFont = TypefaceTokens.Plain
val BodySmallLineHeight = 16.0.sp
val BodySmallSize = 12.sp
val BodySmallTracking = 0.4.sp
val BodySmallWeight = TypefaceTokens.WeightRegular
- val DisplayLargeFont = TypefaceTokens.BrandRegular
+ val DisplayLargeFont = TypefaceTokens.Brand
val DisplayLargeLineHeight = 64.0.sp
val DisplayLargeSize = 57.sp
val DisplayLargeTracking = -0.2.sp
val DisplayLargeWeight = TypefaceTokens.WeightRegular
- val DisplayMediumFont = TypefaceTokens.BrandRegular
+ val DisplayMediumFont = TypefaceTokens.Brand
val DisplayMediumLineHeight = 52.0.sp
val DisplayMediumSize = 45.sp
val DisplayMediumTracking = 0.0.sp
val DisplayMediumWeight = TypefaceTokens.WeightRegular
- val DisplaySmallFont = TypefaceTokens.BrandRegular
+ val DisplaySmallFont = TypefaceTokens.Brand
val DisplaySmallLineHeight = 44.0.sp
val DisplaySmallSize = 36.sp
val DisplaySmallTracking = 0.0.sp
val DisplaySmallWeight = TypefaceTokens.WeightRegular
- val HeadlineLargeFont = TypefaceTokens.BrandRegular
+ val HeadlineLargeFont = TypefaceTokens.Brand
val HeadlineLargeLineHeight = 40.0.sp
val HeadlineLargeSize = 32.sp
val HeadlineLargeTracking = 0.0.sp
val HeadlineLargeWeight = TypefaceTokens.WeightRegular
- val HeadlineMediumFont = TypefaceTokens.BrandRegular
+ val HeadlineMediumFont = TypefaceTokens.Brand
val HeadlineMediumLineHeight = 36.0.sp
val HeadlineMediumSize = 28.sp
val HeadlineMediumTracking = 0.0.sp
val HeadlineMediumWeight = TypefaceTokens.WeightRegular
- val HeadlineSmallFont = TypefaceTokens.BrandRegular
+ val HeadlineSmallFont = TypefaceTokens.Brand
val HeadlineSmallLineHeight = 32.0.sp
val HeadlineSmallSize = 24.sp
val HeadlineSmallTracking = 0.0.sp
val HeadlineSmallWeight = TypefaceTokens.WeightRegular
- val LabelLargeFont = TypefaceTokens.PlainMedium
+ val LabelLargeFont = TypefaceTokens.Plain
val LabelLargeLineHeight = 20.0.sp
val LabelLargeSize = 14.sp
val LabelLargeTracking = 0.1.sp
val LabelLargeWeight = TypefaceTokens.WeightMedium
- val LabelMediumFont = TypefaceTokens.PlainMedium
+ val LabelMediumFont = TypefaceTokens.Plain
val LabelMediumLineHeight = 16.0.sp
val LabelMediumSize = 12.sp
val LabelMediumTracking = 0.5.sp
val LabelMediumWeight = TypefaceTokens.WeightMedium
- val LabelSmallFont = TypefaceTokens.PlainMedium
+ val LabelSmallFont = TypefaceTokens.Plain
val LabelSmallLineHeight = 16.0.sp
val LabelSmallSize = 11.sp
val LabelSmallTracking = 0.5.sp
val LabelSmallWeight = TypefaceTokens.WeightMedium
- val TitleLargeFont = TypefaceTokens.BrandRegular
+ val TitleLargeFont = TypefaceTokens.Brand
val TitleLargeLineHeight = 28.0.sp
val TitleLargeSize = 22.sp
val TitleLargeTracking = 0.0.sp
val TitleLargeWeight = TypefaceTokens.WeightRegular
- val TitleMediumFont = TypefaceTokens.PlainMedium
+ val TitleMediumFont = TypefaceTokens.Plain
val TitleMediumLineHeight = 24.0.sp
val TitleMediumSize = 16.sp
val TitleMediumTracking = 0.2.sp
val TitleMediumWeight = TypefaceTokens.WeightMedium
- val TitleSmallFont = TypefaceTokens.PlainMedium
+ val TitleSmallFont = TypefaceTokens.Plain
val TitleSmallLineHeight = 20.0.sp
val TitleSmallSize = 14.sp
val TitleSmallTracking = 0.1.sp
diff --git a/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/TypefaceTokens.kt b/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/TypefaceTokens.kt
index 50fb111..f84f714 100644
--- a/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/TypefaceTokens.kt
+++ b/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/TypefaceTokens.kt
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+// VERSION: v0_76
// GENERATED CODE - DO NOT MODIFY BY HAND
package androidx.compose.material3.tokens
@@ -21,11 +22,9 @@
import androidx.compose.ui.text.font.FontWeight
internal object TypefaceTokens {
- val BrandMedium = FontFamily.SansSerif
- val BrandRegular = FontFamily.SansSerif
- val PlainMedium = FontFamily.SansSerif
- val PlainRegular = FontFamily.SansSerif
+ val Brand = FontFamily.SansSerif
+ val Plain = FontFamily.SansSerif
val WeightBold = FontWeight.Bold
val WeightMedium = FontWeight.Medium
val WeightRegular = FontWeight.Normal
-}
\ No newline at end of file
+}
diff --git a/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/TypographyKeyTokens.kt b/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/TypographyKeyTokens.kt
index a478348..4b99c2d 100644
--- a/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/TypographyKeyTokens.kt
+++ b/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/TypographyKeyTokens.kt
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+// VERSION: v0_76
// GENERATED CODE - DO NOT MODIFY BY HAND
package androidx.compose.material3.tokens
diff --git a/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/TypographyTokens.kt b/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/TypographyTokens.kt
index e7829ae..3214a45 100644
--- a/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/TypographyTokens.kt
+++ b/compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/tokens/TypographyTokens.kt
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+// VERSION: v0_76
// GENERATED CODE - DO NOT MODIFY BY HAND
package androidx.compose.material3.tokens
