Skip to content

Commit e721c46

Browse files
pekingmepekingme
committed
[Tokens] Updated atomic shape resources to ShapeAppearance styles.
PiperOrigin-RevId: 426466909
1 parent f6c8fa5 commit e721c46

File tree

2 files changed

+67
-54
lines changed

2 files changed

+67
-54
lines changed

‎lib/java/com/google/android/material/shape/res/values/styles.xml‎

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -33,18 +33,7 @@
3333
<item name="cornerSize">@dimen/mtrl_shape_corner_size_large_component</item>
3434
</style>
3535

36-
<style name="ShapeAppearance.Material3.SmallComponent" parent="ShapeAppearance.MaterialComponents.SmallComponent">
37-
<item name="cornerFamily">@integer/m3_sys_shape_small_corner_family</item>
38-
<item name="cornerSize">@dimen/m3_sys_shape_small_corner_size</item>
39-
</style>
40-
41-
<style name="ShapeAppearance.Material3.MediumComponent" parent="ShapeAppearance.MaterialComponents.MediumComponent">
42-
<item name="cornerFamily">@integer/m3_sys_shape_medium_corner_family</item>
43-
<item name="cornerSize">@dimen/m3_sys_shape_medium_corner_size</item>
44-
</style>
45-
46-
<style name="ShapeAppearance.Material3.LargeComponent" parent="ShapeAppearance.MaterialComponents.LargeComponent">
47-
<item name="cornerFamily">@integer/m3_sys_shape_large_corner_family</item>
48-
<item name="cornerSize">@dimen/m3_sys_shape_large_corner_size</item>
49-
</style>
36+
<style name="ShapeAppearance.Material3.SmallComponent" parent="ShapeAppearance.M3.Sys.Shape.Small"/>
37+
<style name="ShapeAppearance.Material3.MediumComponent" parent="ShapeAppearance.M3.Sys.Shape.Medium"/>
38+
<style name="ShapeAppearance.Material3.LargeComponent" parent="ShapeAppearance.M3.Sys.Shape.Large"/>
5039
</resources>

‎lib/java/com/google/android/material/shape/res/values/tokens.xml‎

Lines changed: 64 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -19,45 +19,69 @@
1919

