Skip to content

Commit a1415a7

Browse files
Material Design Teamimhappi
authored andcommitted
[Docs] Updated docs with Expressive code/info.
PiperOrigin-RevId: 788757526
1 parent 2f64a3f commit a1415a7

File tree

72 files changed

+323
-105
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+323
-105
lines changed

docs/components/ButtonGroup.md

Lines changed: 25 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,13 @@ path: /catalog/buttons/
1313
organize buttons and add interactions between them.There are two variants of a
1414
button group.
1515

16-
![2 types of button groups](assets/buttons/buttongroup_types.png)
16+
![2 types of button groups](assets/buttons/buttongroup-types.png)
1717

1818
1. Standard button group
1919
2. Connected button group
2020

2121
**Note:** Images use various dynamic color schemes.
2222

23-
**Note:** `<Button>` is auto-inflated as
24-
`<com.google.android.material.button.MaterialButton>` via
25-
`MaterialComponentsViewInflater` when using a `Theme.Material3.*` theme.
26-
2723
## Design & API documentation
2824

2925
* [Material 3 (M3) spec](https://m3.material.io/components/button-groups/overview)
@@ -34,25 +30,27 @@ button group.
3430
Button groups are invisible containers that add padding between buttons and
3531
modify button shape. They don’t contain any buttons by default.
3632

37-
![Anatomy of a button group](assets/buttons/buttongroup_anatomy.png)
33+
![Anatomy of a button group](assets/buttons/buttongroup-anatomy.png)
3834

3935
1. Container
4036

4137
More details on anatomy items in the
4238
[component guidelines](https://m3.material.io/components/button-groups/guidelines#8fcef838-b0f2-4663-9df5-a8c140822fa6).
4339

44-
## M3 Expressive update
40+
## M3 Expressive
41+
42+
### M3 Expressive update
4543

4644
Before you can use `Material3Expressive` component styles, follow the
4745
[`Material3Expressive` themes setup instructions](https://github.com/material-components/material-components-android/tree/master/docs/getting-started.md#material3expressive-themes).
4846

49-
<img src="assets/buttons/buttongroup_expressive.png" alt="Standard button group in 3 of 5 available sizes, and segmented button group with just icon buttons and just common buttons." height="500"/>
47+
<img src="assets/buttons/buttongroup-expressive.png" alt="Standard button group in 3 of 5 available sizes, and segmented button group with just icon buttons and just common buttons." height="500"/>
5048

5149
Button groups apply shape, motion, and width changes to buttons and icon buttons
5250
to make them more interactive.
5351
[More on M3 Expressive](https://m3.material.io/blog/building-with-m3-expressive)
5452

55-
New component added to catalog.
53+
Button groups are new components added in Expressive.
5654

5755
**Types and naming:**
5856

@@ -65,6 +63,15 @@ New component added to catalog.
6563
* Works with all button sizes: XS, S, M, L, and XL
6664
* Applies default shape to all buttons: round or square
6765

66+
### M3 Expressive styles
67+
68+
Default styles in the expressive themes:
69+
70+
- Standard button group:
71+
`Widget.Material3Expressive.MaterialButtonGroup`
72+
- Connected button group:
73+
`Widget.Material3Expressive.MaterialButtonGroup.Connected`
74+
6875
## Key properties
6976

7077
### Shape and size attributes
@@ -102,7 +109,7 @@ Element | Style | Theme
102109
The standard button group contains multiple related individual buttons. The
103110
individual button's shape is preserved.
104111

105-
![Examples of using standard button group](assets/buttons/standard_button_group.png)
112+
![Examples of using standard button group](assets/buttons/standard-button-group.png)
106113

107114
#### Button group examples
108115

@@ -154,7 +161,7 @@ In addition to standard button groups, connected button group also overrides the
154161
individual button's shape to make them visually more belong to a group with 2dp
155162
spacing, 8dp inner corners, and fully rounded outer corners.
156163

157-
![Examples of using connected button group](assets/buttons/connected_button_group.png)
164+
![Examples of using connected button group](assets/buttons/connected-button-group.png)
158165

159166
#### Connected button group examples
160167

@@ -207,6 +214,10 @@ Material components for Android library. For more information, go to the
207214
[Getting started](https://github.com/material-components/material-components-android/tree/master/docs/getting-started.md)
208215
page.
209216

217+
**Note:** `<Button>` is auto-inflated as
218+
`<com.google.android.material.button.MaterialButton>` via
219+
`MaterialComponentsViewInflater` when using a `Theme.Material3.*` theme.
220+
210221
### Making button groups adaptive
211222

212223
`MaterialButtonGroup` inherits from the `LinearLayout`. It can be configured to
@@ -220,7 +231,7 @@ screens by using `layout_width` and `layout_weight`.
220231
When child buttons should not be adjusted while screen size changes, consider
221232
using `layout_width` on all buttons.
222233

223-
![Button group with fixed arrangement](assets/buttons/group_arrangement_fixed.png)
234+
![Button group with fixed arrangement](assets/buttons/group-arrangement-fixed.png)
224235

225236
```xml
226237
<com.google.android.material.button.MaterialButtonGroup
@@ -265,7 +276,7 @@ using `layout_width` on all buttons.
265276
When all child buttons are equally important or their sizes are proportional to
266277
each other, consider using `layout_weight` on all buttons.
267278

268-
![Button group with flexible arrangement](assets/buttons/group_arrangement_flexible.png)
279+
![Button group with flexible arrangement](assets/buttons/group-arrangement-flexible.png)
269280

270281
```xml
271282
<com.google.android.material.button.MaterialButtonGroup
@@ -313,7 +324,7 @@ each other, consider using `layout_weight` on all buttons.
313324
When only some buttons are flexible for different screen sizes, consider using
314325
`layout_weight` on these buttons but use `layout_width` on the rest as below.
315326

316-
![Button group with mixed arrangement](assets/buttons/group_arrangement_mixed.png)
327+
![Button group with mixed arrangement](assets/buttons/group-arrangement-mixed.png)
317328

318329
```xml
319330
<com.google.android.material.button.MaterialButtonGroup

0 commit comments

Comments
 (0)