2020
<resources>
2121
<!-- Generated from token set (md.sys.shape) in default context. -->
22-
<integer name="m3_sys_shape_corner_full_corner_family">0</integer>
23-
<dimen name="m3_sys_shape_corner_full_corner_size">50%</dimen>
24-
<integer name="m3_sys_shape_corner_none_corner_family">0</integer>
25-
<dimen name="m3_sys_shape_corner_none_corner_size">0dp</dimen>
26-
<integer name="m3_sys_shape_corner_large_corner_family">0</integer>
27-
<dimen name="m3_sys_shape_corner_large_corner_size">16dp</dimen>
28-
<integer name="m3_sys_shape_corner_small_corner_family">0</integer>
29-
<dimen name="m3_sys_shape_corner_small_corner_size">8dp</dimen>
30-
<integer name="m3_sys_shape_corner_medium_corner_family">0</integer>
31-
<dimen name="m3_sys_shape_corner_medium_corner_size">12dp</dimen>
32-
<integer name="m3_sys_shape_corner_large_end_corner_family">0</integer>
33-
<dimen name="m3_sys_shape_corner_large_end_corner_size_top_left">0dp</dimen>
34-
<dimen name="m3_sys_shape_corner_large_end_corner_size_top_right">16dp</dimen>
35-
<dimen name="m3_sys_shape_corner_large_end_corner_size_bottom_left">0dp</dimen>
36-
<dimen name="m3_sys_shape_corner_large_end_corner_size_bottom_right">16dp</dimen>
37-
<integer name="m3_sys_shape_corner_large_top_corner_family">0</integer>
38-
<dimen name="m3_sys_shape_corner_large_top_corner_size_top_left">16dp</dimen>
39-
<dimen name="m3_sys_shape_corner_large_top_corner_size_top_right">16dp</dimen>
40-
<dimen name="m3_sys_shape_corner_large_top_corner_size_bottom_left">0dp</dimen>
41-
<dimen name="m3_sys_shape_corner_large_top_corner_size_bottom_right">0dp</dimen>
42-
<integer name="m3_sys_shape_corner_extra_large_corner_family">0</integer>
43-
<dimen name="m3_sys_shape_corner_extra_large_corner_size">28dp</dimen>
44-
<integer name="m3_sys_shape_corner_extra_small_corner_family">0</integer>
45-
<dimen name="m3_sys_shape_corner_extra_small_corner_size">4dp</dimen>
46-
<integer name="m3_sys_shape_corner_extra_large_top_corner_family">0</integer>
47-
<dimen name="m3_sys_shape_corner_extra_large_top_corner_size_top_left">28dp</dimen>
48-
<dimen name="m3_sys_shape_corner_extra_large_top_corner_size_top_right">28dp</dimen>
49-
<dimen name="m3_sys_shape_corner_extra_large_top_corner_size_bottom_left">0dp</dimen>
50-
<dimen name="m3_sys_shape_corner_extra_large_top_corner_size_bottom_right">0dp</dimen>
51-
<integer name="m3_sys_shape_corner_extra_small_top_corner_family">0</integer>
52-
<dimen name="m3_sys_shape_corner_extra_small_top_corner_size_top_left">4dp</dimen>
53-
<dimen name="m3_sys_shape_corner_extra_small_top_corner_size_top_right">4dp</dimen>
54-
<dimen name="m3_sys_shape_corner_extra_small_top_corner_size_bottom_left">0dp</dimen>
55-
<dimen name="m3_sys_shape_corner_extra_small_top_corner_size_bottom_right">0dp</dimen>
22+
<style name="ShapeAppearance.M3.Sys.Shape.Corner.Full" parent="">
23+
<item name="cornerFamily">rounded</item>
24+
<item name="cornerSize">50%</item>
25+
</style>
26+
<style name="ShapeAppearance.M3.Sys.Shape.Corner.None" parent="">
27+
<item name="cornerFamily">rounded</item>
28+
<item name="cornerSize">0dp</item>
29+
</style>
30+
<style name="ShapeAppearance.M3.Sys.Shape.Corner.Large" parent="">
31+
<item name="cornerFamily">rounded</item>
32+
<item name="cornerSize">16dp</item>
33+
</style>
34+
<style name="ShapeAppearance.M3.Sys.Shape.Corner.Small" parent="">
35+
<item name="cornerFamily">rounded</item>
36+
<item name="cornerSize">8dp</item>
37+
</style>
38+
<style name="ShapeAppearance.M3.Sys.Shape.Corner.Medium" parent="">
39+
<item name="cornerFamily">rounded</item>
40+
<item name="cornerSize">12dp</item>
41+
</style>
42+
<style name="ShapeAppearance.M3.Sys.Shape.Corner.Large.End" parent="">
43+
<item name="cornerFamily">rounded</item>
44+
<item name="cornerSize">0dp</item>
45+
<item name="cornerSizeTopRight">16dp</item>
46+
<item name="cornerSizeBottomRight">16dp</item>
47+
</style>
48+
<style name="ShapeAppearance.M3.Sys.Shape.Corner.Large.Top" parent="">
49+
<item name="cornerFamily">rounded</item>
50+
<item name="cornerSize">0dp</item>
51+
<item name="cornerSizeTopLeft">16dp</item>
52+
<item name="cornerSizeTopRight">16dp</item>
53+
</style>
54+
<style name="ShapeAppearance.M3.Sys.Shape.Corner.ExtraLarge" parent="">
55+
<item name="cornerFamily">rounded</item>
56+
<item name="cornerSize">28dp</item>
57+
</style>
58+
<style name="ShapeAppearance.M3.Sys.Shape.Corner.ExtraSmall" parent="">
59+
<item name="cornerFamily">rounded</item>
60+
<item name="cornerSize">4dp</item>
61+
</style>
62+
<style name="ShapeAppearance.M3.Sys.Shape.Corner.ExtraLarge.Top" parent="">
63+
<item name="cornerFamily">rounded</item>
64+
<item name="cornerSize">0dp</item>
65+
<item name="cornerSizeTopLeft">28dp</item>
66+
<item name="cornerSizeTopRight">28dp</item>
67+
</style>
68+
<style name="ShapeAppearance.M3.Sys.Shape.Corner.ExtraSmall.Top" parent="">
69+
<item name="cornerFamily">rounded</item>
70+
<item name="cornerSize">0dp</item>
71+
<item name="cornerSizeTopLeft">4dp</item>
72+
<item name="cornerSizeTopRight">4dp</item>
73+
</style>
5674
<!-- Deprecated tokens -->
57-
<integer name="m3_sys_shape_large_corner_family">0</integer>
58-
<dimen name="m3_sys_shape_large_corner_size">8dp</dimen>
59-
<integer name="m3_sys_shape_small_corner_family">0</integer>
60-
<dimen name="m3_sys_shape_small_corner_size">4dp</dimen>
61-
<integer name="m3_sys_shape_medium_corner_family">0</integer>
62-
<dimen name="m3_sys_shape_medium_corner_size">8dp</dimen>
75+
<style name="ShapeAppearance.M3.Sys.Shape.Large" parent="">
76+
<item name="cornerFamily">rounded</item>
77+
<item name="cornerSize">8dp</item>
78+
</style>
79+
<style name="ShapeAppearance.M3.Sys.Shape.Small" parent="">
80+
<item name="cornerFamily">rounded</item>
81+
<item name="cornerSize">4dp</item>
82+
</style>
83+
<style name="ShapeAppearance.M3.Sys.Shape.Medium" parent="">
84+
<item name="cornerFamily">rounded</item>
85+
<item name="cornerSize">8dp</item>
86+
</style>
6387
</resources>

0 commit comments

Comments
 (0)